From 5135886f2584631a414eb08e57d4ebdd2c48d611 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 10 Aug 2016 11:18:12 +0200
Subject: Add fallback feature to Dictionary functions

---
 inc/dictionary.inc.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'inc/dictionary.inc.php')

diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php
index cb23d0b2..634b1c3c 100644
--- a/inc/dictionary.inc.php
+++ b/inc/dictionary.inc.php
@@ -69,10 +69,13 @@ class Dictionary
 		return self::$stringCache[$file] = $json;
 	}
 
-	public static function translateFileModule($moduleId, $path, $tag)
+	public static function translateFileModule($moduleId, $path, $tag, $returnTagOnMissing = false)
 	{
 		$strings = self::getArray($moduleId, $path);
 		if (!isset($strings[$tag])) {
+			if ($returnTagOnMissing) {
+				return '{{' . $tag . '}}';
+			}
 			return false;
 		}
 		return $strings[$tag];
@@ -85,12 +88,15 @@ class Dictionary
 		return self::translateFileModule(Page::getModule()->getIdentifier(), $path, $tag);
 	}
 
-	public static function translate($tag)
+	public static function translate($tag, $returnTagOnMissing = false)
 	{
 		$string = self::translateFile('module', $tag);
 		if ($string !== false)
 			return $string;
-		return self::translateFileModule('main', 'global-tags', $tag);
+		$string = self::translateFileModule('main', 'global-tags', $tag);
+		if ($string !== false || !$returnTagOnMissing)
+			return $string;
+		return '{{' . $tag . '}}';
 	}
 
 	public static function getMessage($module, $id)
-- 
cgit v1.2.3-55-g7522