From 091cc18bb02089b8906c9dc04d844d4fde2a1b5e Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 4 Jul 2003 16:25:05 +0000 Subject: [PATCH] updates for better translation --- lam/lib/config.inc | 40 ++++++++++++------------ lam/lib/profiles.inc | 4 +-- lam/templates/config/confsave.php | 38 +++++++++++----------- lam/templates/lists/listusers.php | 7 ++--- lam/templates/profedit/profilecreate.php | 4 +-- 5 files changed, 45 insertions(+), 48 deletions(-) diff --git a/lam/lib/config.inc b/lam/lib/config.inc index c5ca4e16..9f485c3b 100644 --- a/lam/lib/config.inc +++ b/lam/lib/config.inc @@ -371,26 +371,26 @@ class Config { // prints current preferences function printconf() { - echo _("ServerURL: ") . $this->ServerURL . "
"; - echo _("Samba3: ") . $this->samba3 . "
"; - echo _("Domain SID: ") . $this->domainSID . "
"; - echo _("UserSuffix: ") . $this->Suff_users . "
"; - echo _("GroupSuffix: ") . $this->Suff_groups . "
"; - echo _("HostSuffix: ") . $this->Suff_hosts . "
"; - echo _("minUID: ") . $this->MinUID . "
"; - echo _("maxUID: ") . $this->MaxUID . "
"; - echo _("minGID: ") . $this->MinGID . "
"; - echo _("maxGID: ") . $this->MaxGID . "
"; - echo _("minMachine: ") . $this->MinMachine . "
"; - echo _("maxMachine: ") . $this->MaxMachine . "
"; - echo _("userlistAttributes: ") . $this->userlistAttributes . "
"; - echo _("grouplistAttributes: ") . $this->grouplistAttributes . "
"; - echo _("hostlistAttributes: ") . $this->hostlistAttributes . "
"; - echo _("maxlistentries: ") . $this->maxlistentries . "
"; - echo _("defaultLanguage: ") . $this->defaultLanguage . "
"; - echo _("scriptPath: ") . $this->scriptPath . "
"; - echo _("scriptServer: ") . $this->scriptServer . "
"; - echo _("Admins: ") . $this->Adminstring; + echo "" . _("ServerURL") . ": " . $this->ServerURL . "
"; + echo "" . _("Samba3") . ": " . $this->samba3 . "
"; + echo "" . _("Domain SID") . ": " . $this->domainSID . "
"; + echo "" . _("UserSuffix") . ": " . $this->Suff_users . "
"; + echo "" . _("GroupSuffix") . ": " . $this->Suff_groups . "
"; + echo "" . _("HostSuffix") . ": " . $this->Suff_hosts . "
"; + echo "" . _("minUID") . ": " . $this->MinUID . "
"; + echo "" . _("maxUID") . ": " . $this->MaxUID . "
"; + echo "" . _("minGID") . ": " . $this->MinGID . "
"; + echo "" . _("maxGID") . ": " . $this->MaxGID . "
"; + echo "" . _("minMachine") . ": " . $this->MinMachine . "
"; + echo "" . _("maxMachine") . ": " . $this->MaxMachine . "
"; + echo "" . _("userlistAttributes") . ": " . $this->userlistAttributes . "
"; + echo "" . _("grouplistAttributes") . ": " . $this->grouplistAttributes . "
"; + echo "" . _("hostlistAttributes") . ": " . $this->hostlistAttributes . "
"; + echo "" . _("maxlistentries") . ": " . $this->maxlistentries . "
"; + echo "" . _("defaultLanguage") . ": " . $this->defaultLanguage . "
"; + echo "" . _("scriptPath") . ": " . $this->scriptPath . "
"; + echo "" . _("scriptServer") . ": " . $this->scriptServer . "
"; + echo "" . _("Admins") . ": " . $this->Adminstring; } // functions to read/write preferences diff --git a/lam/lib/profiles.inc b/lam/lib/profiles.inc index 85ad612d..431d7148 100644 --- a/lam/lib/profiles.inc +++ b/lam/lib/profiles.inc @@ -296,7 +296,7 @@ function loadHostProfile($profile) { function saveUserProfile($account, $profile) { if (!eregi("^([0-9]|[a-z]|-|_)*$", $profile)) exit; if (!is_object($account)) { - StatusMessage("ERROR", "", _("saveUserProfile: \$account has wrong type!")); + StatusMessage("ERROR", "", _("saveUserProfile: account has wrong type!")); exit; } $path = substr(__FILE__, 0, strlen(__FILE__) - 17) . "/config/profiles/users/" . $profile . ".pru"; @@ -357,7 +357,7 @@ function saveGroupProfile($account, $profile) { function saveHostProfile($account, $profile) { if (!eregi("^[0-9a-z\\-_]+$", $profile)) exit; if (!is_object($account)) { - StatusMessage ("ERROR", "", _("saveHostProfile: \$account has wrong type!")); + StatusMessage ("ERROR", "", _("saveHostProfile: account has wrong type!")); exit; } $path = substr(__FILE__, 0, strlen(__FILE__) - 17) . "/config/profiles/hosts/" . $profile . ".prh"; diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php index 2ae9845f..e66a1d86 100644 --- a/lam/templates/config/confsave.php +++ b/lam/templates/config/confsave.php @@ -75,95 +75,95 @@ echo ("

" // check new preferences if (!$serverurl) { - echo _("" . _("Server Address is empty!") . ""); + echo ("" . _("Server Address is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$admins) { - echo _("" . _("List of admin users is empty!") . ""); + echo ("" . _("List of admin users is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$suffusers) { - echo _("" . _("UserSuffix is empty!") . ""); + echo ("" . _("UserSuffix is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$suffgroups) { - echo _("" . _("UserSuffix is empty!") . ""); + echo ("" . _("UserSuffix is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$suffhosts) { - echo _("" . _("HostSuffix is empty!") . ""); + echo ("" . _("HostSuffix is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$minUID) { - echo _("" . _("MinUID is empty!") . ""); + echo ("" . _("MinUID is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$maxUID) { - echo _("" . _("MaxUID is empty!") . ""); + echo ("" . _("MaxUID is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$minGID) { - echo _("" . _("MinGID is empty!") . ""); + echo ("" . _("MinGID is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$maxGID) { - echo _("" . _("MaxGID is empty!") . ""); + echo ("" . _("MaxGID is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$minMach) { - echo _("" . _("MinMachine is empty!") . ""); + echo ("" . _("MinMachine is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$maxMach) { - echo _("" . _("MaxMachine is empty!") . ""); + echo ("" . _("MaxMachine is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$usrlstattr) { - echo _("" . _("No attributes in user list!") . ""); + echo ("" . _("No attributes in user list!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$grplstattr) { - echo _("" . _("No attributes in group list!") . ""); + echo ("" . _("No attributes in group list!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$hstlstattr) { - echo _("" . _("No attributes in host list!") . ""); + echo ("" . _("No attributes in host list!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$maxlistentries) { - echo _("" . _("Max list entries is empty!") . ""); + echo ("" . _("Max list entries is empty!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$language) { - echo _("" . _("Language is not defined!") . ""); + echo ("" . _("Language is not defined!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (!$samba3) { - echo _("" . _("Samba version is not defined!") . ""); + echo ("" . _("Samba version is not defined!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } if (($samba3 == "yes") && (!$domainSID)) { - echo _("" . _("Samba 3 needs a domain SID!") . ""); + echo ("" . _("Samba 3 needs a domain SID!") . ""); echo ("\n


" . _("Back to preferences...") . ""); exit; } @@ -197,7 +197,7 @@ else $conf->set_scriptserver(""); // check if password was changed if ($pass1 != $pass2) { - echo _("" . _("Passwords are different!") . ""); + echo ("" . _("Passwords are different!") . ""); exit; } // set new password diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index 9e1d3de8..268fc7f5 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -115,7 +115,7 @@ session_register('usr_suffix'); $searchfilter = ""; for ($k = 0; $k < sizeof($desc_array); $k++) { if ($_POST["filter" . strtolower($attr_array[$k])]) { - $searchfilter = $searchfilter . "&filter" . + $searchfilter = $searchfilter . "&filter" . strtolower($attr_array[$k]) . "=". $_POST["filter" . strtolower($attr_array[$k])]; } @@ -153,10 +153,7 @@ if ($_SESSION["userlist"] && $_GET["norefresh"]) { if ($sr) { $userinfo = ldap_get_entries ($_SESSION["ldap"]->server, $sr); ldap_free_result ($sr); - if ($userinfo["count"] == 0) - StatusMessage ("WARN", "", - _("No User(s) found with applied search filter <") . - $filter . ">"); + if ($userinfo["count"] == 0) StatusMessage("WARN", "", _("No Users found!")); // delete first array entry which is "count" array_shift($userinfo); diff --git a/lam/templates/profedit/profilecreate.php b/lam/templates/profedit/profilecreate.php index 22aa563d..556fe8a7 100644 --- a/lam/templates/profedit/profilecreate.php +++ b/lam/templates/profedit/profilecreate.php @@ -243,7 +243,7 @@ if ($_GET['type'] == "user") { } // save profile saveUserProfile($acct, $profname); - echo ("

" . _("Profile ") . $profname . _(" was saved.") . "

"); + echo ("

" . _("Profile $profname was saved.") . "

"); echo ("

" . _("Back to profile editor") . "

"); } @@ -269,7 +269,7 @@ elseif ($_GET['type'] == "host") { } // save profile saveHostProfile($acct, $profname); - echo ("

" . _("Profile ") . $profname . _(" was saved.") . "

"); + echo ("

" . _("Profile $profname was saved.") . "

"); echo ("

" . _("Back to profile editor") . "

"); }