aboutsummaryrefslogtreecommitdiffstats
path: root/include/language.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-26 23:44:30 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-26 23:44:30 -0700
commitcd2b8115554e44c31867b4f1fdb4b2c0a3464097 (patch)
treeea813e421210193c772016ed9667e72776c4a03a /include/language.php
parent15d1a6c9374a20379d98bfac729ecf10609a7759 (diff)
downloadvolse-hubzilla-cd2b8115554e44c31867b4f1fdb4b2c0a3464097.tar.gz
volse-hubzilla-cd2b8115554e44c31867b4f1fdb4b2c0a3464097.tar.bz2
volse-hubzilla-cd2b8115554e44c31867b4f1fdb4b2c0a3464097.zip
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
Diffstat (limited to 'include/language.php')
-rw-r--r--include/language.php16
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");
}
}