diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-10-16 06:09:25 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-10-16 06:09:25 +0200 |
| commit | 147cce7acd3ce673c494dc9b30f36b3d5554abea (patch) | |
| tree | 28ef84874a81cd92558200c2a9c7a522cb94d906 /pages | |
| parent | 6e0ae5b60fdb53fccfa90519522fb9b1cbd44e45 (diff) | |
| download | cacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.tar.gz cacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.tar.xz cacert-devel-147cce7acd3ce673c494dc9b30f36b3d5554abea.zip | |
bug 985: replace occurences of $_SESSION['_config']['translations']
this includes a little rewrite of reminder handling
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/account/41.php | 11 | ||||
| -rw-r--r-- | pages/wot/5.php | 3 | ||||
| -rw-r--r-- | pages/wot/9.php | 9 |
3 files changed, 15 insertions, 8 deletions
diff --git a/pages/account/41.php b/pages/account/41.php index e44eec9..d2cfc8c 100644 --- a/pages/account/41.php +++ b/pages/account/41.php @@ -14,7 +14,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> +*/ + +require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); +?> + <form method="post" action="account.php"> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400"> <tr> @@ -24,11 +28,10 @@ <td class="DataTD"><?=_("My prefered language")?>:</td> <td class="DataTD"><select name="lang"> <? -echo $_SESSION['_config']['language']; - foreach($_SESSION['_config']['translations'] as $key => $val) + foreach(L10n::$translations as $key => $val) { echo "<option value='$key'"; - if($key == $_SESSION['_config']['language']) + if($key == L10n::get_translation()) echo " selected"; echo ">$val</option>\n"; } diff --git a/pages/wot/5.php b/pages/wot/5.php index 6c53d00..4b574af 100644 --- a/pages/wot/5.php +++ b/pages/wot/5.php @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ include_once("../includes/shutdown.php"); + require_once("../includes/lib/l10n.php"); ?> <? if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") @@ -39,7 +40,7 @@ <? if($_SESSION['_config']['reminder-lang'] == "") $_SESSION['_config']['reminder-lang'] = $_SESSION['profile']['language']; - foreach($_SESSION['_config']['translations'] as $key => $val) + foreach(L10n::$translations as $key => $val) { echo "<option value='$key'"; if($key == $_SESSION['_config']['reminder-lang']) diff --git a/pages/wot/9.php b/pages/wot/9.php index b974c5d..bfa7a98 100644 --- a/pages/wot/9.php +++ b/pages/wot/9.php @@ -14,8 +14,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> -<? +*/ + + require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); + + $res = mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."' and `listme`='1'"); if(mysql_num_rows($res) <= 0) { @@ -47,7 +50,7 @@ <? if($userlang != "") { ?> <tr> <td class="DataTD"><?=_("Language")?>:</td> - <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), $user['fname'], $_SESSION['_config']['translations'][$userlang]) ?></td> + <td class="DataTD" align="left"><? printf(_("%s prefers to be contacted in %s"), $user['fname'], L10n::$translations[$userlang]) ?></td> </tr> <? } ?> <? |