From 00df3ef5a7d69f9c0acec82aa82710e29eabe1a8 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Thu, 11 Jul 2013 03:34:49 -0400 Subject: [PATCH] Fixes #712 --- include/pgettext.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/include/pgettext.php b/include/pgettext.php index 0c003a750..23430fc77 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -87,16 +87,19 @@ function pop_lang() { } -// load string translation table for alternate language +// l 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) { global $a; - - $a->strings = array(); - if(file_exists("view/$lang/strings.php")) { - include("view/$lang/strings.php"); - } + // load enabled plugins strings $plugins = q("SELECT name FROM addon WHERE installed=1;"); 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