diff options
author | Andrew Dolgov <[email protected]> | 2013-04-29 15:54:23 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-29 15:54:23 +0400 |
commit | 7b149552cb99a44f1fbeef642ffc60e91b1f61a0 (patch) | |
tree | 54c4d22d0078dbd2b3e79773251b74afb8ba2bbe /classes | |
parent | e57a1507aeb349c9ba7d673048c5ccb43e2d639b (diff) |
remove language selector from the login form, store language in the database per-user
Diffstat (limited to 'classes')
-rw-r--r-- | classes/handler/public.php | 10 | ||||
-rw-r--r-- | classes/pref/prefs.php | 32 |
2 files changed, 9 insertions, 33 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 0d9b04686..2b5169ca7 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -478,14 +478,6 @@ class Handler_Public extends Handler { <tr><td align="right"><?php echo __("Password:") ?></td> <td align="right"><input type="password" name="password" value="<?php echo $_SESSION["fake_password"] ?>"></td></tr> - <tr><td align="right"><?php echo __("Language:") ?></td> - <td align="right"> - <?php - print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(), - "style='width : 100%''"); - - ?> - </td></tr> <tr><td colspan='2'> <button type="submit"> <?php echo __('Log in') ?></button> @@ -518,7 +510,7 @@ class Handler_Public extends Handler { if (authenticate_user($login, $password)) { $_POST["password"] = ""; - $_SESSION["language"] = $_POST["language"]; + $_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"], false); $_SESSION["ref_schema_version"] = get_schema_version(true); $_SESSION["bw_limit"] = !!$_POST["bw_limit"]; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 35065ea7b..157abb8bc 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -54,6 +54,7 @@ class Pref_Prefs extends Handler_Protected { "USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")), "USER_TIMEZONE" => array(__("User timezone"), ""), "VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")), + "USER_LANGUAGE" => array(__("Language")), "USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes")) ); } @@ -111,18 +112,13 @@ class Pref_Prefs extends Handler_Protected { } } - if ($pref_name == "language") { + if ($pref_name == "USER_LANGUAGE") { if ($_SESSION["language"] != $value) { - setcookie("ttrss_lang", $value, - time() + COOKIE_LIFETIME_LONG); - $_SESSION["language"] = $value; - $need_reload = true; } - } else { - set_pref($pref_name, $value); } + set_pref($pref_name, $value); } if ($need_reload) { @@ -543,22 +539,6 @@ class Pref_Prefs extends Handler_Protected { print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>"; $lnum = 0; - - if ($active_section == 2) { - print "<tr>"; - - print "<td width=\"40%\" class=\"prefName\">"; - print "<label>"; - print __("Language:"); - print "</label>"; - - print "<td>"; - print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(), - "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'"); - print "</td>"; - print "</tr>"; - } - } print "<tr>"; @@ -574,7 +554,11 @@ class Pref_Prefs extends Handler_Protected { print "<td class=\"prefValue\">"; - if ($pref_name == "USER_TIMEZONE") { + if ($pref_name == "USER_LANGUAGE") { + print_select_hash($pref_name, $value, get_translations(), + "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'"); + + } else if ($pref_name == "USER_TIMEZONE") { $timezones = explode("\n", file_get_contents("lib/timezones.txt")); |