diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-10-16 22:47:02 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-10-16 22:47:02 +0200 |
| commit | 883ea6270b45e2d712a71d8361fb4a4daffb12a9 (patch) | |
| tree | d33236ed3dd40c3ee0df536cf6e4e9f4f3a0de97 /includes/loggedin.php | |
| parent | 147cce7acd3ce673c494dc9b30f36b3d5554abea (diff) | |
| download | cacert-devel-883ea6270b45e2d712a71d8361fb4a4daffb12a9.tar.gz cacert-devel-883ea6270b45e2d712a71d8361fb4a4daffb12a9.tar.xz cacert-devel-883ea6270b45e2d712a71d8361fb4a4daffb12a9.zip | |
bug 985: move binding to a gettext domain into a separate method and
update some more legacy language handling
removed screenshot() as it's never used and language dependent
still open: translation in PDFs
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/loggedin.php')
| -rw-r--r-- | includes/loggedin.php | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/includes/loggedin.php b/includes/loggedin.php index bf6b455..5734fad 100644 --- a/includes/loggedin.php +++ b/includes/loggedin.php @@ -17,6 +17,7 @@ */ include_once("../includes/lib/general.php"); + require_once("../includes/lib/l10n.php"); if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] != 0) { @@ -110,18 +111,12 @@ if($_SESSION['profile']['language'] == "") { - $query = "update `users` set `language`='".$_SESSION['_config']['language']."' + $query = "update `users` set `language`='".L10n::get_translation()."' where `id`='".$_SESSION['profile']['id']."'"; mysql_query($query); } else { - $_SESSION['_config']['language'] = $_SESSION['profile']['language']; - - putenv("LANG=".$_SESSION['_config']['language']); - setlocale(LC_ALL, $_SESSION['_config']['language']); - - $domain = 'messages'; - bindtextdomain("$domain", $_SESSION['_config']['filepath']."/locale"); - textdomain("$domain"); + L10n::set_translation($_SESSION['profile']['language']); + L10n::init_gettext(); } } |