diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/auth.php | 4 | ||||
| -rw-r--r-- | include/pgettext.php | 51 |
2 files changed, 54 insertions, 1 deletions
diff --git a/include/auth.php b/include/auth.php index 1c430406e..382d2c658 100644 --- a/include/auth.php +++ b/include/auth.php @@ -232,9 +232,11 @@ else { $_SESSION['cid'] = $a->cid; } + $l = get_language(); - q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", + q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1", dbesc(datetime_convert()), + dbesc($l), intval($_SESSION['uid']) ); diff --git a/include/pgettext.php b/include/pgettext.php index 2ffee70bc..37e09b54d 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -1,8 +1,59 @@ <?php + /** * translation support */ + +/** + * + * Get the language setting directly from system variables, bypassing get_config() + * as database may not yet be configured. + * + * If possible, we use the value from the browser. + * + */ + + +if(! function_exists('get_language')) { +function get_language() { + + if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + // break up string into pieces (languages and q factors) + preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', + $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse); + + if (count($lang_parse[1])) { + // create a list like "en" => 0.8 + $langs = array_combine($lang_parse[1], $lang_parse[4]); + + // set default to 1 for any without q factor + foreach ($langs as $lang => $val) { + if ($val === '') $langs[$lang] = 1; + } + + // sort list based on value + arsort($langs, SORT_NUMERIC); + } + } + + if(isset($langs) && count($langs)) { + foreach ($langs as $lang => $v) { + if(file_exists("view/$lang") && is_dir("view/$lang")) { + $preferred = $lang; + break; + } + } + } + + if(isset($preferred)) + return $preferred; + + return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); +}} + + + // load string translation table for alternate language if(! function_exists('load_translation_table')) { |