pakfire.cgi: Partially fixes Bug #12049

Message ID 20200718124951.2096-1-matthias.fischer@ipfire.org
State New
Headers show
Series
  • pakfire.cgi: Partially fixes Bug #12049
Related show

Commit Message

Matthias Fischer July 18, 2020, 12:49 p.m. UTC
I added translations for package uninstallation but didn't know how to fix
the missing list of affected dependencies during uninstallation, see:

=> https://forum.ipfire.org/viewtopic.php?f=17&t=21912&p=120466#p120593

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 html/cgi-bin/pakfire.cgi | 2 +-
 langs/de/cgi-bin/de.pl   | 1 +
 langs/en/cgi-bin/en.pl   | 1 +
 langs/es/cgi-bin/es.pl   | 1 +
 langs/fr/cgi-bin/fr.pl   | 1 +
 langs/it/cgi-bin/it.pl   | 1 +
 langs/nl/cgi-bin/nl.pl   | 1 +
 langs/pl/cgi-bin/pl.pl   | 1 +
 langs/ru/cgi-bin/ru.pl   | 1 +
 langs/tr/cgi-bin/tr.pl   | 1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

Comments

Michael Tremer July 21, 2020, 9:28 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 18 Jul 2020, at 13:49, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> I added translations for package uninstallation but didn't know how to fix
> the missing list of affected dependencies during uninstallation, see:
> 
> => https://forum.ipfire.org/viewtopic.php?f=17&t=21912&p=120466#p120593
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> html/cgi-bin/pakfire.cgi | 2 +-
> langs/de/cgi-bin/de.pl   | 1 +
> langs/en/cgi-bin/en.pl   | 1 +
> langs/es/cgi-bin/es.pl   | 1 +
> langs/fr/cgi-bin/fr.pl   | 1 +
> langs/it/cgi-bin/it.pl   | 1 +
> langs/nl/cgi-bin/nl.pl   | 1 +
> langs/pl/cgi-bin/pl.pl   | 1 +
> langs/ru/cgi-bin/ru.pl   | 1 +
> langs/tr/cgi-bin/tr.pl   | 1 +
> 10 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
> index dacbe11f4..39389ad02 100644
> --- a/html/cgi-bin/pakfire.cgi
> +++ b/html/cgi-bin/pakfire.cgi
> @@ -113,7 +113,7 @@ END
> 		}
> 		print <<END;
> 		</pre>
> -		<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
> +		<tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}
> 		<tr><td colspan='2'>&nbsp;
> 		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
> 							<input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 93fbc2d18..45bd24543 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -1979,6 +1979,7 @@
> 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
> 'pakfire tree testing' => 'Vorabversionen (testing)',
> 'pakfire tree unstable' => 'Experimentelle Versionen (unstable)',
> +'pakfire uninstall all' => 'Möchten Sie die folgenden Pakete deinstallieren?',
> 'pakfire uninstall description' => 'Wählen Sie ein oder mehrere Pakete zur Deinstallation aus und drücken Sie auf das minus-Symbol.',
> 'pakfire uninstall package' => 'Sie möchten folgende Pakete deinstallieren: ',
> 'pakfire update daily' => 'Täglich nach Updates suchen:',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 3fcd3691e..2c69391cd 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -2004,6 +2004,7 @@
> 'pakfire tree stable' => 'Stable',
> 'pakfire tree testing' => 'Testing',
> 'pakfire tree unstable' => 'Unstable',
> +'pakfire uninstall all' => 'Do you want to uninstall the following packages?',
> 'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.',
> 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
> 'pakfire update daily' => 'Search for updates daily:',
> diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
> index 0a757602a..04be55c5c 100644
> --- a/langs/es/cgi-bin/es.pl
> +++ b/langs/es/cgi-bin/es.pl
> @@ -1374,6 +1374,7 @@
> 'pakfire possible dependency' => 'Puede haber paquetes con dependencias, aquí está una lista de paquetes que necesitan ser instalados.',
> 'pakfire register' => 'Registrar en el servidor pakfire:',
> 'pakfire system state' => 'Status del sistema',
> +'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?',
> 'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo - para desinstalar',
> 'pakfire uninstall package' => 'Ud. desea desinstalar los siguientes paquetes:',
> 'pakfire update daily' => 'Buscar actualizaciones diariamente:',
> diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
> index a566afacb..418876f30 100644
> --- a/langs/fr/cgi-bin/fr.pl
> +++ b/langs/fr/cgi-bin/fr.pl
> @@ -2012,6 +2012,7 @@
> 'pakfire tree stable' => 'Stable',
> 'pakfire tree testing' => 'En test',
> 'pakfire tree unstable' => 'Instable',
> +'pakfire uninstall all' => 'Souhaitez-vous désinstaller les packages suivants?',
> 'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.',
> 'pakfire uninstall package' => 'Vous voulez désinstaller les paquets suivants : ',
> 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :',
> diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
> index 6c9137c28..7b73ae834 100644
> --- a/langs/it/cgi-bin/it.pl
> +++ b/langs/it/cgi-bin/it.pl
> @@ -1764,6 +1764,7 @@
> 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
> 'pakfire register' => 'Registrati sul pakfire-server:',
> 'pakfire system state' => 'Stato del Sistema',
> +'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?',
> 'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fare clic sul meno per disinstallare..',
> 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
> 'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:',
> diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
> index 5fa89b1ac..2977dc741 100644
> --- a/langs/nl/cgi-bin/nl.pl
> +++ b/langs/nl/cgi-bin/nl.pl
> @@ -1717,6 +1717,7 @@
> 'pakfire possible dependency' => ' Er kunnen pakketafhankelijkheden zijn, hier is een lijst met pakketten die moeten worden geïnstalleerd.',
> 'pakfire register' => 'Registreer bij de pakfire-server:',
> 'pakfire system state' => 'Systeemstatus',
> +'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?',
> 'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de min om te deinstalleren.',
> 'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ',
> 'pakfire update daily' => 'Zoek dagelijks naar updates:',
> diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
> index 521381af2..8f1e99794 100644
> --- a/langs/pl/cgi-bin/pl.pl
> +++ b/langs/pl/cgi-bin/pl.pl
> @@ -1386,6 +1386,7 @@
> 'pakfire possible dependency' => ' Pewne pakiety mogą wymagać zależności. Oto lista pakietów które muszę zostać zainstalowane.',
> 'pakfire register' => 'Register at pakfire-server:',
> 'pakfire system state' => 'Status systemu',
> +'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?',
> 'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć minus aby odinstalować.',
> 'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ',
> 'pakfire update daily' => 'Szukaj aktualizacje codziennie:',
> diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
> index 9ac46d459..c9df1156f 100644
> --- a/langs/ru/cgi-bin/ru.pl
> +++ b/langs/ru/cgi-bin/ru.pl
> @@ -1381,6 +1381,7 @@
> 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
> 'pakfire register' => 'Регистрировать на pakfire-сервере:',
> 'pakfire system state' => 'Статус системы',
> +'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?',
> 'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите минус для удаления.',
> 'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ',
> 'pakfire update daily' => 'Ежедневный поиск обновлений:',
> diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
> index 9829b4076..72397dbbf 100644
> --- a/langs/tr/cgi-bin/tr.pl
> +++ b/langs/tr/cgi-bin/tr.pl
> @@ -1909,6 +1909,7 @@
> 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.',
> 'pakfire register' => 'Pakfire sunucusuna kayıt:',
> 'pakfire system state' => 'Sistem durumu',
> +'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?',
> 'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.',
> 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ',
> 'pakfire update daily' => 'Günlük güncellemeleri ara:',
> -- 
> 2.18.0
>

