diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
commit | d554681174084e1715dfae4c21af9f6edcbad59e (patch) | |
tree | eb585cce4ebe24d663b2e7eab28a62da612efec1 /include/language.php | |
parent | e00b8a70829213a4333a53a097c2c498d529f5d6 (diff) | |
parent | 551cf8ee9413c5c57e7b71d6016466e598636900 (diff) | |
download | volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.gz volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.bz2 volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.zip |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/language.php')
-rw-r--r-- | include/language.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/language.php b/include/language.php index 14139e90c..238c23028 100644 --- a/include/language.php +++ b/include/language.php @@ -82,13 +82,11 @@ function get_best_language() { if($arr['preferred'] !== 'unset') return $arr['preferred']; - $a = get_app(); return ((isset(App::$config['system']['language'])) ? App::$config['system']['language'] : 'en'); } function push_lang($language) { - global $a; App::$langsave = App::$language; @@ -104,7 +102,6 @@ function push_lang($language) { } function pop_lang() { - global $a; if(App::$language === App::$langsave) return; @@ -124,7 +121,6 @@ function pop_lang() { * @param boolean $install (optional) default false */ function load_translation_table($lang, $install = false) { - global $a; App::$strings = array(); @@ -170,7 +166,6 @@ function load_translation_table($lang, $install = false) { * */ function t($s, $ctx = '') { - global $a; $cs = $ctx ? '__ctx:' . $ctx . '__ ' . $s : $s; if (x(App::$strings, $cs)) { @@ -205,7 +200,6 @@ function translate_projectname($s) { * @return string */ function tt($singular, $plural, $count, $ctx = ''){ - $a = get_app(); $cs = $ctx ? "__ctx:" . $ctx . "__ " . $singular : $singular; if (x(App::$strings,$cs)) { |