From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/4] pakfire.cgi: Add new translations
Date: Thu, 02 Dec 2021 17:40:07 +0100
Message-ID: <468e8431-c3b8-11a1-8a88-11666927455d@leo-andres.de>
In-Reply-To: <C80A94D4-0527-4BA4-A736-0999965E6918@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5512924293561862785=="
List-Id: <development.lists.ipfire.org>

--===============5512924293561862785==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable


Am 02.12.2021 um 17:00 schrieb Michael Tremer:
>
>> On 2 Dec 2021, at 15:39, Leo-Andres Hofmann <hofmann(a)leo-andres.de> wrot=
e:
>>
>> Signed-off-by: Leo-Andres Hofmann <hofmann(a)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 =3D <<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 installa=
tion 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=3D"$ENV{'SCRIPT_NAME'}">Return to Pakfire</a>',
>> +		'link_return': '<a href=3D"$ENV{'SCRIPT_NAME'}">$Lang::tr{'pakfire retu=
rn'}</a>',
>> 		'link_reboot': '<a href=3D"/cgi-bin/shutdown.cgi">$Lang::tr{'needreboot'=
}</a>'
>> 	});
>> =09
>> 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' =3D> 'Pakfire Konfiguration',
>> 'pakfire core update auto' =3D> 'Core- und Addon-Updates automatisch insta=
llieren:',
>> 'pakfire core update level' =3D> 'Core-Update-Level',
>> +'pakfire finished' =3D> 'Pakfire ist fertig!. Bitte =C3=BCberpr=C3=BCfen =
Sie die Log Ausgabe.',
>> 'pakfire health check' =3D> 'Mirrors auf Erreichbarkeit pr=C3=BCfen (Ping)=
:',
>> 'pakfire install description' =3D> 'W=C3=A4hlen Sie ein oder mehrere Paket=
e zur Installation aus und dr=C3=BCcken Sie auf das plus-Symbol.',
>> 'pakfire install package' =3D> 'Sie m=C3=B6chten folgende Pakete installie=
ren: ',
>> @@ -1985,6 +1986,7 @@
>> 'pakfire last update' =3D> 'Letztes Update ist',
>> 'pakfire possible dependency' =3D> ' M=C3=B6glicherweise haben diese Paket=
e Abh=C3=A4ngigkeiten, d.h. andere Pakete m=C3=BCssen zus=C3=A4tzlich install=
iert werden. Dazu sehen Sie unten eine Liste.',
>> 'pakfire register' =3D> 'Registrierung am Pakfire-Server:',
>> +'pakfire return' =3D> 'Zur=C3=BCck zu Pakfire',
>> 'pakfire system state' =3D> 'System Status',
>> 'pakfire tree' =3D> 'Zu verwendendes Pakfire-Repository:',
>> 'pakfire tree stable' =3D> 'Ver=C3=B6ffentlichte 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' =3D> 'Pakfire Configuration',
>> 'pakfire core update auto' =3D> 'Install core and addon updates automatica=
lly:',
>> 'pakfire core update level' =3D> 'Core-Update-Level',
>> +'pakfire finished' =3D> 'Pakfire is finished! Please check the log output=
.',
>> 'pakfire health check' =3D> 'Check if mirror is reachable (ping):',
>> 'pakfire install description' =3D> 'Please choose one or more items from t=
he list below and click the plus to install.',
>> 'pakfire install package' =3D> 'You want to install the following packages=
: ',
>> @@ -2020,6 +2021,7 @@
>> 'pakfire last update' =3D> 'Last update made',
>> 'pakfire possible dependency' =3D> ' There may be depending packages, here=
 is a list of packages that need to be installed.',
>> 'pakfire register' =3D> 'Register at pakfire-server:',
>> +'pakfire return' =3D> 'Return to Pakfire',
>> 'pakfire system state' =3D> 'System Status',
>> 'pakfire tree' =3D> 'Repository',
>> 'pakfire tree stable' =3D> 'Stable',
>> --=20
>> 2.27.0.windows.1
>>

--===============5512924293561862785==--