From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 3/4] pakfire.cgi: Add new translations Date: Thu, 02 Dec 2021 17:38:20 +0000 Message-ID: <34642524-18F9-4DF5-8F79-2F598DFF01DE@ipfire.org> In-Reply-To: <468e8431-c3b8-11a1-8a88-11666927455d@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4509469685878290209==" List-Id: --===============4509469685878290209== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 2 Dec 2021, at 16:40, Leo Hofmann wrote: >=20 >=20 > Am 02.12.2021 um 17:00 schrieb Michael Tremer: >>=20 >>> On 2 Dec 2021, at 15:39, Leo-Andres Hofmann wro= te: >>>=20 >>> Signed-off-by: Leo-Andres Hofmann >>> --- >>> 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(-) >>>=20 >>> 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 <>> // 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? >=20 > Yes, the way I did it, you have to manually go back to Pakfire. >=20 > I liked the idea, because it gives you a clear confirmation that the instal= lation was completed. Okay. Let=E2=80=99s keep it that way then=E2=80=A6 >=20 >>=20 >> It is mostly for debugging and I would vote for it going away once pakfire= is done. >>=20 >> 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 >>=20 >>> 'since': '$Lang::tr{'since'} ', //(space is intentional) >>>=20 >>> - 'link_return': 'Return to Pakfire', >>> + 'link_return': '$Lang::tr{'pakfire ret= urn'}', >>> 'link_reboot': '$Lang::tr{'needreboot= '}' >>> }); >>> =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 inst= allieren:', >>> '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 Pake= te zur Installation aus und dr=C3=BCcken Sie auf das plus-Symbol.', >>> 'pakfire install package' =3D> 'Sie m=C3=B6chten folgende Pakete installi= eren: ', >>> @@ -1985,6 +1986,7 @@ >>> 'pakfire last update' =3D> 'Letztes Update ist', >>> 'pakfire possible dependency' =3D> ' M=C3=B6glicherweise haben diese Pake= te Abh=C3=A4ngigkeiten, d.h. andere Pakete m=C3=BCssen zus=C3=A4tzlich instal= liert 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 automatic= ally:', >>> 'pakfire core update level' =3D> 'Core-Update-Level', >>> +'pakfire finished' =3D> 'Pakfire is finished! Please check the log outpu= t.', >>> 'pakfire health check' =3D> 'Check if mirror is reachable (ping):', >>> 'pakfire install description' =3D> 'Please choose one or more items from = the list below and click the plus to install.', >>> 'pakfire install package' =3D> 'You want to install the following package= s: ', >>> @@ -2020,6 +2021,7 @@ >>> 'pakfire last update' =3D> 'Last update made', >>> 'pakfire possible dependency' =3D> ' There may be depending packages, her= e 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 --===============4509469685878290209==--