From mboxrd@z Thu Jan 1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Some cosmetics for 'lang.pl'
Date: Wed, 08 Nov 2017 12:14:14 +0100
Message-ID: <20171108111414.32230-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2185271649686086337=="
List-Id: <development.lists.ipfire.org>
--===============2185271649686086337==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Found by chance:
Fixed and removed some typos, some trailing spaces/tabs/identations.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
config/cfgroot/lang.pl | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl
index 2b09c4a9f..390dc5ab4 100644
--- a/config/cfgroot/lang.pl
+++ b/config/cfgroot/lang.pl
@@ -15,17 +15,17 @@ use strict;
### A cache file to avoid long recalculation
$Lang::CacheLang =3D '/var/ipfire/langs/cache-lang.pl';
=20
-# When you want to add your own language strings/entries to the ipcop langua=
ge file,
+# When you want to add your own language strings/entries to the language fil=
e,
# you should create a file with <PREFIX>.<LANG>.pl into CONFIG_ROOT/addon-la=
ng dir
-# <PREFIX> is free choosable but should be significant. An Example might be =
"myAddnName"
-# <LANG> is a mnemonic of the used language like en, de, it, nl etc.
-# You can find a detailed list of possible mnemonic's in the file CONFIG_RO=
OT/langs/list
+# PREFIX> is free choosable but should be significant. An example might be "=
myAddnName"
+# <LANG> is a mnemonic of the used language like en, de, it, nl etc.
+# You can find a detailed list of possible mnemonic's in the file CONFIG_ROO=
T/langs/list
# A file could be named "VirtualHttpd.en.pl" for example.
#
# The file content has to start with (of course without the leading #):
# --------- CODE ---------
#%tr =3D (%tr,
-# 'key1' =3D> 'value', # add all your entries key/values here=20
+# 'key1' =3D> 'value', # add all your entries key/values here
# 'key2' =3D> 'value' # and end with (of course without the leading #):
#);
# --------- CODE END---------
@@ -47,7 +47,7 @@ $language =3D $settings{'LANGUAGE'};
=20
#
# Load requested language file from cachefile. If cachefile doesn't exist, b=
uild on the fly.
-# (it is a developper options)
+# (it is a developer option)
#
sub reload {
my $LG =3D &FindWebLanguage(shift);
@@ -56,12 +56,12 @@ sub reload {
=20
# Use CacheLang if present & not empty.
if (-s "$Lang::CacheLang.$LG" ) {
- ##fix: need to put a lock_shared on it in case rebuild is active ?
+ ##fix: need to put a lock_shared on it in case rebuild is active?
do "$Lang::CacheLang.$LG";
- #&General::log ("cachelang file used [$LG]");=09
+ #&General::log ("cachelang file used [$LG]");
return;
}
- =20
+
#&General::log("Building on the fly cachelang file for [$LG]");
do "${General::swroot}/langs/en.pl";
do "${General::swroot}/langs/$LG.pl" if ($LG ne 'en');
@@ -80,20 +80,20 @@ sub reload {
# read again, overwriting 'en' with choosed lang
if ($LG ne 'en') {
foreach my $file (grep (/.*\.$LG\.pl$/,@files) ) {
- do "$AddonDir/$file";
+ do "$AddonDir/$file";
}
}
}
=20
#
# Assume this procedure is called with enough privileges.
-# Merge ipcop langage file + all other extension found in addon-lang
+# Merge language file + all other extension found in addon-lang
# to build a 'cachefile' for selected language
#
sub BuildUniqueCacheLang {
=20
my ($LG) =3D @_;
- =20
+
# Make CacheLang empty so that it won't be used by Lang::reload
open (FILE, ">$Lang::CacheLang.$LG") or return 1;
flock (FILE, 2) or return 1;
@@ -101,7 +101,7 @@ sub BuildUniqueCacheLang {
=20
# Load languages files
&Lang::reload ($LG);
- =20
+
# Write the unique %tr=3D('key'=3D>'value') array
open (FILE, ">$Lang::CacheLang.$LG") or return 1;
flock (FILE, 2) or return 1;
@@ -112,7 +112,7 @@ sub BuildUniqueCacheLang {
}
print FILE ');';
close (FILE);
- =20
+
# Make nobody:nobody file's owner
# Will work when called by root/rc.sysinit
chown (0,0,"$Lang::CacheLang.$LG");
@@ -121,12 +121,12 @@ sub BuildUniqueCacheLang {
}
=20
#
-# Switch Ipcop Language for each lang then call build cachelang
+# Switch language for each lang then call build cachelang
#
sub BuildCacheLang {
=20
my $AddonDir =3D ${General::swroot}.'/addon-lang';
- =20
+
# Correct permission in case addon-installer did not do it
opendir (DIR, $AddonDir);
my @files =3D readdir (DIR);
@@ -140,7 +140,7 @@ sub BuildCacheLang {
my $selected =3D '';;
my $missed =3D '';
my $error =3D 0;
- =20
+
open (LANGS, "${General::swroot}/langs/list");
while (<LANGS>) {
($selected) =3D split (':');
@@ -150,10 +150,10 @@ sub BuildCacheLang {
}
close (LANGS);
=20
- if ($missed) { # collision with current cache lang being used ?
+ if ($missed) { # collision with current cache lang being used?
$error =3D &BuildUniqueCacheLang ($missed);
}
- =20
+
&General::log ("WARNING: cannot build cachelang file for [$missed].") if=
($error);
return $error;
}
--=20
2.15.0
--===============2185271649686086337==--