[3/4] pakfire.cgi: Add new translations

Message ID 20211202153955.1126-3-hofmann@leo-andres.de
State Accepted
Commit 524bbe326ddd4063f8099e99d6436c384a1d1730
Headers show
Series [1/4] pakfire.cgi: Extend the lockfile test | expand

Commit Message

Leo-Andres Hofmann Dec. 2, 2021, 3:39 p.m. UTC
Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
---
 html/cgi-bin/pakfire.cgi | 4 ++--
 langs/de/cgi-bin/de.pl   | 2 ++
 langs/en/cgi-bin/en.pl   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

Comments

Michael Tremer Dec. 2, 2021, 4 p.m. UTC | #1
> On 2 Dec 2021, at 15:39, Leo-Andres Hofmann <hofmann@leo-andres.de> wrote:
> 
> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
> ---
> html/cgi-bin/pakfire.cgi | 4 ++--
> langs/de/cgi-bin/de.pl   | 2 ++
> langs/en/cgi-bin/en.pl   | 2 ++
> 3 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
> index e5f5f7d6a..72518a6fe 100644
> --- a/html/cgi-bin/pakfire.cgi
> +++ b/html/cgi-bin/pakfire.cgi
> @@ -127,10 +127,10 @@ my $extraHead = <<END
> 	// Translations
> 	pakfire.i18n.load({
> 		'working': '$Lang::tr{'pakfire working'}',
> -		'finished': 'Pakfire is finished! Please check the log output.',
> +		'finished': '$Lang::tr{'pakfire finished'}',

Do we generally want to do this? Does the log stay around in the end?

It is mostly for debugging and I would vote for it going away once pakfire is done.

We could show it if there was an error.

> 		'since': '$Lang::tr{'since'} ', //(space is intentional)
> 
> -		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">Return to Pakfire</a>',
> +		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">$Lang::tr{'pakfire return'}</a>',
> 		'link_reboot': '<a href="/cgi-bin/shutdown.cgi">$Lang::tr{'needreboot'}</a>'
> 	});
> 	
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index c81b28fea..490879c90 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -1974,6 +1974,7 @@
> 'pakfire configuration' => 'Pakfire Konfiguration',
> 'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
> 'pakfire core update level' => 'Core-Update-Level',
> +'pakfire finished' => 'Pakfire ist fertig!. Bitte überprüfen Sie die Log Ausgabe.',
> 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
> 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
> 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
> @@ -1985,6 +1986,7 @@
> 'pakfire last update' => 'Letztes Update ist',
> 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen Sie unten eine Liste.',
> 'pakfire register' => 'Registrierung am Pakfire-Server:',
> +'pakfire return' => 'Zurück zu Pakfire',
> 'pakfire system state' => 'System Status',
> 'pakfire tree' => 'Zu verwendendes Pakfire-Repository:',
> 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index a92bb07f8..4442ea772 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -2009,6 +2009,7 @@
> 'pakfire configuration' => 'Pakfire Configuration',
> 'pakfire core update auto' => 'Install core and addon updates automatically:',
> 'pakfire core update level' => 'Core-Update-Level',
> +'pakfire finished' => 'Pakfire is finished! Please check the log output.',
> 'pakfire health check' => 'Check if mirror is reachable (ping):',
> 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
> 'pakfire install package' => 'You want to install the following packages: ',
> @@ -2020,6 +2021,7 @@
> 'pakfire last update' => 'Last update made',
> 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
> 'pakfire register' => 'Register at pakfire-server:',
> +'pakfire return' => 'Return to Pakfire',
> 'pakfire system state' => 'System Status',
> 'pakfire tree' => 'Repository',
> 'pakfire tree stable' => 'Stable',
> -- 
> 2.27.0.windows.1
>
Leo-Andres Hofmann Dec. 2, 2021, 4:40 p.m. UTC | #2
Am 02.12.2021 um 17:00 schrieb Michael Tremer:
>
>> On 2 Dec 2021, at 15:39, Leo-Andres Hofmann <hofmann@leo-andres.de> wrote:
>>
>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
>> ---
>> html/cgi-bin/pakfire.cgi | 4 ++--
>> langs/de/cgi-bin/de.pl   | 2 ++
>> langs/en/cgi-bin/en.pl   | 2 ++
>> 3 files changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
>> index e5f5f7d6a..72518a6fe 100644
>> --- a/html/cgi-bin/pakfire.cgi
>> +++ b/html/cgi-bin/pakfire.cgi
>> @@ -127,10 +127,10 @@ my $extraHead = <<END
>> 	// Translations
>> 	pakfire.i18n.load({
>> 		'working': '$Lang::tr{'pakfire working'}',
>> -		'finished': 'Pakfire is finished! Please check the log output.',
>> +		'finished': '$Lang::tr{'pakfire finished'}',
> Do we generally want to do this? Does the log stay around in the end?

Yes, the way I did it, you have to manually go back to Pakfire.

I liked the idea, because it gives you a clear confirmation that the installation was completed.

>
> It is mostly for debugging and I would vote for it going away once pakfire is done.
>
> We could show it if there was an error.
Do you know if there is an easily accessible return code somewhere?
>
>> 		'since': '$Lang::tr{'since'} ', //(space is intentional)
>>
>> -		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">Return to Pakfire</a>',
>> +		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">$Lang::tr{'pakfire return'}</a>',
>> 		'link_reboot': '<a href="/cgi-bin/shutdown.cgi">$Lang::tr{'needreboot'}</a>'
>> 	});
>> 	
>> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
>> index c81b28fea..490879c90 100644
>> --- a/langs/de/cgi-bin/de.pl
>> +++ b/langs/de/cgi-bin/de.pl
>> @@ -1974,6 +1974,7 @@
>> 'pakfire configuration' => 'Pakfire Konfiguration',
>> 'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
>> 'pakfire core update level' => 'Core-Update-Level',
>> +'pakfire finished' => 'Pakfire ist fertig!. Bitte überprüfen Sie die Log Ausgabe.',
>> 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
>> 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
>> 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
>> @@ -1985,6 +1986,7 @@
>> 'pakfire last update' => 'Letztes Update ist',
>> 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen Sie unten eine Liste.',
>> 'pakfire register' => 'Registrierung am Pakfire-Server:',
>> +'pakfire return' => 'Zurück zu Pakfire',
>> 'pakfire system state' => 'System Status',
>> 'pakfire tree' => 'Zu verwendendes Pakfire-Repository:',
>> 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
>> index a92bb07f8..4442ea772 100644
>> --- a/langs/en/cgi-bin/en.pl
>> +++ b/langs/en/cgi-bin/en.pl
>> @@ -2009,6 +2009,7 @@
>> 'pakfire configuration' => 'Pakfire Configuration',
>> 'pakfire core update auto' => 'Install core and addon updates automatically:',
>> 'pakfire core update level' => 'Core-Update-Level',
>> +'pakfire finished' => 'Pakfire is finished! Please check the log output.',
>> 'pakfire health check' => 'Check if mirror is reachable (ping):',
>> 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
>> 'pakfire install package' => 'You want to install the following packages: ',
>> @@ -2020,6 +2021,7 @@
>> 'pakfire last update' => 'Last update made',
>> 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
>> 'pakfire register' => 'Register at pakfire-server:',
>> +'pakfire return' => 'Return to Pakfire',
>> 'pakfire system state' => 'System Status',
>> 'pakfire tree' => 'Repository',
>> 'pakfire tree stable' => 'Stable',
>> -- 
>> 2.27.0.windows.1
>>
Michael Tremer Dec. 2, 2021, 5:38 p.m. UTC | #3
Hello,

