From: gustavf Date: Thu, 2 Mar 2000 10:29:34 +0000 (+0000) Subject: Fixed a few bugs when setting language. X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=288491a4c0647e032d61c0e8e50e1dcbbaea233e;hp=d30d79f24098bb0e09a68467539912208434ac2f Fixed a few bugs when setting language. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@258 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/page_header.php b/functions/page_header.php index 29cf853f..3ffe0c31 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -17,19 +17,16 @@ // Setting the language to use for gettext if it is not English // (the default language) or empty. - if (!isset($squirrelmail_language)) - $squirrelmail_language = getPref ($data_dir, $username, "language"); - + $squirrelmail_language = getPref ($data_dir, $username, "language"); if ($squirrelmail_language != "en" && $squirrelmail_language != "") { - putenv("LANG=$use_language"); + putenv("LANG=$squirrelmail_language"); bindtextdomain("squirrelmail", "../locale/"); textdomain("squirrelmail"); // Setting cookie to use on the login screen the next time the // same user logs in. - if (!isset($HTTP_COOKIE_VARS["squirrelmail_language"])) - setcookie("squirrelmail_language", $squirrelmail_language, - time()+2592000); + setcookie("squirrelmail_language", $squirrelmail_language, + time()+2592000); } function displayPageHeader($color, $mailbox) { diff --git a/src/login.php b/src/login.php index 7c185581..633a8688 100644 --- a/src/login.php +++ b/src/login.php @@ -14,12 +14,21 @@ include("../config/config.php"); if (!isset($strings_php)) include("../functions/strings.php"); - if (!isset($page_header_php)) - include("../functions/page_header.php"); -?> - -"; + echo ""; + echo _("SquirrelMail Login"); + echo "\n"; echo "\n"; // let's check to see if they compiled with gettext support diff --git a/src/options_submit.php b/src/options_submit.php index 81ce4aad..af376da7 100644 --- a/src/options_submit.php +++ b/src/options_submit.php @@ -28,6 +28,8 @@ setSig($data_dir, $username, stripslashes($signature_edit)); + setcookie("squirrelmail_language", $language, time()+2592000); + echo ""; echo "\n"; displayPageHeader($color, "None"); diff --git a/src/signout.php b/src/signout.php index 94abb242..ae78e121 100644 --- a/src/signout.php +++ b/src/signout.php @@ -9,6 +9,16 @@ $username = ""; $key = ""; $logged_in = 0; + + // $squirrelmail_language is set by a cookie when the user + // selects language + if (isset($squirrelmail_language)) { + if ($squirrelmail_language != "en") { + putenv("LANG=".$squirrelmail_language); + bindtextdomain("squirrelmail", "../locale/"); + textdomain("squirrelmail"); + } + } setcookie("username", "", time(), "/"); setcookie("key", "", time(), "/"); diff --git a/src/webmail.php b/src/webmail.php index e4faf466..8070342c 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -14,6 +14,10 @@ setcookie("username", $username, 0, "/"); setcookie("key", $key, 0, "/"); setcookie("logged_in", 1, 0, "/"); + // Refresh the language cookie. + if (isset($squirrelmail_language)) + setcookie("squirrelmail_language", $squirrelmail_language, + time()+2592000); ?>