use include/language.php for all language and translation code

This commit is contained in:
friendica 2012-07-16 01:26:26 -07:00
parent 945ac38a73
commit c148455570
6 changed files with 145 additions and 148 deletions

View file

@ -5,7 +5,7 @@ require_once('include/network.php');
require_once('include/plugin.php');
require_once('include/text.php');
require_once('include/datetime.php');
require_once('include/pgettext.php');
require_once('include/language.php');
require_once('include/nav.php');
require_once('include/cache.php');

View file

@ -826,7 +826,6 @@ function item_store($arr,$force_parent = false) {
if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
$arr['body'] = strip_tags($arr['body']);
require_once('include/language.php');
$arr['lang'] = detect_language($arr['body']);

View file

@ -1,6 +1,149 @@
<?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_browser_language')) {
function get_browser_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);
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;
$a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
}}
function push_lang($language) {
global $lang, $a;
$a->langsave = $lang;
if($language === $lang)
return;
if(isset($a->strings) && count($a->strings)) {
$a->stringsave = $a->strings;
}
$a->strings = array();
load_translation_table($language);
$lang = $language;
}
function pop_lang() {
global $lang, $a;
if($lang === $a->langsave)
return;
if(isset($a->stringsave))
$a->strings = $a->stringsave;
else
$a->strings = array();
$lang = $a->langsave;
}
// load string translation table for alternate language
if(! function_exists('load_translation_table')) {
function load_translation_table($lang) {
global $a;
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}
else
$a->strings = array();
}}
// translate string if translation exists
if(! function_exists('t')) {
function t($s) {
$a = get_app();
if(x($a->strings,$s)) {
$t = $a->strings[$s];
return is_array($t)?$t[0]:$t;
}
return $s;
}}
if(! function_exists('tt')){
function tt($singular, $plural, $count){
global $lang;
$a = get_app();
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;
}
if ($count!=1){
return $plural;
} else {
return $singular;
}
}}
// 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);
}}
function detect_language($s) {
$detected_languages = array(

View file

@ -1,143 +0,0 @@
<?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_browser_language')) {
function get_browser_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);
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;
$a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
}}
function push_lang($language) {
global $lang, $a;
$a->langsave = $lang;
if($language === $lang)
return;
if(isset($a->strings) && count($a->strings)) {
$a->stringsave = $a->strings;
}
$a->strings = array();
load_translation_table($language);
$lang = $language;
}
function pop_lang() {
global $lang, $a;
if($lang === $a->langsave)
return;
if(isset($a->stringsave))
$a->strings = $a->stringsave;
else
$a->strings = array();
$lang = $a->langsave;
}
// load string translation table for alternate language
if(! function_exists('load_translation_table')) {
function load_translation_table($lang) {
global $a;
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}
else
$a->strings = array();
}}
// translate string if translation exists
if(! function_exists('t')) {
function t($s) {
$a = get_app();
if(x($a->strings,$s)) {
$t = $a->strings[$s];
return is_array($t)?$t[0]:$t;
}
return $s;
}}
if(! function_exists('tt')){
function tt($singular, $plural, $count){
global $lang;
$a = get_app();
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;
}
if ($count!=1){
return $plural;
} else {
return $singular;
}
}}
// 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);
}}

View file

@ -4,7 +4,7 @@ require_once('include/config.php');
require_once('include/network.php');
require_once('include/plugin.php');
require_once('include/text.php');
require_once('include/pgettext.php');
require_once('include/language.php');
require_once('include/datetime.php');
function create_user($arr) {

View file

@ -217,8 +217,6 @@ function item_post(&$a) {
$emailcc = notags(trim($_REQUEST['emailcc']));
$body = escape_tags(trim($_REQUEST['body']));
require_once('include/language.php');
$language = detect_language($body);
logger('detected language: ' . $language);