From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCHv2 08/12] extrahd.cgi: Add missing translation strings
Date: Wed, 02 Aug 2023 14:02:08 +0200
Message-ID: <20820309-8091-00b9-84d4-70dbb75d4514@ipfire.org>
In-Reply-To: <20230801154839.2373-8-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7681579217779048697=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org>


Am 01.08.2023 um 17:48 schrieb Stefan Schantl:
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>   html/cgi-bin/extrahd.cgi | 21 ++++++++++++---------
>   langs/de/cgi-bin/de.pl   |  5 +++++
>   langs/en/cgi-bin/en.pl   |  5 +++++
>   3 files changed, 22 insertions(+), 9 deletions(-)
>=20
> diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
> index de5f26d0e..0b59a02f7 100644
> --- a/html/cgi-bin/extrahd.cgi
> +++ b/html/cgi-bin/extrahd.cgi
> @@ -98,14 +98,17 @@ $extrahdsettings{'UUID'} =3D '';
>   ## Add a new device.
>   #
>   if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) {
> +	# Check if a mount path has been given.
> +	if (not $extrahdsettings{'PATH'}) {
> +		$errormessage =3D "$Lang::tr{'extrahd no mount point given'}.";
> +=09
>   	# Check if a valid mount path has been choosen.
> -	unless(&is_valid_dir("$extrahdsettings{'PATH'}")) {
> -		$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{=
'DEVICE'} $Lang::tr{'extrahd to root'}.";
> -	}
> +	} elsif(not &is_valid_dir("$extrahdsettings{'PATH'}")) {
> +		$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{=
'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd=
 because it is outside the allowed mount path'}.";
>  =20
>   	# Check if the given path allready is mounted somewhere.
> -	if(&is_mounted("$extrahdsettings{'PATH'}")) {
> -		$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{=
'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd =
because there is already a device mounted'}.";
> +	} elsif(&is_mounted("$extrahdsettings{'PATH'}")) {
> +		$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{=
'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd=
 because there is already a device mounted'}.";
>   	}
>  =20
>   	# Check against may previously configured drives.
> @@ -122,7 +125,7 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'}) {
>  =20
>   			# Check if the path is allready used.
>   			if ( "$extrahdsettings{'PATH'}" eq "$path" ) {
> -				$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsetting=
s{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrah=
d because there is already a device mounted'}.";
> +				$errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsetting=
s{'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extra=
hd because there is already a device mounted'}.";
>   			}
>  =20
>   			# Check if the uuid is allready used.
> @@ -318,16 +321,16 @@ END
>  =20
>   						# Check if the device is mounted properly.
>   						if(&is_mounted($mountpoint)) {
> -							print "<img src=3D'/images/updbooster/updxl-led-green.gif' alt=3D'M=
OUNTED' title=3D'MOUNTED'>&nbsp;\n";
> +							print "<img src=3D'/images/updbooster/updxl-led-green.gif' alt=3D'$=
Lang::tr{'extrahd mounted'}' title=3D'$Lang::tr{'extrahd mounted'}'>&nbsp;\n";
>   						} else {
> -							print "<img src=3D'/images/updbooster/updxl-led-red.gif' alt=3D'NOT=
 MOUNTED' title=3D'NOT MOUNTED'>&nbsp;\n";
> +							print "<img src=3D'/images/updbooster/updxl-led-red.gif' alt=3D'$La=
ng::tr{'extrahd not mounted'}' title=3D'$Lang::tr{'extrahd not mounted'}'>&nb=
sp;\n";
>   						}
>  =20
>   						print "<input type=3D'image' alt=3D'$Lang::tr{'delete'}' title=3D'$=
Lang::tr{'delete'}' src=3D'/images/delete.gif'>\n";
>   					} else {
>   						unless($disabled) {
>   							print "<input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'=
add'}'>\n";
> -							print "<img src=3D'/images/updbooster/updxl-led-gray.gif' alt=3D'UN=
CONFIGURED' title=3D'UNCONFIGURED'>&nbsp;\n";
> +							print "<img src=3D'/images/updbooster/updxl-led-gray.gif' alt=3D'$L=
ang::tr{'extrahd not configured'}' title=3D'$Lang::tr{'extrahd not configured=
'}'>&nbsp;\n";
>   							print "<input type=3D'image' alt=3D'$Lang::tr{'add'}' title=3D'$La=
ng::tr{'add'}' src=3D'/images/add.gif'>\n";
>   						}
>   					}
> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
> index 33730f0c3..37b17b431 100644
> --- a/langs/de/cgi-bin/de.pl
> +++ b/langs/de/cgi-bin/de.pl
> @@ -1025,11 +1025,16 @@
>   'external access rule removed' =3D> ' Regel f=C3=BCr externen Zugang entf=
ernt; starte Zugangskontroller neu',
>   'external aliases configuration' =3D> 'Externe Alias-Konfiguration',
>   'extrahd' =3D> 'ExtraHD',
> +'extrahd because it is outside the allowed mount path' =3D> 'mounten, da s=
ich das Ziel au=C3=9Ferhalb der erlaubten Pfade befindet',
>   'extrahd because there is already a device mounted' =3D> ' mounten, weil =
bereits ein Ger=C3=A4t gemountet ist',
>   'extrahd cant umount' =3D> 'Konnte',
>   'extrahd detected drives' =3D> 'Gefundene Laufwerke',
>   'extrahd install or load driver' =3D> 'Wenn Ihre Festplatte nicht angezei=
gt wird, m=C3=BCssen Sie zuerst den Treiber laden oder ggf. auch nachinstalli=
eren. Wenn diese jedoch angezeigt wird, aber keine Partitionen zu sehen sind,=
 m=C3=BCssen diese erst angelegt werden.',
>   'extrahd maybe the device is in use' =3D> 'nicht mounten. Vielleicht wird=
 das Ger=C3=A4t bereits verwendet',
> +'extrahd no mount point given' =3D> 'Kein Pfad zum mounten angegeben',
> +'extrahd mounted' =3D> 'Gemounted',
> +'extrahd not mounted' =3D> 'Nicht gemounted',
> +'extrahd not configured' =3D> 'Nicht konfiguriert',
>   'extrahd to' =3D> 'nicht nach',
>   'extrahd to root' =3D> 'nicht nach root mounten',
>   'extrahd unable to read' =3D> 'Lesefehler von',
> diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
> index 729516538..b00ecc5eb 100644
> --- a/langs/en/cgi-bin/en.pl
> +++ b/langs/en/cgi-bin/en.pl
> @@ -1072,11 +1072,16 @@
>   'external access rule removed' =3D> ' External access rule removed; resta=
rting access controller',
>   'external aliases configuration' =3D> 'External aliases configuration',
>   'extrahd' =3D> 'ExtraHD',
> +'extrahd because it it outside the allowed mount path' =3D> ', because it =
is outside the allowed mount path',
>   'extrahd because there is already a device mounted' =3D> ', because there=
 is already a device mounted',
>   'extrahd cant umount' =3D> 'Can\'t umount',
>   'extrahd detected drives' =3D> 'detected drives',
>   'extrahd install or load driver' =3D> 'If your device isn\'t listed here,=
 you need to install or load the driver.<br />If you can see your device but =
no partitions you have to create them first.',
> +'extrahd no mount point given', =3D> 'No mount point given',
>   'extrahd maybe the device is in use' =3D> '. Maybe the device is in use',
> +'extrahd mounted' =3D> 'Mounted',
> +'extrahd not mounted' =3D> 'Not mounted',
> +'extrahd not configured' =3D> 'Not configured',
>   'extrahd to' =3D> 'to',
>   'extrahd to root' =3D> 'to root',
>   'extrahd unable to read' =3D> 'Unable to read',

--===============7681579217779048697==--