move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.

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");
 	}
 }