From fab1763ab2737b12dc1ec695f18cfebbabd6bdba Mon Sep 17 00:00:00 2001
From: softwarerero <el@softwarerero.com>
Date: Wed, 30 Aug 2017 21:49:27 -0400
Subject: [PATCH] Add back reactivity

---
 README.md                                     |  4 +-
 build/t9n.js                                  | 41 +++++++++++++++----
 examples/meteorNpm/client/index.html          |  2 +-
 examples/meteorNpm/client/index.js            |  8 +++-
 .../.gitignore                                |  0
 .../README.md                                 |  0
 examples/meteorPackage/client/client.coffee   | 13 ++++++
 .../client/index.html                         | 10 ++++-
 .../package.json                              |  0
 .../server/helpers.coffee                     |  0
 .../server/test.coffee                        |  0
 .../server/testLanguageVariant.coffee         |  0
 examples/meteorPpackage/client/client.coffee  |  4 --
 package.js                                    |  8 ++--
 package.json                                  |  2 +-
 smart.json                                    |  2 +-
 t9n.coffee                                    | 13 ++++++
 17 files changed, 85 insertions(+), 22 deletions(-)
 rename examples/{meteorPpackage => meteorPackage}/.gitignore (100%)
 rename examples/{meteorPpackage => meteorPackage}/README.md (100%)
 create mode 100644 examples/meteorPackage/client/client.coffee
 rename examples/{meteorPpackage => meteorPackage}/client/index.html (65%)
 rename examples/{meteorPpackage => meteorPackage}/package.json (100%)
 rename examples/{meteorPpackage => meteorPackage}/server/helpers.coffee (100%)
 rename examples/{meteorPpackage => meteorPackage}/server/test.coffee (100%)
 rename examples/{meteorPpackage => meteorPackage}/server/testLanguageVariant.coffee (100%)
 delete mode 100644 examples/meteorPpackage/client/client.coffee

diff --git a/README.md b/README.md
index b11d749..7ca5de5 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ When using `npm` the translation files will not be loaded eagerly any longer. Se
 
 To make it work with `npm` the files have been translated to JavaScript, so if you use CoffeeScript you can require from the main directory and if you use JavaScript you would import/require from `build`.
 
-Breaking change: Reactivity for the language and translations are no longer available. This used a Meteor functionality which is not available in a plain Node environment, which also consumed a lot of resources and many applications never used it. If this is a critical feature for somebody please open a ticket, this could be maybe implemented in a separate package.
+In theory this package can be used in any JavaScript project, but reactivity is only available within a Meteor environment.
 
-The `examples` show different use cases:
+These `examples` show different use cases:
 
 - meteorPackage: This is way it has been used in former versions as a meteor package.
 - meteorNpm: Use t9n as npm package within Meteor.