> On 2 Dec 2021, at 16:40, Leo Hofmann <hofmann@leo-andres.de> wrote:
> 
> 
> Am 02.12.2021 um 17:00 schrieb Michael Tremer:
>> 
>>> On 2 Dec 2021, at 15:39, Leo-Andres Hofmann <hofmann@leo-andres.de> wrote:
>>> 
>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
>>> ---
>>> html/cgi-bin/pakfire.cgi | 4 ++--
>>> langs/de/cgi-bin/de.pl   | 2 ++
>>> langs/en/cgi-bin/en.pl   | 2 ++
>>> 3 files changed, 6 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
>>> index e5f5f7d6a..72518a6fe 100644
>>> --- a/html/cgi-bin/pakfire.cgi
>>> +++ b/html/cgi-bin/pakfire.cgi
>>> @@ -127,10 +127,10 @@ my $extraHead = <<END
>>> 	// Translations
>>> 	pakfire.i18n.load({
>>> 		'working': '$Lang::tr{'pakfire working'}',
>>> -		'finished': 'Pakfire is finished! Please check the log output.',
>>> +		'finished': '$Lang::tr{'pakfire finished'}',
>> Do we generally want to do this? Does the log stay around in the end?
> 
> Yes, the way I did it, you have to manually go back to Pakfire.
> 
> I liked the idea, because it gives you a clear confirmation that the installation was completed.

Okay. Let’s keep it that way then…

> 
>> 
>> It is mostly for debugging and I would vote for it going away once pakfire is done.
>> 
>> We could show it if there was an error.
> Do you know if there is an easily accessible return code somewhere?

Not if we send the process into the background. But hopefully this should be clear from the last log message?!

-Michael

>> 
>>> 		'since': '$Lang::tr{'since'} ', //(space is intentional)
>>> 
>>> -		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">Return to Pakfire</a>',
>>> +		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">$Lang::tr{'pakfire return'}</a>',
>>> 		'link_reboot': '<a href="/cgi-bin/shutdown.cgi">$Lang::tr{'needreboot'}</a>'
>>> 	});
>>> 	
>>> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
>>> index c81b28fea..490879c90 100644
>>> --- a/langs/de/cgi-bin/de.pl
>>> +++ b/langs/de/cgi-bin/de.pl
>>> @@ -1974,6 +1974,7 @@
>>> 'pakfire configuration' => 'Pakfire Konfiguration',
>>> 'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
>>> 'pakfire core update level' => 'Core-Update-Level',
>>> +'pakfire finished' => 'Pakfire ist fertig!. Bitte überprüfen Sie die Log Ausgabe.',
>>> 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
>>> 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
>>> 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
>>> @@ -1985,6 +1986,7 @@
>>> 'pakfire last update' => 'Letztes Update ist',
>>> 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen Sie unten eine Liste.',
>>> 'pakfire register' => 'Registrierung am Pakfire-Server:',
>>> +'pakfire return' => 'Zurück zu Pakfire',
>>> 'pakfire system state' => 'System Status',
>>> 'pakfire tree' => 'Zu verwendendes Pakfire-Repository:',
>>> 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
>>> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
>>> index a92bb07f8..4442ea772 100644
>>> --- a/langs/en/cgi-bin/en.pl
>>> +++ b/langs/en/cgi-bin/en.pl
>>> @@ -2009,6 +2009,7 @@
>>> 'pakfire configuration' => 'Pakfire Configuration',
>>> 'pakfire core update auto' => 'Install core and addon updates automatically:',
>>> 'pakfire core update level' => 'Core-Update-Level',
>>> +'pakfire finished' => 'Pakfire is finished! Please check the log output.',
>>> 'pakfire health check' => 'Check if mirror is reachable (ping):',
>>> 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
>>> 'pakfire install package' => 'You want to install the following packages: ',
>>> @@ -2020,6 +2021,7 @@
>>> 'pakfire last update' => 'Last update made',
>>> 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
>>> 'pakfire register' => 'Register at pakfire-server:',
>>> +'pakfire return' => 'Return to Pakfire',
>>> 'pakfire system state' => 'System Status',
>>> 'pakfire tree' => 'Repository',
>>> 'pakfire tree stable' => 'Stable',
>>> -- 
>>> 2.27.0.windows.1