Patch

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index dacbe11f4..39389ad02 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -113,7 +113,7 @@  END
 		}
 		print <<END;
 		</pre>
-		<tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
+		<tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}
 		<tr><td colspan='2'>&nbsp;
 		<tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 							<input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 93fbc2d18..45bd24543 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1979,6 +1979,7 @@ 
 'pakfire tree stable' => 'Veröffentlichte Versionen (stable)',
 'pakfire tree testing' => 'Vorabversionen (testing)',
 'pakfire tree unstable' => 'Experimentelle Versionen (unstable)',
+'pakfire uninstall all' => 'Möchten Sie die folgenden Pakete deinstallieren?',
 'pakfire uninstall description' => 'Wählen Sie ein oder mehrere Pakete zur Deinstallation aus und drücken Sie auf das minus-Symbol.',
 'pakfire uninstall package' => 'Sie möchten folgende Pakete deinstallieren: ',
 'pakfire update daily' => 'Täglich nach Updates suchen:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3fcd3691e..2c69391cd 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2004,6 +2004,7 @@ 
 'pakfire tree stable' => 'Stable',
 'pakfire tree testing' => 'Testing',
 'pakfire tree unstable' => 'Unstable',
+'pakfire uninstall all' => 'Do you want to uninstall the following packages?',
 'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
 'pakfire update daily' => 'Search for updates daily:',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 0a757602a..04be55c5c 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1374,6 +1374,7 @@ 
 'pakfire possible dependency' => 'Puede haber paquetes con dependencias, aquí está una lista de paquetes que necesitan ser instalados.',
 'pakfire register' => 'Registrar en el servidor pakfire:',
 'pakfire system state' => 'Status del sistema',
