diff options
| author | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
| commit | f950d27b3debfe08e022a477dbfb4fac101106e4 (patch) | |
| tree | 38f62f0828163715c634e17290e2d77eb29d1b32 /include/language.php | |
| parent | 8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (diff) | |
| parent | 2a2da48d1871f408232a8397632f06528c8b43ae (diff) | |
| download | volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.gz volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.bz2 volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/language.php')
| -rw-r--r-- | include/language.php | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/language.php b/include/language.php index 7dbe3dd02..59979aa85 100644 --- a/include/language.php +++ b/include/language.php @@ -120,7 +120,11 @@ function load_translation_table($lang, $install = false) { global $a; $a->strings = array(); - if(file_exists("view/$lang/strings.php")) { + + if(file_exists("view/$lang/hstrings.php")) { + include("view/$lang/hstrings.php"); + } + elseif(file_exists("view/$lang/strings.php")) { include("view/$lang/strings.php"); } @@ -129,7 +133,10 @@ function load_translation_table($lang, $install = false) { if ($plugins !== false) { foreach($plugins as $p) { $name = $p['name']; - if(file_exists("addon/$name/lang/$lang/strings.php")) { + if(file_exists("addon/$name/lang/$lang/hstrings.php")) { + include("addon/$name/lang/$lang/hstrings.php"); + } + elseif(file_exists("addon/$name/lang/$lang/strings.php")) { include("addon/$name/lang/$lang/strings.php"); } } @@ -139,7 +146,10 @@ function load_translation_table($lang, $install = false) { // Allow individual strings to be over-ridden on this site // Either for the default language or for all languages - if(file_exists("view/local-$lang/strings.php")) { + if(file_exists("view/local-$lang/hstrings.php")) { + include("view/local-$lang/hstrings.php"); + } + elseif(file_exists("view/local-$lang/strings.php")) { include("view/local-$lang/strings.php"); } } |