friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

rename get_language() to get_browser_language()

This commit is contained in:
friendica 2012-05-13 04:52:29 -07:00
parent eaf028c9fb
commit 3811fe288f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pgettext.php
View File

@ -15,10 +15,10 @@
*/ */
if(! function_exists('get_language')) { if(! function_exists('get_browser_language')) {
function get_language() { function get_browser_language() {
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
// break up string into pieces (languages and q factors) // 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', 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); $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);

2
include/security.php
View File

@ -76,7 +76,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
if($login_initial) { if($login_initial) {
$l = get_language(); $l = get_browser_language();
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1", q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),

2
index.php
View File

@ -27,7 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
@include(".htconfig.php"); @include(".htconfig.php");
$lang = get_language(); $lang = get_browser_language();
load_translation_table($lang); load_translation_table($lang);

2
util/db_update.php
View File

@ -11,7 +11,7 @@ require_once("boot.php");
$a = new App; $a = new App;
@include(".htconfig.php"); @include(".htconfig.php");
$lang = get_language(); $lang = get_browser_language();
load_translation_table($lang); load_translation_table($lang);
require_once("dba.php"); require_once("dba.php");