aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-24 03:28:50 -0700
committerfriendica <info@friendica.com>2014-05-24 03:28:50 -0700
commit1879a8b747fb7d170d11700310a9384084b7caee (patch)
tree1958e49e6c04c021f7432db6a5f34dd3ca7e9ce6
parentda523fcfacffbf5456e6ab88a116787dea969000 (diff)
parent47bd0b3211102aacfcf60911e33e8ada359a93c6 (diff)
downloadvolse-hubzilla-1879a8b747fb7d170d11700310a9384084b7caee.tar.gz
volse-hubzilla-1879a8b747fb7d170d11700310a9384084b7caee.tar.bz2
volse-hubzilla-1879a8b747fb7d170d11700310a9384084b7caee.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--include/language.php3
-rwxr-xr-xindex.php5
2 files changed, 3 insertions, 5 deletions
diff --git a/include/language.php b/include/language.php
index cfaa855dd..855d94505 100644
--- a/include/language.php
+++ b/include/language.php
@@ -43,8 +43,6 @@ function get_browser_language() {
arsort($langs, SORT_NUMERIC);
}
}
- else
- $langs['en'] = 1;
return $langs;
}
@@ -65,6 +63,7 @@ function get_best_language() {
if(isset($langs) && count($langs)) {
foreach ($langs as $lang => $v) {
+ $lang = strtolower($lang);
if(file_exists("view/$lang") && is_dir("view/$lang")) {
$preferred = $lang;
break;
diff --git a/index.php b/index.php
index 5f0ff9834..5a9ec1026 100755
--- a/index.php
+++ b/index.php
@@ -27,9 +27,6 @@ $a->install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? fal
@include(".htconfig.php");
-$a->language = get_best_language();
-
-
/**
*
* Try to open the database;
@@ -54,6 +51,7 @@ if(! $a->install) {
load_hooks();
call_hooks('init_1');
+ $a->language = get_best_language();
load_translation_table($a->language);
// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
@@ -69,6 +67,7 @@ if(! $a->install) {
}
else {
// load translations but do not check plugins as we have no database
+ $a->language = get_best_language();
load_translation_table($a->language,true);
}