[PATCH] services.cgi: translate "Addon"

[PATCH] services.cgi: translate "Addon"

[Robin Roevens]

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

Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
 html/cgi-bin/services.cgi | 4 ++--
 langs/de/cgi-bin/de.pl    | 2 +-
 langs/en/cgi-bin/en.pl    | 1 +
 langs/nl/cgi-bin/nl.pl    | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 14ed01c50..3c0f27f99 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -138,7 +138,7 @@ END
 	print "</table></div>\n";
 	&Header::closebox();
 
-	&Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
+	&Header::openbox('100%', 'left', "$Lang::tr{addon} - $Lang::tr{services}");
 	my $paramstr=$ENV{QUERY_STRING};
 	my @param=split(/!/, $paramstr);
 	# Make sure action parameter is actually one of the allowed service actions
@@ -156,7 +156,7 @@ END
 <div align='center'>
 <table width='80%' cellspacing='1' class='tbl'>
 <tr>
-	<th align='left'><b>Addon $Lang::tr{service}</b></th>
+	<th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th>
 	<th align='center'><b>Boot</b></th>
 	<th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
 	<th align='center'><b>$Lang::tr{'status'}</b></th>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index db7d117b0..8310f7eba 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -157,7 +157,7 @@
 'add xtaccess' => 'Externen Zugang hinzugefügt',
 'add-route' => 'Zusätzlich zu propagierende Route',
 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste',
-'addon' => 'Add-Ons',
+'addon' => 'Add-On',
 'addons' => 'Add-Ons',
 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
 'admin users' => 'Liste der Benutzer mit Super User Rechten',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 60dca5be4..2aec959c3 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -155,6 +155,7 @@
 'add xtaccess' => 'Add External Access',
 'add-route' => 'Additional push route',
 'added from dhcp lease list' => 'Added from DHCP lease list',
+'addon' => 'Addon',
 'addons' => 'Addons',
 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 4fd6955cc..cd790e595 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -95,7 +95,8 @@
 'add xtaccess' => 'Voeg een externe toegang toe',
 'add-route' => 'Extra push route',
 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
-'addons' => 'Toevoegingen',
+'addon' => 'Add-on',
+'addons' => 'Add-ons',
 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
 'admin users' => 'Gebruiker met beheerdersrechten.',
 'administrator user password' => 'Beheerderswachtwoord:',
-- 
2.38.0


-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.

Re: [PATCH] services.cgi: translate "Addon"

[Michael Tremer]

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

Hello Robin,

> On 8 Nov 2022, at 16:13, Robin Roevens <robin.roevens(a)disroot.org> wrote:
> 
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> html/cgi-bin/services.cgi | 4 ++--
> langs/de/cgi-bin/de.pl    | 2 +-
> langs/en/cgi-bin/en.pl    | 1 +
> langs/nl/cgi-bin/nl.pl    | 3 ++-
> 4 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> index 14ed01c50..3c0f27f99 100644
> --- a/html/cgi-bin/services.cgi
> +++ b/html/cgi-bin/services.cgi
> @@ -138,7 +138,7 @@ END
> print "</table></div>\n";
> &Header::closebox();
> 
> - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
> + &Header::openbox('100%', 'left', "$Lang::tr{addon} - $Lang::tr{services}");
> my $paramstr=$ENV{QUERY_STRING};
> my @param=split(/!/, $paramstr);
> # Make sure action parameter is actually one of the allowed service actions
> @@ -156,7 +156,7 @@ END
> <div align='center'>
> <table width='80%' cellspacing='1' class='tbl'>
> <tr>
> - <th align='left'><b>Addon $Lang::tr{service}</b></th>
> + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th>
> <th align='center'><b>Boot</b></th>
> <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
> <th align='center'><b>$Lang::tr{'status'}</b></th>
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index db7d117b0..8310f7eba 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -157,7 +157,7 @@
> 'add xtaccess' => 'Externen Zugang hinzugefügt',
> 'add-route' => 'Zusätzlich zu propagierende Route',
> 'added from dhcp lease list' => 'hinzugefügt von der DHCP-Zuordnungsliste',
> -'addon' => 'Add-Ons',
> +'addon' => 'Add-On',
> 'addons' => 'Add-Ons',
> 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
> 'admin users' => 'Liste der Benutzer mit Super User Rechten',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 60dca5be4..2aec959c3 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -155,6 +155,7 @@
> 'add xtaccess' => 'Add External Access',
> 'add-route' => 'Additional push route',
> 'added from dhcp lease list' => 'Added from DHCP lease list',
> +'addon' => 'Addon',
> 'addons' => 'Addons',

Shouldn’t we be consistent and call them “Add-on” everywhere?

Technically this patch is not introducing that as an error, because it has been “Addon” before, but I suppose we should be consistent.

-Michael

> 'admin user password has been changed' => 'Admin user password has been changed.',
> 'admin users' => 'User with superuser rights',
> diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
> index 4fd6955cc..cd790e595 100644
> --- a/langs/nl/cgi-bin/nl.pl
> +++ b/langs/nl/cgi-bin/nl.pl
> @@ -95,7 +95,8 @@
> 'add xtaccess' => 'Voeg een externe toegang toe',
> 'add-route' => 'Extra push route',
> 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
> -'addons' => 'Toevoegingen',
> +'addon' => 'Add-on',
> +'addons' => 'Add-ons',
> 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
> 'admin users' => 'Gebruiker met beheerdersrechten.',
> 'administrator user password' => 'Beheerderswachtwoord:',
> -- 
> 2.38.0
> 
> 
> -- 
> Dit bericht is gescanned op virussen en andere gevaarlijke
> inhoud door MailScanner en lijkt schoon te zijn.
> 