+'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?',
 'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y <br /> haga click en el signo - para desinstalar',
 'pakfire uninstall package' => 'Ud. desea desinstalar los siguientes paquetes:',
 'pakfire update daily' => 'Buscar actualizaciones diariamente:',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index a566afacb..418876f30 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2012,6 +2012,7 @@ 
 'pakfire tree stable' => 'Stable',
 'pakfire tree testing' => 'En test',
 'pakfire tree unstable' => 'Instable',
+'pakfire uninstall all' => 'Souhaitez-vous désinstaller les packages suivants?',
 'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.',
 'pakfire uninstall package' => 'Vous voulez désinstaller les paquets suivants : ',
 'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 6c9137c28..7b73ae834 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1764,6 +1764,7 @@ 
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
 'pakfire register' => 'Registrati sul pakfire-server:',
 'pakfire system state' => 'Stato del Sistema',
+'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?',
 'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e <br /> fare clic sul meno per disinstallare..',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
 'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 5fa89b1ac..2977dc741 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1717,6 +1717,7 @@ 
 'pakfire possible dependency' => ' Er kunnen pakketafhankelijkheden zijn, hier is een lijst met pakketten die moeten worden geïnstalleerd.',
 'pakfire register' => 'Registreer bij de pakfire-server:',
 'pakfire system state' => 'Systeemstatus',
+'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?',
 'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de min om te deinstalleren.',
 'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ',
 'pakfire update daily' => 'Zoek dagelijks naar updates:',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 521381af2..8f1e99794 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1386,6 +1386,7 @@ 
 'pakfire possible dependency' => ' Pewne pakiety mogą wymagać zależności. Oto lista pakietów które muszę zostać zainstalowane.',
 'pakfire register' => 'Register at pakfire-server:',
 'pakfire system state' => 'Status systemu',
+'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?',
 'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, <br /> a następnie kliknąć minus aby odinstalować.',
 'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ',
 'pakfire update daily' => 'Szukaj aktualizacje codziennie:',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 9ac46d459..c9df1156f 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1381,6 +1381,7 @@ 
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
 'pakfire register' => 'Регистрировать на pakfire-сервере:',
 'pakfire system state' => 'Статус системы',
+'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?',
 'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и <br /> нажмите минус для удаления.',
 'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ',
 'pakfire update daily' => 'Ежедневный поиск обновлений:',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 9829b4076..72397dbbf 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1909,6 +1909,7 @@ 
 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.',
 'pakfire register' => 'Pakfire sunucusuna kayıt:',
 'pakfire system state' => 'Sistem durumu',
+'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?',
 'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.',
 'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ',
 'pakfire update daily' => 'Günlük güncellemeleri ara:',