From e6fdadc927a8a8b0ead767e4011b250476691738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Fri, 23 Jun 2017 07:10:36 +0200
Subject: [PATCH] tagTranslations: improve translate

---
 src/tagTranslations.js | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/tagTranslations.js b/src/tagTranslations.js
index 5764a2cb..11dc67e4 100644
--- a/src/tagTranslations.js
+++ b/src/tagTranslations.js
@@ -24,32 +24,44 @@ function tagTranslationsLoad (path, lang, callback) {
 
 function tagTranslationsTrans (tag, value, count) {
   var ret = null
+  var fallback = null
 
   if (typeof value === 'undefined') {
+    fallback = tag
+
     if (translations && 'tag:' + tag in translations) {
       ret = translations['tag:' + tag]
-    } else {
-      ret = tag
     }
-  }
-  else if (translations && 'tag:' + tag + '=' + value in translations) {
-    ret = translations['tag:' + tag + '=' + value]
   } else {
-    ret = value
+    fallback = value
+
+    if (translations && 'tag:' + tag + '=' + value in translations) {
+      ret = translations['tag:' + tag + '=' + value]
+    }
   }
 
   if (ret && typeof ret === 'object') {
     if (typeof count !== 'undefined') {
       if (count > 1 && '!=1' in ret) {
         return ret['!=1']
-      } else {
+      } else if ('message' in ret) {
         return ret['message']
+      } else {
+        return fallback
       }
     } else {
-      return ret['message']
+      if ('message' in ret) {
+        return ret['message']
+      } else {
+        return fallback
+      }
     }
   } else {
-    return ret
+    if (ret !== null) {
+      return ret
+    } else {
+      return fallback
+    }
   }
 }