Vier: Design issues with preview fixed

[friendica.git] / include / pgettext.php

diff --git a/include/pgettext.php b/include/pgettext.php
index c7fc5869825ef57cca19fd3b75e3ef660acbd660..5a0eab0b01078267a424c65ce47e22ab32879aa5 100644 (file)
--- a/include/pgettext.php
+++ b/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);
@@ -49,6 +49,7 @@ function get_language() {
        if(isset($preferred))
                return $preferred;
 
+    $a = get_app();
        return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
 
@@ -119,6 +120,8 @@ function tt($singular, $plural, $count){
        if(x($a->strings,$singular)) {
                $t = $a->strings[$singular];
                $f = 'string_plural_select_' . str_replace('-','_',$lang);
+               if(! function_exists($f))
+                       $f = 'string_plural_select_default';
                $k = $f($count);
                return is_array($t)?$t[$k]:$t;
        }
@@ -128,4 +131,13 @@ function tt($singular, $plural, $count){
        } else {
                return $singular;
        }
-}}
\ No newline at end of file
+}}
+
+// provide a fallback which will not collide with 
+// a function defined in any language file 
+
+if(! function_exists('string_plural_select_default')) {
+function string_plural_select_default($n) {
+       return ($n != 1);
+}}
+