Re: [PATCH] services.cgi: translate "Addon"

[Robin Roevens]

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

Hi Michael

Michael Tremer schreef op di 08-11-2022 om 17:26 [+0000]:
> Hello Robin,
> 
> > On 8 Nov 2022, at 16:13, Robin Roevens <robin.roevens(a)disroot.org>
> > wrote:
> > 
> > Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> > ---
> > html/cgi-bin/services.cgi | 4 ++--
> > langs/de/cgi-bin/de.pl    | 2 +-
> > langs/en/cgi-bin/en.pl    | 1 +
> > langs/nl/cgi-bin/nl.pl    | 3 ++-
> > 4 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
> > index 14ed01c50..3c0f27f99 100644
> > --- a/html/cgi-bin/services.cgi
> > +++ b/html/cgi-bin/services.cgi
> > @@ -138,7 +138,7 @@ END
> > print "</table></div>\n";
> > &Header::closebox();
> > 
> > - &Header::openbox('100%', 'left', "Addon - $Lang::tr{services}");
> > + &Header::openbox('100%', 'left', "$Lang::tr{addon} -
> > $Lang::tr{services}");
> > my $paramstr=$ENV{QUERY_STRING};
> > my @param=split(/!/, $paramstr);
> > # Make sure action parameter is actually one of the allowed service
> > actions
> > @@ -156,7 +156,7 @@ END
> > <div align='center'>
> > <table width='80%' cellspacing='1' class='tbl'>
> > <tr>
> > - <th align='left'><b>Addon $Lang::tr{service}</b></th>
> > + <th align='left'><b>$Lang::tr{addon} $Lang::tr{service}</b></th>
> > <th align='center'><b>Boot</b></th>
> > <th align='center' colspan=2><b>$Lang::tr{'action'}</b></th>
> > <th align='center'><b>$Lang::tr{'status'}</b></th>
> > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> > index db7d117b0..8310f7eba 100644
> > --- a/langs/de/cgi-bin/de.pl
> > +++ b/langs/de/cgi-bin/de.pl
> > @@ -157,7 +157,7 @@
> > 'add xtaccess' => 'Externen Zugang hinzugefügt',
> > 'add-route' => 'Zusätzlich zu propagierende Route',
> > 'added from dhcp lease list' => 'hinzugefügt von der DHCP-
> > Zuordnungsliste',
> > -'addon' => 'Add-Ons',
> > +'addon' => 'Add-On',
> > 'addons' => 'Add-Ons',
> > 'admin user password has been changed' => 'Passwort für Benutzer
> > admin wurde geändert.',
> > 'admin users' => 'Liste der Benutzer mit Super User Rechten',
> > diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> > index 60dca5be4..2aec959c3 100644
> > --- a/langs/en/cgi-bin/en.pl
> > +++ b/langs/en/cgi-bin/en.pl
> > @@ -155,6 +155,7 @@
> > 'add xtaccess' => 'Add External Access',
> > 'add-route' => 'Additional push route',
> > 'added from dhcp lease list' => 'Added from DHCP lease list',
> > +'addon' => 'Addon',
> > 'addons' => 'Addons',
> 
> Shouldn’t we be consistent and call them “Add-on” everywhere?
> 
> Technically this patch is not introducing that as an error, because
> it has been “Addon” before, but I suppose we should be consistent.
> 

The DE translation already existed as "Add-Ons". The NL translation was
"Toevoegingen" which is a literal translation of add-ons but "Add-ons"
as in german better covers the load whereas "Toevoeging" sounds a bit
silly in this context.
On the other hand for French, probably Spanish, and maybe other
languages as they actively try to use native alternatives for english
words, I don't think they will be happy with "Add-on" when there is a
native alternative.

Or did you just mean the english "Addon" which should be "Add-on"? As
indeed, after reading this:
https://grammarhow.com/addon-add-on-or-add-on/ it seems "Addon" is just
plain wrong, and should be written as "Add-on". (I didn't know, I knew
"Add-on" is most common in dutch for this, I assumed the same for
german, as that is what the de.pl file contains. I thought both where
possible in english..)

So I will change the patch for English to use "Add-on"/ "Add-ons"

Regards

Robin

> -Michael
> 
> > 'admin user password has been changed' => 'Admin user password has
> > been changed.',
> > 'admin users' => 'User with superuser rights',
> > diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
> > index 4fd6955cc..cd790e595 100644
> > --- a/langs/nl/cgi-bin/nl.pl
> > +++ b/langs/nl/cgi-bin/nl.pl
> > @@ -95,7 +95,8 @@
> > 'add xtaccess' => 'Voeg een externe toegang toe',
> > 'add-route' => 'Extra push route',
> > 'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
> > -'addons' => 'Toevoegingen',
> > +'addon' => 'Add-on',
> > +'addons' => 'Add-ons',
> > 'admin user password has been changed' => 'Beheerderswachtwoord is
> > gewijzigd.',
> > 'admin users' => 'Gebruiker met beheerdersrechten.',
> > 'administrator user password' => 'Beheerderswachtwoord:',
> > -- 
> > 2.38.0
> > 
> > 
> > -- 
> > Dit bericht is gescanned op virussen en andere gevaarlijke
> > inhoud door MailScanner en lijkt schoon te zijn.
> > 
> 
> 

-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.