From 22267805eeed2e7c4e7ab4593a01abe19dd79a96 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue, 12 Nov 2013 22:23:47 +0100
Subject: [PATCH] add support for getting strings under clientSideStrings and
 update sample

---
 locales/en/app.json | 4 ++--
 src/middleware.js   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/locales/en/app.json b/locales/en/app.json
index b704d9bf3b..76791eb5da 100644
--- a/locales/en/app.json
+++ b/locales/en/app.json
@@ -1,7 +1,7 @@
 {
 	"languageName": "English",
-	"1": "server",
+	"removeAds": "Remove Ads",
 	"clientSideStrings": {
-		"1": "client"
+		"removeAds": "Remove Ads Client Side"
 	}
 }
\ No newline at end of file
diff --git a/src/middleware.js b/src/middleware.js
index f9c07caf9c..70ff438f17 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -95,9 +95,12 @@ var getTranslatedString = function(locale, string){
   //if(!translations[locale]) throw new Error("Missing locale '" + locale + "'");
 
   // TODO support nested dot-separated strings
-  if(translations[locale][string]) return translations[locale][string];
-  if(translations['en'][string]) return translations['en'][string];
-  return 'String not found.';
+  return (
+    translations[locale][string] ||
+    translations[locale]['clientSideStrings'][string] ||
+    translations['en'][string] ||
+    translations['en']['clientSideStrings'][string] ||
+    'String not found.')
 }
 
 var avalaibleLanguages = _.map(langCodes, function(langCode){