Browse Source

rename get_language() to get_browser_language()

pull/297/head
friendica 10 years ago
parent
commit
3811fe288f
  1. 6
      include/pgettext.php
  2. 2
      include/security.php
  3. 2
      index.php
  4. 2
      util/db_update.php

6
include/pgettext.php

@ -15,10 +15,10 @@
*/
if(! function_exists('get_language')) {
function get_language() {
if(! function_exists('get_browser_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)
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);

2
include/security.php

@ -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'] .'"');
if($login_initial) {
$l = get_language();
$l = get_browser_language();
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
dbesc(datetime_convert()),

2
index.php

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

2
util/db_update.php

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

Loading…
Cancel
Save