diff options
author | Michael Tänzer <neo@nhng.de> | 2012-01-24 12:49:47 +0100 |
---|---|---|
committer | Michael Tänzer <neo@nhng.de> | 2012-01-24 12:49:47 +0100 |
commit | ca4dc5c662667cb9da46fd72b6aa15521e3eafd2 (patch) | |
tree | 6f91f97a0ff9a858258418511e04fdc28040b648 /pages/wot | |
parent | 4fb0a50222de7e58a717ef6a78632f1f573183d4 (diff) | |
parent | 923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (diff) | |
download | cacert-devel-ca4dc5c662667cb9da46fd72b6aa15521e3eafd2.tar.gz cacert-devel-ca4dc5c662667cb9da46fd72b6aa15521e3eafd2.tar.xz cacert-devel-ca4dc5c662667cb9da46fd72b6aa15521e3eafd2.zip |
Merge remote-tracking branch 'origin/bug-985' into release
Diffstat (limited to 'pages/wot')
-rw-r--r-- | pages/wot/5.php | 5 | ||||
-rw-r--r-- | pages/wot/9.php | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pages/wot/5.php b/pages/wot/5.php index f717870..c1a6438 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'] != "") @@ -32,8 +33,8 @@ <select name="reminder-lang"> <? if($_SESSION['_config']['reminder-lang'] == "") - $_SESSION['_config']['reminder-lang'] = $_SESSION['profile']['language']; - foreach($_SESSION['_config']['translations'] as $key => $val) + $_SESSION['_config']['reminder-lang'] = L10n::get_translation(); + 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> <? } ?> <? |