jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #735 from fabrixxm/bug712

Browse source 
Fixes #712
This commit is contained in:
fabrixxm 2013-07-12 00:51:26 -07:00
commit 98105afffb
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/pgettext.php
View file

@ -87,16 +87,19 @@ function pop_lang() {
} }
// load string translation table for alternate language // l
if(! function_exists('load_translation_table')) { if(! function_exists('load_translation_table')) {
/**
* load string translation table for alternate language
*
* first plugin strings are loaded, then globals
*
* @param string $lang language code to load
*/
function load_translation_table($lang) { function load_translation_table($lang) {
global $a; global $a;
$a->strings = array();
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}
// load enabled plugins strings // load enabled plugins strings
$plugins = q("SELECT name FROM addon WHERE installed=1;"); $plugins = q("SELECT name FROM addon WHERE installed=1;");
if ($plugins!==false) { if ($plugins!==false) {
@ -107,6 +110,12 @@ function load_translation_table($lang) {
} }
} }
} }
$a->strings = array();
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}
}} }}
// translate string if translation exists // translate string if translation exists