public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 22:15:56 +00:00
Code Issues Releases Wiki Activity

remove language selector from the login form, store language in the database per-user

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-29 15:54:23 +04:00
parent e57a1507ae
commit 7b149552cb
8 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/functions.php
View File

@@ -1,6 +1,6 @@
<?php
define('EXPECTED_CONFIG_VERSION', 26);
define('SCHEMA_VERSION', 119);
define('SCHEMA_VERSION', 120);
define('LABEL_BASE_INDEX', -1024);
define('PLUGIN_FEED_BASE_INDEX', -128);
@@ -97,11 +97,12 @@
$lang = _TRANSLATION_OVERRIDE_DEFAULT;
}
// startup_gettext() is called before session_start() so we can't rely
// on $_SESSION['language'] here.
if ($_SESSION["uid"]) {
$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
$lang = $_COOKIE["ttrss_lang"];
if ($pref_lang) {
$lang = $pref_lang;
}
}
if ($lang) {
@@ -118,8 +119,6 @@
}
}
startup_gettext();
require_once 'db-prefs.php';
require_once 'version.php';
require_once 'ccache.php';
@@ -798,12 +797,8 @@
$_SESSION["last_login_update"] = time();
}
if ($_SESSION["uid"] && $_SESSION["language"]) {
setcookie("ttrss_lang", $_SESSION["language"],
time() + COOKIE_LIFETIME_LONG);
}
if ($_SESSION["uid"]) {
startup_gettext();
load_user_plugins($_SESSION["uid"]);
/* cleanup ccache */