From cd2b8115554e44c31867b4f1fdb4b2c0a3464097 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sat, 26 Sep 2015 23:44:30 -0700
Subject: move string files to hmessages.po and hstrings.php for hubzilla to
 avoid endless merge conflicts.

---
 include/language.php | 16 +++++++++++++---
 include/text.php     |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'include')

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");
 	}
 }
diff --git a/include/text.php b/include/text.php
index 4d9670806..b1af62fc5 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1686,14 +1686,14 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
 function lang_selector() {
 	global $a;
 
-	$langs = glob('view/*/strings.php');
+	$langs = glob('view/*/hstrings.php');
 
 	$lang_options = array();
 	$selected = "";
 
 	if(is_array($langs) && count($langs)) {
 		$langs[] = '';
-		if(! in_array('view/en/strings.php',$langs))
+		if(! in_array('view/en/hstrings.php',$langs))
 			$langs[] = 'view/en/';
 		asort($langs);
 		foreach($langs as $l) {
-- 
cgit v1.2.3