From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2 08/12] extrahd.cgi: Add missing translation strings Date: Tue, 01 Aug 2023 17:48:35 +0200 Message-ID: <20230801154839.2373-8-stefan.schantl@ipfire.org> In-Reply-To: <20230801154839.2373-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5569642652405754090==" List-Id: --===============5569642652405754090== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Stefan Schantl --- 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(-) 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{'D= EVICE'} $Lang::tr{'extrahd to root'}."; - } + } elsif(not &is_valid_dir("$extrahdsettings{'PATH'}")) { + $errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'D= EVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd b= ecause 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{'D= EVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd be= cause there is already a device mounted'}."; + } elsif(&is_mounted("$extrahdsettings{'PATH'}")) { + $errormessage =3D "$Lang::tr{'extrahd you cant mount'} $extrahdsettings{'D= EVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'} $Lang::tr{'extrahd b= ecause 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'} $extrahdsettings{= 'DEVICE'} $Lang::tr{'extrahd to'} $extrahdsettings{'PATH'}$Lang::tr{'extrahd = because there is already a device mounted'}."; + $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 if the uuid is allready used. @@ -318,16 +321,16 @@ END =20 # Check if the device is mounted properly. if(&is_mounted($mountpoint)) { - print "3D'MOU= \n"; + print "3D'$La= \n"; } else { - print "3D'NOT \n"; + print "3D'$Lang= = ;\n"; } =20 print "\n"; } else { unless($disabled) { print "\n"; - print "3D'UNCO= \n"; + print "3D'$Lan=\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 entfern= t; 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 sic= h das Ziel au=C3=9Ferhalb der erlaubten Pfade befindet', 'extrahd because there is already a device mounted' =3D> ' mounten, weil ber= eits 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 angezeigt = wird, m=C3=BCssen Sie zuerst den Treiber laden oder ggf. auch nachinstalliere= n. 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 da= s 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; restarti= ng 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, yo= u need to install or load the driver.
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', --=20 2.39.2 --===============5569642652405754090==--