public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <468e8431-c3b8-11a1-8a88-11666927455d@leo-andres.de> (raw)
In-Reply-To: <C80A94D4-0527-4BA4-A736-0999965E6918@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 4128 bytes --]


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> wrote:
>>
>> 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 = <<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
>>

  reply	other threads:[~2021-12-02 16:40 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-02 15:39 [PATCH 1/4] pakfire.cgi: Extend the lockfile test Leo-Andres Hofmann
2021-12-02 15:39 ` [PATCH 2/4] pakfire.cgi: Implement JavaScript log message display Leo-Andres Hofmann
2021-12-02 15:59   ` Michael Tremer
2021-12-02 16:30     ` Leo Hofmann
2021-12-02 17:58       ` Michael Tremer
2021-12-02 18:48       ` Leo Hofmann
2021-12-02 15:39 ` [PATCH 3/4] pakfire.cgi: Add new translations Leo-Andres Hofmann
2021-12-02 16:00   ` Michael Tremer
2021-12-02 16:40     ` Leo Hofmann [this message]
2021-12-02 17:38       ` Michael Tremer
2021-12-02 15:39 ` [PATCH 4/4] pakfire.cgi: Remove "sleep" after running Pakfire command Leo-Andres Hofmann
2021-12-02 15:41 ` [PATCH 1/4] pakfire.cgi: Extend the lockfile test Leo Hofmann
2021-12-02 15:52 ` Michael Tremer
2021-12-02 16:09   ` Leo Hofmann
2021-12-27 13:21 ` [PATCH 1/2] pakfire: Implement feedback from mailing list discussion Leo-Andres Hofmann
2021-12-27 13:21   ` [PATCH 2/2] pakfire.cgi: Improve HTML output and layout Leo-Andres Hofmann
2021-12-28 22:11     ` Peter Müller
2021-12-28 22:11   ` [PATCH 1/2] pakfire: Implement feedback from mailing list discussion Peter Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=468e8431-c3b8-11a1-8a88-11666927455d@leo-andres.de \
    --to=hofmann@leo-andres.de \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox