From 0a8994cf1cc4d11a5e25ab9fe3c6ae7be15dd6ea Mon Sep 17 00:00:00 2001
From: krzysztofmadejski <krzysztof@madejscy.pl>
Date: Thu, 10 Nov 2016 12:09:16 +0000
Subject: [PATCH] #459 simple cache

---
 _includes/recline-deps.html |  2 --
 demos/multiview/app.js      | 11 +++++++----
 package.json                |  3 +--
 src/i18n/view.i18n.js       | 11 +++++++----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/_includes/recline-deps.html b/_includes/recline-deps.html
index c59c999a..2ae67399 100644
--- a/_includes/recline-deps.html
+++ b/_includes/recline-deps.html
@@ -48,8 +48,6 @@
   <script type="text/javascript" src="{{page.root}}vendor/timeline/js/timeline.js"></script>
 
   <script type="text/javascript" src="{{page.root}}node_modules/intl-messageformat/dist/intl-messageformat-with-locales.min.js"></script>
-  <script type="module" src="{{page.root}}node_modules/intl-format-cache/lib/memoizer.js"></script>
-
 
   <!--[if lte IE 7]>
   <script language="javascript" type="text/javascript" src="{{page.root}}vendor/json/json2.js"></script>
diff --git a/demos/multiview/app.js b/demos/multiview/app.js
index c4cfece9..6b5831fb 100755
--- a/demos/multiview/app.js
+++ b/demos/multiview/app.js
@@ -64,12 +64,14 @@ var createMultiView = function(dataset, state) {
   $el.appendTo(window.explorerDiv);
 
   // customize the subviews for the MultiView
+  var locale = 'en';
   var views = [
     {
       id: 'grid',
       label: 'Grid',
       view: new recline.View.SlickGrid({
         model: dataset,
+        locale: locale,
         state: {
           gridOptions: {
             editable: true,
@@ -93,15 +95,16 @@ var createMultiView = function(dataset, state) {
       id: 'graph',
       label: 'Graph',
       view: new recline.View.Graph({
-        model: dataset
-
+        model: dataset,
+        locale: locale
       })
     },
     {
       id: 'map',
       label: 'Map',
       view: new recline.View.Map({
-        model: dataset
+        model: dataset,
+        locale: locale
       })
     }
   ];
@@ -110,7 +113,7 @@ var createMultiView = function(dataset, state) {
     model: dataset,
     el: $el,
     state: state,
-    locale: 'pl',
+    locale: locale,
     views: views
   });
   return multiView;
diff --git a/package.json b/package.json
index 940dca70..7e6a8058 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,7 @@
     "jquery": ">=1.6",
     "mustache": ">=0.5.2",
     "underscore": ">=1.0",
-    "intl-messageformat": "1.3.x",
-    "intl-format-cache": "2.0.x"
+    "intl-messageformat": "1.3.x"
   },
   "homepage": "http://reclinejs.com/",
   "keywords": [
diff --git a/src/i18n/view.i18n.js b/src/i18n/view.i18n.js
index 65a2f174..67962b30 100644
--- a/src/i18n/view.i18n.js
+++ b/src/i18n/view.i18n.js
@@ -5,12 +5,12 @@
 Backbone.I18nView = Backbone.View.extend({
     defaultLocale: 'en',
     locale: 'en',
+    cache: {},
     initializeI18n: function(locale, appHardcodedLocale) {
         this.defaultLocale = appHardcodedLocale || 'en';
         this.locale = locale || this.defaultLocale;
 
-        // TODO implement cache
-        //memoizeFormatConstructor(Intl.NumberFormat).getNumberFormat();
+        this.cache[this.locale] = {};
     },
 
     formatMessage(key, values) {
@@ -41,8 +41,11 @@ Backbone.I18nView = Backbone.View.extend({
         // TODO i18n documentation
 
         try {
-            var mf = new IntlMessageFormat(msg, 'pl');
-            var formatted = mf.format(values);
+            var formatter = this.cache[this.locale][msg];
+            if (formatter === undefined) {
+                this.cache[this.locale][msg] = formatter = new IntlMessageFormat(msg, this.locale);
+            }
+            var formatted = formatter.format(values);
 
             return formatted;
         } catch (e) {