From: gustavf Date: Tue, 20 Jun 2000 08:33:07 +0000 (+0000) Subject: Fixed translations in signout.php. Moved setting of language cookie X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7b0a0f191dab1980b26d4787ce8a884e36c4e2e2;p=squirrelmail.git Fixed translations in signout.php. Moved setting of language cookie from page_header.php to signout.php. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@549 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/page_header.php b/functions/page_header.php index 3145a306..663c369f 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -25,12 +25,6 @@ bindtextdomain("squirrelmail", "../locale/"); textdomain("squirrelmail"); $default_charset = $languages[$squirrelmail_language]["CHARSET"]; - - // Setting cookie to use on the login screen the next time the - // same user logs in. - #setcookie("squirrelmail_language", $squirrelmail_language, - # time()+2592000); - $squirrelmail_language = $language; } } else { function _($string) { diff --git a/src/signout.php b/src/signout.php index d3b542d8..2219f6af 100644 --- a/src/signout.php +++ b/src/signout.php @@ -8,28 +8,39 @@ ** **/ - // Quick Fix for Gettext in LogOut Screen -if (!function_exists("_")) { + include ("../src/load_prefs.php"); + + if (!isset($i18n_php)) + include("../functions/i18n.php"); + if (!isset($prefs_php)) + include ("../functions/prefs.php"); + + // Quick Fix for Gettext in LogOut Screen + if (!function_exists("_")) { function _($string) { return $string; } } - // $squirrelmail_language is set by a cookie when the user - // selects language + $squirrelmail_language = getPref ($data_dir, $username, "language"); if (isset($squirrelmail_language)) { - if ($squirrelmail_language != "en") { - putenv("LANG=".$squirrelmail_language); + if ($squirrelmail_language != "en" && $squirrelmail_language != "") { + putenv("LC_ALL=".$squirrelmail_language); bindtextdomain("squirrelmail", "../locale/"); textdomain("squirrelmail"); + header ("Content-Type: text/html; charset=".$languages[$squirrelmail_language]["CHARSET"]); + + // Setting cookie to use on the login screen the next time the + // same user logs in. + setcookie("squirrelmail_language", $squirrelmail_language, + time()+2592000); + } } - include ("../src/load_prefs.php"); - - setcookie("username", "", time(), "/"); - setcookie("key", "", time(), "/"); - setcookie("logged_in", 0, time(), "/"); + setcookie("username", "", time(), "/"); + setcookie("key", "", time(), "/"); + setcookie("logged_in", 0, time(), "/"); session_destroy(); ?> @@ -48,9 +59,8 @@ if (!function_exists("_")) { echo "
"; echo _("You have been successfully signed out."); echo "
"; - echo _("Click here to "); echo ""; - echo _("log back in."); + echo _("Click here to log back in."); echo "

"; echo " "; echo " ";