Patch

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index e5f5f7d6a..72518a6fe 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -127,10 +127,10 @@  my $extraHead = <<END
 	// Translations
 	pakfire.i18n.load({
 		'working': '$Lang::tr{'pakfire working'}',
-		'finished': 'Pakfire is finished! Please check the log output.',
+		'finished': '$Lang::tr{'pakfire finished'}',
 		'since': '$Lang::tr{'since'} ', //(space is intentional)
 
-		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">Return to Pakfire</a>',
+		'link_return': '<a href="$ENV{'SCRIPT_NAME'}">$Lang::tr{'pakfire return'}</a>',
 		'link_reboot': '<a href="/cgi-bin/shutdown.cgi">$Lang::tr{'needreboot'}</a>'
 	});
 	
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c81b28fea..490879c90 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1974,6 +1974,7 @@ 
 'pakfire configuration' => 'Pakfire Konfiguration',
 'pakfire core update auto' => 'Core- und Addon-Updates automatisch installieren:',
 'pakfire core update level' => 'Core-Update-Level',
+'pakfire finished' => 'Pakfire ist fertig!. Bitte überprüfen Sie die Log Ausgabe.',
 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
@@ -1985,6 +1986,7 @@ 
 'pakfire last update' => 'Letztes Update ist',
 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen Sie unten eine Liste.',
 'pakfire register' => 'Registrierung am Pakfire-Server:',
+'pakfire return' => 'Zurück zu Pakfire',
 'pakfire system state' => 'System Status',
 'pakfire tree' => 'Zu verwendendes Pakfire-Repository:',
 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a92bb07f8..4442ea772 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2009,6 +2009,7 @@ 
 'pakfire configuration' => 'Pakfire Configuration',
 'pakfire core update auto' => 'Install core and addon updates automatically:',
 'pakfire core update level' => 'Core-Update-Level',
+'pakfire finished' => 'Pakfire is finished! Please check the log output.',
 'pakfire health check' => 'Check if mirror is reachable (ping):',
 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
 'pakfire install package' => 'You want to install the following packages: ',
@@ -2020,6 +2021,7 @@ 
 'pakfire last update' => 'Last update made',
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
 'pakfire register' => 'Register at pakfire-server:',
+'pakfire return' => 'Return to Pakfire',
 'pakfire system state' => 'System Status',
 'pakfire tree' => 'Repository',
 'pakfire tree stable' => 'Stable',