From 65e66dea085a8b8521c1a530f841d0ae42390daa Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 2 Jan 2018 12:13:43 +0100
Subject: [PATCH] resolve bad merge

---
 customize.dist/messages.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 5365232c5..612994d54 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -8,7 +8,7 @@ var map = {
     'pt-br': 'Português do Brasil',
     'ro': 'Română',
     'zh': '繁體中文',
-	'el': 'Ελληνικά',
+    'el': 'Ελληνικά',
 };
 
 var messages = {};
@@ -94,7 +94,11 @@ define(req, function(Util, Default, Language) {
         var text = messages[key];
         if (typeof(text) === 'string') {
             return text.replace(/\{(\d+)\}/g, function (str, p1) {
-                return argArray[p1] || null;
+                if (typeof(argArray[p1]) === 'string' || typeof(argArray[p1]) === "number") {
+                    return argArray[p1];
+                }
+                console.error("Only strings and numbers can be used in _getKey params!");
+                return '';
             });
         } else {
             return text;