diff options
| author | mrjive <mrjive@mrjive.it> | 2015-09-29 08:01:51 +0200 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-09-29 08:01:51 +0200 |
| commit | 11c1573b55f278a664a90a2872d06a40b3ac3026 (patch) | |
| tree | 4061879d490fec39ab01d3feeb575b86586fb7f8 /include/language.php | |
| parent | 006ca4421a7027ccee4612beb99a1f9976146070 (diff) | |
| parent | b3525b865784ff5d2d5a76b913b8c86d139cc0f3 (diff) | |
| download | volse-hubzilla-11c1573b55f278a664a90a2872d06a40b3ac3026.tar.gz volse-hubzilla-11c1573b55f278a664a90a2872d06a40b3ac3026.tar.bz2 volse-hubzilla-11c1573b55f278a664a90a2872d06a40b3ac3026.zip | |
Merge pull request #5 from redmatrix/master
updating from original codebase
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"); } } |