diff --git a/build/t9n.js b/build/t9n.js
index 6028d81..0fcbc38 100644
--- a/build/t9n.js
+++ b/build/t9n.js
@@ -1,6 +1,8 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var T9n;
+  var T9n, tracker;
+
+  tracker = require('meteor/tracker');
 
   if (typeof Meteor !== "undefined" && Meteor !== null) {
     Meteor.startup(function() {
@@ -21,32 +23,44 @@
 
     T9n.language = '';
 
+    T9n.dep = tracker.Tracker ? new tracker.Tracker.Dependency() : void 0;
+
+    T9n.depLanguage = tracker.Tracker ? new tracker.Tracker.Dependency() : void 0;
+
     T9n.missingPrefix = ">";
 
     T9n.missingPostfix = "<";
 
     T9n.map = function(language, map) {
+      var ref;
       if (!this.maps[language]) {
         this.maps[language] = {};
       }
-      return this.registerMap(language, '', false, map);
+      this.registerMap(language, '', false, map);
+      return (ref = this.dep) != null ? ref.changed() : void 0;
     };
 
     T9n.get = function(label, markIfMissing, args, language) {
-      var index, parent, ref, ref1, ret;
+      var index, parent, ref, ref1, ref2, ref3, ret;
       if (markIfMissing == null) {
         markIfMissing = true;
       }
       if (args == null) {
         args = {};
       }
+      if ((ref = this.dep) != null) {
+        ref.depend();
+      }
+      if ((ref1 = this.depLanguage) != null) {
+        ref1.depend();
+      }
       if (typeof label !== 'string') {
         return '';
       }
       if (language == null) {
         language = this.language;
       }
-      ret = (ref = this.maps[language]) != null ? ref[label] : void 0;
+      ret = (ref2 = this.maps[language]) != null ? ref2[label] : void 0;
       if (!ret) {
         index = language.lastIndexOf('_');
         if (index) {
@@ -57,7 +71,7 @@
         }
       }
       if (!ret) {
-        ret = (ref1 = this.maps[this.defaultLanguage]) != null ? ref1[label] : void 0;
+        ret = (ref3 = this.maps[this.defaultLanguage]) != null ? ref3[label] : void 0;
       }
       if (!ret) {
         if (markIfMissing) {
@@ -91,15 +105,26 @@
     };
 
     T9n.getLanguage = function() {
+      var ref;
+      if ((ref = this.depLanguage) != null) {
+        ref.depend();
+      }
       return this.language;
     };
 
     T9n.getLanguages = function() {
+      var ref;
+      if ((ref = this.dep) != null) {
+        ref.depend();
+      }
       return Object.keys(this.maps).sort();
     };
 
     T9n.getLanguageInfo = function() {
-      var i, k, keys, len, results;
+      var i, k, keys, len, ref, results;
+      if ((ref = this.dep) != null) {
+        ref.depend();
+      }
       keys = Object.keys(this.maps).sort();
       results = [];
       for (i = 0, len = keys.length; i < len; i++) {
@@ -113,6 +138,7 @@
     };
 
     T9n.setLanguage = function(language) {
+      var ref;
       if (this.language === language) {
         return;
       }
@@ -124,7 +150,8 @@
           throw Error("language " + language + " does not exist");
         }
       }
-      return this.language = language;
+      this.language = language;
+      return (ref = this.depLanguage) != null ? ref.changed() : void 0;
     };
 
     T9n.replaceParams = function(str, args) {
diff --git a/examples/meteorNpm/client/index.html b/examples/meteorNpm/client/index.html
index 3a2f6f0..097f353 100644
--- a/examples/meteorNpm/client/index.html
+++ b/examples/meteorNpm/client/index.html
@@ -8,8 +8,8 @@
 </body>
 
 <template name="app">
-  Lang: {{currentLang}}
   <h1>{{t9n 'hello' name='Meteor'}}</h1>
+  <h3>Lang: {{currentLang}}</h3>
   {{t9n 'pun' subject='Fischer\'s Fritz' predicate='fischt' object='Fische' adverb='frische'}}
   <br/>
   <br/>
diff --git a/examples/meteorNpm/client/index.js b/examples/meteorNpm/client/index.js
index 39b5d27..1e2c266 100644
--- a/examples/meteorNpm/client/index.js
+++ b/examples/meteorNpm/client/index.js
@@ -6,6 +6,10 @@ T9n.map('de', {
   'hello': 'Hallo @{name}!',
   'pun': '@{subject} @{predicate} @{adverb} @{object}. Frische @{object} @{predicate} @{subject}.',
 });
+T9n.map('es', {
+  'hello': 'Hola @{name}!',
+  'pun': 'No anda bien en castellano eso de "@{subject} @{predicate} @{adverb} @{object}. Frische @{object} @{predicate} @{subject}".',
+});
 T9n.setLanguage('de');
 
 // as the template helper is not registered at this moment do it here
@@ -13,5 +17,7 @@ Template.registerHelper('t9n', (x, params) => T9n.get(x, true, params.hash));
 Template.registerHelper('currentLang', () => T9n.getLanguage());
 
 Template.app.events({
-    'click button': () => T9n.setLanguage('es'), // no reactivity!
+    'click button': () => T9n.setLanguage(flipLanguage()),
 });
+
+const flipLanguage = () => T9n.getLanguage() === 'es' ? 'de' : 'es';
diff --git a/examples/meteorPpackage/.gitignore b/examples/meteorPackage/.gitignore
similarity index 100%
rename from examples/meteorPpackage/.gitignore
rename to examples/meteorPackage/.gitignore
diff --git a/examples/meteorPpackage/README.md b/examples/meteorPackage/README.md
similarity index 100%
rename from examples/meteorPpackage/README.md
rename to examples/meteorPackage/README.md
diff --git a/examples/meteorPackage/client/client.coffee b/examples/meteorPackage/client/client.coffee
new file mode 100644
index 0000000..56e6a75
--- /dev/null
+++ b/examples/meteorPackage/client/client.coffee
@@ -0,0 +1,13 @@
+lang = 'de'
+T9n.setLanguage(lang)
+T9n.map lang, 'hello': 'Hallo @{name}!'
+T9n.map lang, 'pun': '@{subject} @{predicate} @{adverb} @{object}. Frische @{object} @{predicate} @{subject}.'
+T9n.map 'es', 'hello': 'Hola @{name}!'
+
+Template.registerHelper 'currentLang', () => T9n.getLanguage()
+
+Template.app.events
+  'click button': => T9n.setLanguage flipLanguage()
+
+
+flipLanguage = => if T9n.getLanguage() is 'es' then 'de' else 'es'
diff --git a/examples/meteorPpackage/client/index.html b/examples/meteorPackage/client/index.html
similarity index 65%
rename from examples/meteorPpackage/client/index.html
rename to examples/meteorPackage/client/index.html
index 578edc9..097f353 100644
--- a/examples/meteorPpackage/client/index.html
+++ b/examples/meteorPackage/client/index.html
@@ -4,6 +4,14 @@
 </head>
 
 <body>
+  {{> app}}
+</body>
+
+<template name="app">
   <h1>{{t9n 'hello' name='Meteor'}}</h1>
+  <h3>Lang: {{currentLang}}</h3>
   {{t9n 'pun' subject='Fischer\'s Fritz' predicate='fischt' object='Fische' adverb='frische'}}
-</body>
+  <br/>
+  <br/>
+  <button>{{t9n 'emailResetLink'}}</button>
+</template>
diff --git a/examples/meteorPpackage/package.json b/examples/meteorPackage/package.json
similarity index 100%
rename from examples/meteorPpackage/package.json
rename to examples/meteorPackage/package.json
diff --git a/examples/meteorPpackage/server/helpers.coffee b/examples/meteorPackage/server/helpers.coffee
similarity index 100%
rename from examples/meteorPpackage/server/helpers.coffee
rename to examples/meteorPackage/server/helpers.coffee
diff --git a/examples/meteorPpackage/server/test.coffee b/examples/meteorPackage/server/test.coffee
similarity index 100%
rename from examples/meteorPpackage/server/test.coffee
rename to examples/meteorPackage/server/test.coffee
diff --git a/examples/meteorPpackage/server/testLanguageVariant.coffee b/examples/meteorPackage/server/testLanguageVariant.coffee
similarity index 100%
rename from examples/meteorPpackage/server/testLanguageVariant.coffee
rename to examples/meteorPackage/server/testLanguageVariant.coffee
diff --git a/examples/meteorPpackage/client/client.coffee b/examples/meteorPpackage/client/client.coffee
deleted file mode 100644
index 860e512..0000000
--- a/examples/meteorPpackage/client/client.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-lang = 'de'
-T9n.setLanguage(lang)
-T9n.map lang, 'hello': 'Hallo @{name}!'
-T9n.map lang, 'pun': '@{subject} @{predicate} @{adverb} @{object}. Frische @{object} @{predicate} @{subject}.'
diff --git a/package.js b/package.js
index 3811fe7..73791b3 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Almost i18n, with standard translations for basic meteor packages.",
-  version: "2.0.0-beta.1",
+  version: "2.0.0",
   name: "softwarerero:accounts-t9n",
   git: "https://github.com/softwarerero/meteor-accounts-t9n.git",
 });
@@ -19,14 +19,14 @@ for (var i = 0; i < LANGUAGES.length; i++) {
 
 Package.on_use(function (api, where) {
   if (api.versionsFrom)
-    api.versionsFrom("METEOR@1.0.1");
+    api.versionsFrom("METEOR@1.1");
   api.add_files(FILES, ['client', 'server']);
-  api.use(['coffeescript', 'deps'], ['client', 'server']);
+  api.use(['coffeescript', 'tracker'], ['client', 'server']);
   api.export('T9n', ['client', 'server']);
 });
 
 
 Package.on_test(function (api) {
   api.add_files(FILES, ['client', 'server']);
-  api.use(['coffeescript', 'deps'], ['client', 'server']);
+  api.use(['coffeescript', 'tracker'], ['client', 'server']);
 });
diff --git a/package.json b/package.json
index 1131341..684238a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor-accounts-t9n",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0",
   "description": "Translations for Meteor projects, almost i18n",
   "repository": "https://github.com/softwarerero/meteor-accounts-t9n",
   "bugs": "https://github.com/softwarerero/meteor-accounts-t9n/issues",
diff --git a/smart.json b/smart.json
index 62a415a..cc94b7b 100644
--- a/smart.json
+++ b/smart.json
@@ -3,7 +3,7 @@
   "description": "Translations for the meteor account's error messages",
   "homepage": "https://github.com/softwarerero/meteor-accounts-t9n",
   "author": "Stefan Undorf <el@softwarerero.com>",
-  "version": "1.3.11",
+  "version": "2.0.0",
   "git": "https://github.com/softwarerero/meteor-accounts-t9n.git",
   "packages": {}
 }
diff --git a/t9n.coffee b/t9n.coffee
index ca82b14..a5f0b89 100644
--- a/t9n.coffee
+++ b/t9n.coffee
@@ -1,3 +1,5 @@
+tracker = require 'meteor/tracker'
+
 Meteor?.startup ->
   if Meteor.isClient
     Template?.registerHelper 't9n', (x, params) ->
@@ -7,6 +9,9 @@ class T9n
   @maps: {}
   @defaultLanguage: 'en'
   @language: ''
+  @dep: new tracker.Tracker.Dependency() if tracker.Tracker
+  @depLanguage: new tracker.Tracker.Dependency() if tracker.Tracker
+
   @missingPrefix = ">"
   @missingPostfix = "<"
 
@@ -14,8 +19,11 @@ class T9n
     if(!@maps[language])
       @maps[language] = {}
     @registerMap(language, '', false, map)
+    @dep?.changed()
 
   @get: (label, markIfMissing = true, args = {}, language) ->
+    @dep?.depend()
+    @depLanguage?.depend()
     if typeof label != 'string' then return ''
     language ?= @language
     ret = @maps[language]?[label]
@@ -41,12 +49,15 @@ class T9n
         @registerMap(language, prefix + key, true, value)
 
   @getLanguage: () ->
+    @depLanguage?.depend()
     return @language
 
   @getLanguages: () ->
+    @dep?.depend()
     return Object.keys(@maps).sort()
 
   @getLanguageInfo: () ->
+    @dep?.depend()
     keys = Object.keys(@maps).sort()
     for k in keys
       {name: @maps[k]['t9Name'], code: k}
@@ -60,6 +71,8 @@ class T9n
       else
         throw Error "language #{language} does not exist"
     @language = language
+    @depLanguage?.changed()
+
 
   @replaceParams = (str, args) ->
     for key, value of args