From 0450a33890c8b7b1b124f11d32760ffed7d222e0 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 16:09:12 +1000
Subject: [PATCH 01/11] Fixes broken error message over multiple lines

---
 msgfmt:extract/extract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msgfmt:extract/extract.js b/msgfmt:extract/extract.js
index b8670f2..d486afb 100644
--- a/msgfmt:extract/extract.js
+++ b/msgfmt:extract/extract.js
@@ -254,7 +254,7 @@ var lastFile = null;
 function logKey(file, key, text, file, line, strings) {
   if (strings[key] && strings[key].text != text)
     log.warn('{ ' + key + ': "' + text + '" } in '
-      + file + ':' + line + ' replaces DUP_KEY\n         { '
+      + file + ':' + line + ' replaces DUP_KEY { '
       + key + ': "' + strings[key].text + '" } in '
       + strings[key].file + ':' + strings[key].line);
 

From d1e9997b5133a10be5e7348ae1bb1d2cfdb9847e Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 16:21:33 +1000
Subject: [PATCH 02/11] Ability to recognise by key only {{ mf 'key' }}

Often desired way is to have only keys in sources and translation left
for later.
---
 msgfmt:extract/extract.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msgfmt:extract/extract.js b/msgfmt:extract/extract.js
index d486afb..e21c29f 100644
--- a/msgfmt:extract/extract.js
+++ b/msgfmt:extract/extract.js
@@ -278,16 +278,16 @@ handlers.html = function(file, data, mtime, strings) {
   var result, re;
 
   // {{mf "key" 'text' attr1=val1 attr2=val2 etc}}
-  re = /{{[\s]?mf (['"])(.*?)\1 ?(["'])(.*?)\3(.*?)}}/g;
+  re = /\{\{[\s]?mf ['"](.*?)['"] ?(["'](.*?)['"])?(.*?)\}\}/g;
   while (result = re.exec(data)) {
-    var key = result[2], text = result[4], attributes = attrDict(result[5]);
+    var key = result[1], text = result[3], attributes = attrDict(result[4]);
     var tpl = /<template .*name=(['"])(.*?)\1.*?>[\s\S]*?$/
         .exec(data.substring(0, result.index)); // TODO, optimize
     var line = data.substring(0, result.index).split('\n').length;
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       mtime: mtime,

From 05a82128373ba3d43361cfe7208e604775d8c364 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 17:19:44 +1000
Subject: [PATCH 03/11] Ability to show/hide the key and sort by the key

---
 msgfmt:ui/lib/client.js | 20 +++++++++++++++++++-
 msgfmt:ui/lib/ui.css    |  3 +++
 msgfmt:ui/lib/ui.html   | 13 ++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index 6e18cad..446dbe7 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -201,13 +201,31 @@ Template.mfTrans.events({
 
 Template.mfTransLang.events({
   'click #mfTransLang tr': function(event) {
-    var tr = $(event.target).parents('tr');
+    var tr = $(event.target).parents('tr'); 
     var key = tr.data('key');
     if (key) changeKey(key);
+  },
+  'click #translationShowKey': function(event) {
+    Session.set('translationShowKey', event.currentTarget.checked);
+  },
+  'click .translationSort': function(event) {
+    Session.set('translationSortField', event.currentTarget.attributes['data-sortField'].value);
   }
 });
 
 Template.mfTransLang.helpers({
+  sortedStrings: function() {
+    var sortField = Session.get('translationSortField');
+    if (!sortField) {
+      Session.set('translationSortField', 'orig');
+    }
+    return this.strings.sort(function(a, b) {
+      return a[sortField] > b[sortField] ? 1 : (a[sortField] < b[sortField] ? -1 : 0);
+    });
+  },
+  showKey: function() {
+    return Session.get('translationShowKey');  
+  },
   stateClass: function() {
     if (this.fuzzy)
       return 'fuzzy';
diff --git a/msgfmt:ui/lib/ui.css b/msgfmt:ui/lib/ui.css
index 2ce98ab..97e276e 100644
--- a/msgfmt:ui/lib/ui.css
+++ b/msgfmt:ui/lib/ui.css
@@ -49,6 +49,9 @@ div.mfTransGraph.untrans { background: #800; border-right: 1px solid black; }
 #mfTransPreview table { width: 100%; table-layout:fixed; border-collapse:separate; background: white; }
 #mfTransPreview table thead tr { background: #ede9e3; }
 #mfTransPreview table thead th { width: 50%; padding: 4px 8px 4px 8px; }
+#mfTransPreview table thead th {
+	border-left: 1px solid black; border-top: 1px solid black; border-bottom: 1px solid black;
+}
 #mfTransPreview table thead th:first-child {
 	border-left: 1px solid black; border-top: 1px solid black; border-bottom: 1px solid black;
 	border-top-left-radius: 5px; 
diff --git a/msgfmt:ui/lib/ui.html b/msgfmt:ui/lib/ui.html
index 7fd6e88..c192a06 100644
--- a/msgfmt:ui/lib/ui.html
+++ b/msgfmt:ui/lib/ui.html
@@ -66,13 +66,17 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
 </template>
 
 <template name="mfTransLang">
+{{ debug }}
   <div class="container" id="mfTransLang">
 
     <div id="mfTransPreview">
       <table>
         <thead>
           <tr>
-            <th>Original String ({{orig}})</th>
+            {{#if showKey}}
+              <th><a href="#" class="translationSort" data-sortField="key">Key</a></th>
+            {{/if}}
+            <th><a href="#" class="translationSort" data-sortField="orig">Original String ({{orig}})</a></th>
             <th>Translation ({{trans}})</th>
           </tr>
         </thead>
@@ -80,8 +84,11 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
       <div class="tbodyScroll">
         <table>
           <tbody>
-          {{#each strings}}
+          {{#each sortedStrings}}
             <tr data-key="{{key}}" class="{{stateClass}} {{isCurrent}}">
+              {{#if showKey}}
+                <td>{{key}}</td>
+              {{/if}}
               <td>{{orig}}</td>
               <td>{{trans}}</td>
             </tr>
@@ -90,7 +97,7 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
         </table>
       </div>
     </div>
-    <p>Use ctrl-up and ctrl-down to quickly change keys</p>
+    <p><input type="checkbox" id="translationShowKey">Show key, Use ctrl-up and ctrl-down to quickly change keys</p>
     <span><b>{{keyInfo.key}}</b> in {{keyInfo.file}}:{{keyInfo.line
       }}{{#if keyInfo.template}} (template
         {{#if keyInfo.routeUrl}}

From 4067d9446405eb5015ce1d44e81a3a46b1c75fb2 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 17:20:02 +1000
Subject: [PATCH 04/11] Ability to automatically name the translation when no
 text is specified.

---
 msgfmt:extract/extract.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/msgfmt:extract/extract.js b/msgfmt:extract/extract.js
index e21c29f..bf02103 100644
--- a/msgfmt:extract/extract.js
+++ b/msgfmt:extract/extract.js
@@ -266,7 +266,7 @@ function logKey(file, key, text, file, line, strings) {
     log.trace(file);
   }
 
-  log.trace('* ' + key + ': "' + text.replace(/\s+/g, ' ') + '"');
+  log.trace('* ' + key + ': "' + (text ? text.replace(/\s+/g, ' ') : "NO TEXT") + '"');
 }
 
 /* handlers */
@@ -305,7 +305,7 @@ handlers.html = function(file, data, mtime, strings) {
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       mtime: mtime,
@@ -328,7 +328,7 @@ handlers.jade = function(file, data, mtime, strings) {
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       mtime: mtime,
@@ -346,7 +346,7 @@ handlers.jade = function(file, data, mtime, strings) {
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       mtime: mtime,
@@ -374,7 +374,7 @@ handlers.js = function(file, data, mtime, strings) {
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       mtime: mtime,
@@ -404,7 +404,7 @@ handlers.coffee = function(file, data, mtime, strings) {
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text,
+      text: text ? text : ("<" + key + ">" ),
       file: file,
       line: line,
       func: func,

From 3412c004211d23ba18d3a64f16a666e29acc3f3a Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 20:32:02 +1000
Subject: [PATCH 05/11] More streamlined inline translation edition.

---
 msgfmt:ui/lib/client.js | 26 +++++++-------------------
 msgfmt:ui/lib/ui.css    |  8 +++++++-
 msgfmt:ui/lib/ui.html   | 17 ++++++++++-------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index 446dbe7..a7fb367 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -76,20 +76,7 @@ function saveChange(lang, key, text) {
  * Called everytime the current key is changed (ctrl up/down or click)
  */
 function changeKey(newKey) {
-  var destLang = Session.get('mfTransTrans');
-  var oldKey = Session.get('mfTransKey');
-  if (oldKey == newKey) return;
-
-  saveChange(destLang, oldKey, $('#mfTransDest').val());
-
-  // Temporary, need to turn off preserve
-  var str = mfPkg.mfStrings.findOne({
-    key: newKey, lang: destLang
-  });
-  $('#mfTransDest').val(str ? str.text : '');
-
   Session.set('mfTransKey', newKey);
-  $('#mfTransDest').focus();
 }
 
 if (Package['iron:router'])
@@ -132,7 +119,6 @@ Package['iron:router'].Router.map(function() {
               ? $('#mfTransLang tr.current').prev()
               : $('#mfTransLang tr.current').next();
             if (tr.length) {
-              changeKey(tr.data('key'));
               mfCheckScroll(tr);
             }
           }
@@ -203,13 +189,19 @@ Template.mfTransLang.events({
   'click #mfTransLang tr': function(event) {
     var tr = $(event.target).parents('tr'); 
     var key = tr.data('key');
-    if (key) changeKey(key);
+    if (key) changeKey(key, null);
   },
   'click #translationShowKey': function(event) {
     Session.set('translationShowKey', event.currentTarget.checked);
   },
   'click .translationSort': function(event) {
     Session.set('translationSortField', event.currentTarget.attributes['data-sortField'].value);
+  },
+  'change .transInput': function(event) {
+    var destLang = Session.get('mfTransTrans');
+    var key = Session.get('mfTransKey');
+
+    saveChange(destLang, key, $(event.currentTarget).val());
   }
 });
 
@@ -271,8 +263,6 @@ var initialRender = _.once(function() {
     tr = $('#mfTransLang tr[data-key="'+key+'"]');
   if (tr.length)
     $('#mfTransPreview .tbodyScroll').scrollTop(tr.position().top);
-
-  $('#mfTransDest').focus();
 });
 
 Template.mfTransLang.rendered = function() {
@@ -284,7 +274,5 @@ Template.mfTransLang.rendered = function() {
     Session.set('mfTransKey', key);
   }
 
-  var transDest = $('#mfTransDest');
-  if (typeof transDest.tabOverride === 'function') transDest.tabOverride();
   initialRender();
 };
diff --git a/msgfmt:ui/lib/ui.css b/msgfmt:ui/lib/ui.css
index 97e276e..633ac4f 100644
--- a/msgfmt:ui/lib/ui.css
+++ b/msgfmt:ui/lib/ui.css
@@ -42,7 +42,7 @@ div.mfTransGraph.untrans { background: #800; border-right: 1px solid black; }
 }
 
 #mfTransPreview .tbodyScroll {
-	overflow: hidden; height: 200px; overflow-y: scroll;
+	overflow: hidden; height: 400px; overflow-y: scroll;
 	border-left: 1px solid black; border-bottom: 1px solid black;
 	position: relative; /* makes jquery scroll stuff easier */
 }
@@ -81,3 +81,9 @@ div.mfTransGraph.untrans { background: #800; border-right: 1px solid black; }
 	height: 5em; width: 100%;
 	margin-top: 5px;
 }
+
+.transInput {
+	width: 100%;
+	border: 1px #ddd dotted;
+	border-style: dashed;
+}
diff --git a/msgfmt:ui/lib/ui.html b/msgfmt:ui/lib/ui.html
index c192a06..263cdc5 100644
--- a/msgfmt:ui/lib/ui.html
+++ b/msgfmt:ui/lib/ui.html
@@ -1,7 +1,8 @@
 <template name="mfTrans">
+{{ debug }}
   <div class="container" id="mfTransContainer">
   <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
-  <p>Native language: <b>{{native}}</b> ({{stats.total}} strings)</p>
+  <p>Native language: <a href="/translate/{{native}}"><b>{{native}}</b></a> ({{stats.total}} strings)</p>
 
   {{#if stats.total}}
 
@@ -90,7 +91,13 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
                 <td>{{key}}</td>
               {{/if}}
               <td>{{orig}}</td>
-              <td>{{trans}}</td>
+              <td>
+                {{#if isCurrent}}
+                  <input value="{{trans}}" placeholder="{{orig}}" type="text" class="transInput">
+                {{else}}
+                  {{trans}}
+                {{/if}}
+              </td>
             </tr>
           {{/each}}
           </tbody>
@@ -104,11 +111,7 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
           <a href="{{keyInfo.routeUrl}}">{{keyInfo.template}}</a
         >{{else}}"{{keyInfo.template}}"{{/if}}){{/if
       }}{{#if keyInfo.func}}; {{keyInfo.func}}{{/if}}
-    </span><br />
-    <textarea id="mfTransOrig" readonly>{{mfTransOrig}}</textarea>
-    <textarea id="mfTransDest">{{mfTransTrans}}</textarea>
-
-  <br /><br />
+    </span>
   <p>
     <a href="/translate">Back to Translation Summary</a>
   </p>

From 22acc8823c7d6aebc425800c682110311b3a0e60 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Tue, 26 May 2015 21:30:29 +1000
Subject: [PATCH 06/11] Automatic change of input to textarea in multiline
 translations

---
 msgfmt:ui/lib/client.js | 12 ++++++++++++
 msgfmt:ui/lib/ui.html   |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index a7fb367..f02a936 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -202,6 +202,15 @@ Template.mfTransLang.events({
     var key = Session.get('mfTransKey');
 
     saveChange(destLang, key, $(event.currentTarget).val());
+  },
+  'keydown .transInput': function(event) {
+    // if enter is pressed we possibly switch to textarea
+    if (event.keyCode == 13 && $(event.currentTarget).val().indexOf('\n') == -1) {
+      var destLang = Session.get('mfTransTrans');
+      var key = Session.get('mfTransKey');
+
+      saveChange(destLang, key, $(event.currentTarget).val() + "\n");
+    }
   }
 });
 
@@ -218,6 +227,9 @@ Template.mfTransLang.helpers({
   showKey: function() {
     return Session.get('translationShowKey');  
   },
+  hasMoreRows: function() {
+    return this.trans.indexOf('\n') > -1;
+  },
   stateClass: function() {
     if (this.fuzzy)
       return 'fuzzy';
diff --git a/msgfmt:ui/lib/ui.html b/msgfmt:ui/lib/ui.html
index 263cdc5..7e12e99 100644
--- a/msgfmt:ui/lib/ui.html
+++ b/msgfmt:ui/lib/ui.html
@@ -93,7 +93,12 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
               <td>{{orig}}</td>
               <td>
                 {{#if isCurrent}}
-                  <input value="{{trans}}" placeholder="{{orig}}" type="text" class="transInput">
+                  {{#if hasMoreRows}}
+                    <textarea rows="1" placeholder="{{orig}}" type="text" class="transInput">{{trans}}</textarea>
+                  {{else}}
+                    <input value="{{trans}}" placeholder="{{orig}}" type="text" class="transInput">
+                  {{/if}}
+                
                 {{else}}
                   {{trans}}
                 {{/if}}

From a27fe1e466cf762baf0fb357a6d4cd75012d2643 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Wed, 27 May 2015 15:56:31 +1000
Subject: [PATCH 07/11] Removed small bug and improved DRY for creation of
 placeholders of untranslated strings.

---
 msgfmt:extract/extract.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/msgfmt:extract/extract.js b/msgfmt:extract/extract.js
index bf02103..8b43cf1 100644
--- a/msgfmt:extract/extract.js
+++ b/msgfmt:extract/extract.js
@@ -41,7 +41,7 @@ var checkForUpdates = function(m, force) {
 
   var walker  = walk.walk(relUp, {
     followLinks: false,
-    filters: [ 
+    filters: [
       /\/\.[^\.]+\//  // skip .directories (hidden)
     ]
   });
@@ -211,7 +211,7 @@ var boundCheck = Meteor.bindEnvironment(checkForUpdates);
 
 // https://github.com/meteor/meteor/pull/3704/files
 process.on('SIGUSR2', boundCheck);  // Meteor < 1.0.4
-process.on('SIGHUP', boundCheck);   // Meteor >= 1.0.4 
+process.on('SIGHUP', boundCheck);   // Meteor >= 1.0.4
 process.on('message', boundCheck);  // Meteor >= 1.0.4
 
 // No reason to block startup, we can do update gradually asyncronously
@@ -269,6 +269,10 @@ function logKey(file, key, text, file, line, strings) {
   log.trace('* ' + key + ': "' + (text ? text.replace(/\s+/g, ' ') : "NO TEXT") + '"');
 }
 
+function checkText(text, key) {
+  return text ? text : ("<" + key + ">" );
+}
+
 /* handlers */
 
 var handlers = {};
@@ -284,10 +288,11 @@ handlers.html = function(file, data, mtime, strings) {
     var tpl = /<template .*name=(['"])(.*?)\1.*?>[\s\S]*?$/
         .exec(data.substring(0, result.index)); // TODO, optimize
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       mtime: mtime,
@@ -302,10 +307,11 @@ handlers.html = function(file, data, mtime, strings) {
     var tpl = /<template .*name=(['"])(.*?)\1.*?>[\s\S]*?$/
       .exec(data.substring(0, result.index)); // TODO, optimize
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       mtime: mtime,
@@ -325,10 +331,11 @@ handlers.jade = function(file, data, mtime, strings) {
     var tpl = /[\s\S]*template\s*\(\s*name\s*=\s*(['"])(.*?)\1\s*\)[\s\S]*?$/
         .exec(data.substring(0, result.index)); // TODO, optimize
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       mtime: mtime,
@@ -343,10 +350,11 @@ handlers.jade = function(file, data, mtime, strings) {
     var tpl = /[\s\S]*template\s*\(\s*name\s*=\s*(['"])([^\1]+?)\1\s*\)[\s\S]*?$/
         .exec(data.substring(0, result.index)); // TODO, optimize
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       mtime: mtime,
@@ -371,10 +379,11 @@ handlers.js = function(file, data, mtime, strings) {
     var func = /[\s\S]*\n*(.*?function.*?\([\s\S]*?\))[\s\S]*?$/
       .exec(data.substring(0, result.index));
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       mtime: mtime,
@@ -401,10 +410,11 @@ handlers.coffee = function(file, data, mtime, strings) {
     }
 
     var line = data.substring(0, result.index).split('\n').length;
+    text = checkText(text, key);
     logKey(file, key, text, file, line, strings);
     strings[key] = {
       key: key,
-      text: text ? text : ("<" + key + ">" ),
+      text: text,
       file: file,
       line: line,
       func: func,

From 8029e93cf6901b8f214310586a95f5c0712ae76d Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Wed, 27 May 2015 15:56:49 +1000
Subject: [PATCH 08/11] Ability to navigate with Tab and Shift + Tab between
 translations

---
 msgfmt:ui/lib/client.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index f02a936..2ba8b01 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -77,6 +77,7 @@ function saveChange(lang, key, text) {
  */
 function changeKey(newKey) {
   Session.set('mfTransKey', newKey);
+  Meteor.setTimeout(function() { $('.transInput').focus(), 200 });
 }
 
 if (Package['iron:router'])
@@ -187,9 +188,10 @@ Template.mfTrans.events({
 
 Template.mfTransLang.events({
   'click #mfTransLang tr': function(event) {
-    var tr = $(event.target).parents('tr'); 
+    var tr = $(event.target).parents('tr');
     var key = tr.data('key');
     if (key) changeKey(key, null);
+
   },
   'click #translationShowKey': function(event) {
     Session.set('translationShowKey', event.currentTarget.checked);
@@ -210,6 +212,24 @@ Template.mfTransLang.events({
       var key = Session.get('mfTransKey');
 
       saveChange(destLang, key, $(event.currentTarget).val() + "\n");
+    } else if (event.keyCode == 9) {
+      event.preventDefault();
+      var destLang = Session.get('mfTransTrans');
+      var key = Session.get('mfTransKey');
+      saveChange(destLang, key, $(event.currentTarget).val());
+
+      var tr;
+
+      if (event.shiftKey) {
+        tr = $(event.target).parents('tr').prev();
+      } else {
+        tr = $(event.target).parents('tr').next();
+      }
+      if (tr) {
+        var key = tr.data('key');
+        if (key) changeKey(key, null);
+      }
+      return false;
     }
   }
 });
@@ -225,7 +245,7 @@ Template.mfTransLang.helpers({
     });
   },
   showKey: function() {
-    return Session.get('translationShowKey');  
+    return Session.get('translationShowKey');
   },
   hasMoreRows: function() {
     return this.trans.indexOf('\n') > -1;

From 5b96af48d56aff9b1540e18db41b3ff50894506b Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Fri, 29 May 2015 17:42:32 +1000
Subject: [PATCH 09/11] Removed dependency on Iron Router. Supporting Flow
 Router

In order to be router agnostic and to provide better control over
translation routes I have extracted the route functionality and moved
subscriptions on template. I  have also created a new server route
which I am handling using the webapp package. This route handles the
download of all translations. I have also updated the README for the
project showing how to configure the app both for Flow router and Iron
Router.
---
 msgfmt:extract/extract.js |   4 +-
 msgfmt:ui/README.md       |  75 ++++++++++++++
 msgfmt:ui/lib/client.js   | 208 +++++++++++++++++---------------------
 msgfmt:ui/lib/common.js   |  41 ++++----
 msgfmt:ui/lib/ui.html     |  61 ++++++++++-
 msgfmt:ui/package.js      |   2 +-
 6 files changed, 249 insertions(+), 142 deletions(-)

diff --git a/msgfmt:extract/extract.js b/msgfmt:extract/extract.js
index 8b43cf1..08054e2 100644
--- a/msgfmt:extract/extract.js
+++ b/msgfmt:extract/extract.js
@@ -238,7 +238,7 @@ Meteor.startup(function() {
   });
 
   checkForUpdates();
-});
+});  
 
 /* handler helpers */
 
@@ -270,7 +270,7 @@ function logKey(file, key, text, file, line, strings) {
 }
 
 function checkText(text, key) {
-  return text ? text : ("<" + key + ">" );
+  return (text == null || text == '' || text == "''" || text == '"') ? ("<" + key + ">" ) : text;
 }
 
 /* handlers */
diff --git a/msgfmt:ui/README.md b/msgfmt:ui/README.md
index 08bbaf8..3ac76cb 100644
--- a/msgfmt:ui/README.md
+++ b/msgfmt:ui/README.md
@@ -1,2 +1,77 @@
 ## msgfmt:ui
 
+# Configuration
+
+In order to support following popular routers, please insert following minimal configuration to your application.
+Configuration of security is left with you.
+
+# Iron Router
+
+Register router
+
+```javascript
+mfPkg.router = Router;
+```
+
+Register routes
+
+```javascript
+Router.map(function() {
+  // Main translation page, summary of all language data
+  this.route('mfTrans', {
+    path: '/translate',
+    waitOn: function() {
+      return Meteor.subscribe('mfStats');
+    },
+  });
+
+  // Modify translations for a particular language
+  this.route('mfTransLang', {
+    path: '/translate/:lang',
+    waitOn: function() {
+      Session.set("translationLanguage", this.params.lang);
+      // Note, this is in ADDITION to the regular mfStrings sub
+      return [
+        Meteor.subscribe('mfStrings', [mfPkg.native, this.params.lang], 0, true),
+        Meteor.subscribe('mfRevisions', this.params.lang, 10)
+      ];
+    }
+  });
+});
+```
+
+# Flow Router
+
+Register router
+
+```javascript
+mfPkg.router = FlowRouter;
+```
+
+Register routes
+
+
+```javascript
+FlowRouter.route("/translate/:lang", {
+  action: function(params) {
+    // hack to pass data to the temaplate
+    Session.set("translationLanguage", params.lang);
+    FlowLayout.render("BasicLayout", {main: "mfTransLang"});
+  },
+  subscriptions: function(params) {
+    this.register('strings', Meteor.subscribe('mfStrings', [mfPkg.native, params.lang], 0, true));
+    this.register('revisions', Meteor.subscribe('mfRevisions', params.lang, 10));
+  }
+});
+
+FlowRouter.route("/translate/", {
+  action: function(params) {
+    // hack to pass data to the temaplate
+    Session.set("translationLanguage", params.lang);
+    FlowLayout.render("BasicLayout", { main: "mfTrans"});
+  },
+  subscriptions: function(params) {
+    this.register('stats', Meteor.subscribe('mfStats'));
+  }
+});
+```
\ No newline at end of file
diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index 2ba8b01..f59bd9d 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -3,18 +3,18 @@
 // Setup in msgfmt:core on server, only used on the client in msgfmt:ui
 mfPkg.mfRevisions = new Mongo.Collection('mfRevisions');
 
-/*
- * Finds the name of the first route using the given template
- */
-function routeNameFromTemplate(name) {
-  var route = _.find(Router.routes, function(route) {
-    if (route.options.template)
-      return route.options.template == name;
-    else
-      return route.name == name;
-  });
-  return route && route.name;
-}
+// /*
+//  * Finds the name of the first route using the given template
+//  */
+// function routeNameFromTemplate(name) {
+//   var route = _.find(Router.routes, function(route) {
+//     if (route.options.template)
+//       return route.options.template == name;
+//     else
+//       return route.name == name;
+//   });
+//   return route && route.name;
+// }
 
 /*
  * After user presses ctrl up-down, if the newly highlighted row
@@ -77,105 +77,34 @@ function saveChange(lang, key, text) {
  */
 function changeKey(newKey) {
   Session.set('mfTransKey', newKey);
+  // wait for re-render and focus the new control
   Meteor.setTimeout(function() { $('.transInput').focus(), 200 });
 }
 
-if (Package['iron:router'])
-Package['iron:router'].Router.map(function() {
-  // Main translation page, summary of all language data
-  this.route('mfTrans', {
-    path: '/translate',
-    waitOn: function() {
-      return Meteor.subscribe('mfStats');
-    },
-    data: function() {
-      var data = {};
-      data.strings = mfPkg.mfStrings.find();
-      data.stats = mfPkg.mfMeta.findOne({_id: '__stats'});
-      data.native = mfPkg.native;
-      return data;
-    }
-  });
-
-  // Modify translations for a particular language
-  this.route('mfTransLang', {
-    path: '/translate/:lang',
-    waitOn: function() {
-      // Note, this is in ADDITION to the regular mfStrings sub
-      return Meteor.subscribe('mfStrings',
-        [mfPkg.native, this.params.lang], 0, true);
-    },
-    onBeforeAction: function() {
-      if (!mfPkg.webUI.allowed.call(this) || mfPkg.webUI.denied.call(this)) {
-        this.render('mfTransLangDenied');
-      } else {
-        // Temporary, only used to override preserve on dest
-        Session.set('mfTransTrans', this.params.lang);
-
-        // Handle ctrl-up/ctrl-down, respectively
-        $(window).on('keydown.mfTrans', function(event) {
-          if (event.ctrlKey && (event.which == 38 || event.which == 40)) {
-            event.preventDefault(); event.stopPropagation();
-            var tr = event.which == 38
-              ? $('#mfTransLang tr.current').prev()
-              : $('#mfTransLang tr.current').next();
-            if (tr.length) {
-              mfCheckScroll(tr);
-            }
-          }
-        });
-
-        this.subscribe('mfRevisions', this.params.lang, 10);
-        this.next();
-      }
-    },
-    onStop: function() {
-      $(window).off('keydown.mfTrans');
-    },
-    data: function() {
-      var data = { strings: {} };
-      var strings, out = {};
-      data.orig = mfPkg.native;
-      data.trans = this.params.lang;
-
-      // summarise matching keys (orig + trans) to a single record
-      strings = mfPkg.mfStrings.find({
-        $and: [{$or: [{lang: data.orig}, {lang: this.params.lang}]},
-          {removed: undefined}]
-      }).fetch();
-      _.each(strings, function(str) {
-        if (!out[str.key])
-          out[str.key] = { key: str.key };
-        if (str.lang == data.orig)
-          out[str.key].orig = str.text;
-        else
-          out[str.key].trans = str.text;
-        if (str.fuzzy)
-          out[str.key].fuzzy = true;
-      });
-      data.strings = _.values(out);
-      data.strings.sort(function(a, b) {
-        if (!a.trans && b.trans)
-          return -1;
-        else if (a.trans && !b.trans)
-          return 1;
-
-        if (!a.fuzzy && b.fuzzy)
-          return -1;
-        else if (b.fuzzy && !a.fuzzy)
-          return 1;
-
-        return a.text - b.text;
-      });
+//////////////////////////////////////
+// Template Language list
 
-      return data;
-    }
-  });
+Template.mfTrans.onCreated(function() {
+  this.data.native = mfPkg.native;
 });
 
+Template.mfTrans.helpers({
+  strings: function() {
+    return mfPkg.mfStrings.find();
+  }, 
+  stats: function() {
+    return mfPkg.mfMeta.findOne({_id: '__stats'});
+  } 
+})
+
 Template.mfTrans.events({
   'click #mfTransNewSubmit': function() {
-    Router.go('/translate/' + $('#mfTransNewText').val());
+    var url = '/translate/' + $('#mfTransNewText').val();
+    if (mfPkg.router) {
+      mfPkg.router.go(url);
+    } else {
+      window.location = '/translate/' + $('#mfTransNewText').val();
+    }
   },
   'click #mfAllJs': function(event, tpl) {
     // Make sure we have no conflicts with iron-router
@@ -186,6 +115,15 @@ Template.mfTrans.events({
   }
 });
 
+/////////////////////////////////
+// Template Language translation
+
+Template.mfTransLang.onCreated(function () {
+  this.data.strings = {};
+  this.data.orig = mfPkg.native;
+  this.data.trans = Session.get("translationLanguage");
+});
+
 Template.mfTransLang.events({
   'click #mfTransLang tr': function(event) {
     var tr = $(event.target).parents('tr');
@@ -200,7 +138,7 @@ Template.mfTransLang.events({
     Session.set('translationSortField', event.currentTarget.attributes['data-sortField'].value);
   },
   'change .transInput': function(event) {
-    var destLang = Session.get('mfTransTrans');
+    var destLang = Template.currentData().trans;
     var key = Session.get('mfTransKey');
 
     saveChange(destLang, key, $(event.currentTarget).val());
@@ -208,14 +146,18 @@ Template.mfTransLang.events({
   'keydown .transInput': function(event) {
     // if enter is pressed we possibly switch to textarea
     if (event.keyCode == 13 && $(event.currentTarget).val().indexOf('\n') == -1) {
-      var destLang = Session.get('mfTransTrans');
+      var destLang = Template.currentData().trans;
       var key = Session.get('mfTransKey');
 
       saveChange(destLang, key, $(event.currentTarget).val() + "\n");
-    } else if (event.keyCode == 9) {
+    } 
+    // if tab was pressed we save the current one and move to next input
+    else if (event.keyCode == 9) {
+      
       event.preventDefault();
-      var destLang = Session.get('mfTransTrans');
+      var destLang = Template.currentData().trans;
       var key = Session.get('mfTransKey');
+      
       saveChange(destLang, key, $(event.currentTarget).val());
 
       var tr;
@@ -235,12 +177,50 @@ Template.mfTransLang.events({
 });
 
 Template.mfTransLang.helpers({
-  sortedStrings: function() {
+  strings: function() {
+    // summarise matching keys (orig + trans) to a single record
+      var self = this;
+      var strings = mfPkg.mfStrings.find({
+        $and: [{$or: [{lang: self.orig}, {lang: self.trans}]},
+          {removed: undefined}]
+      }).fetch();
+      
+      if (!strings) return;
+      
+      var out = {};
+      _.each(strings, function(str) {
+        if (!out[str.key])
+          out[str.key] = { key: str.key };
+        if (str.lang == self.orig)
+          out[str.key].orig = str.text;
+        else
+          out[str.key].trans = str.text;
+        if (str.fuzzy)
+          out[str.key].fuzzy = true;
+      });
+      strings = _.values(out);
+      strings.sort(function(a, b) {
+        if (!a.trans && b.trans)
+          return -1;
+        else if (a.trans && !b.trans)
+          return 1;
+
+        if (!a.fuzzy && b.fuzzy)
+          return -1;
+        else if (b.fuzzy && !a.fuzzy)
+          return 1;
+
+        return a.text - b.text;
+      });
+      
+      return strings;
+  },
+  sortedStrings: function(strings) {
     var sortField = Session.get('translationSortField');
     if (!sortField) {
       Session.set('translationSortField', 'orig');
     }
-    return this.strings.sort(function(a, b) {
+    return strings.sort(function(a, b) {
       return a[sortField] > b[sortField] ? 1 : (a[sortField] < b[sortField] ? -1 : 0);
     });
   },
@@ -281,11 +261,11 @@ Template.mfTransLang.helpers({
       key: Session.get('mfTransKey'),
       lang: this.orig
     });
-    if (str && str.template) {
-      var routeName = routeNameFromTemplate(str.template);
-      if (routeName)
-        str.routeUrl = Router.path(routeName);
-    }
+    // if (str && str.template) {
+    //   var routeName = routeNameFromTemplate(str.template);
+    //   if (routeName)
+    //     str.routeUrl = Router.path(routeName);
+    // }
     return str || {};
   }
 });
diff --git a/msgfmt:ui/lib/common.js b/msgfmt:ui/lib/common.js
index 78db9cc..41f4875 100644
--- a/msgfmt:ui/lib/common.js
+++ b/msgfmt:ui/lib/common.js
@@ -39,25 +39,24 @@ if (Meteor.isServer) {
   mfPkg.mfRevisions.deny({insert:mfPkg.webUI.denied, update:mfPkg.webUI.denied, remove:mfPkg.webUI.denied});
 }
 
-// needs to be on client and server for routing to work properly
-if (Package['iron:router'])
-Package['iron:router'].Router.map(function() {
-    this.route('mfAll', {
-        path: '/translate/mfAll.js',
-        where: 'server',
-        action: function() {
-            var out, meta = { exportedAt: new Date().getTime(), updatedAt: 0 };
-            for (lang in mfPkg.strings)
-                for (key in mfPkg.strings[lang])
-                    if (mfPkg.strings[lang][key].mtime > meta.updatedAt)
-                        meta.updatedAt = mfPkg.strings[lang][key].mtime;
+// function serve content
 
-            out = 'mfPkg.syncAll('
-                + JSON.stringify(mfPkg.strings, null, 2)
-                + ', ' + JSON.stringify(meta, null, 2) + ');';
-            //this.response.writeHead(200, {'Content-Type': 'application/javascript'});
-            this.response.writeHead(200, {'Content-Disposition': 'attachment; filename=mfAll.js'});
-            this.response.end(out, 'utf8');
-        }
-    });
-});
+if (Meteor.isServer) {
+  var serve = function (req, response) { 
+  var out, meta = { exportedAt: new Date().getTime(), updatedAt: 0 };
+  for (lang in mfPkg.strings)
+      for (key in mfPkg.strings[lang])
+          if (mfPkg.strings[lang][key].mtime > meta.updatedAt)
+              meta.updatedAt = mfPkg.strings[lang][key].mtime;
+
+  out = 'mfPkg.syncAll('
+      + JSON.stringify(mfPkg.strings, null, 2)
+      + ', ' + JSON.stringify(meta, null, 2) + ');';
+  //this.response.writeHead(200, {'Content-Type': 'application/javascript'});
+  response.writeHead(200, {'Content-Disposition': 'attachment; filename=mfAll.js'});
+  response.end(out, 'utf8');
+  }
+  
+  // declare route from which we are serving the js file
+  WebApp.connectHandlers.use('/translate/mfAll.js', serve);
+}
diff --git a/msgfmt:ui/lib/ui.html b/msgfmt:ui/lib/ui.html
index 7e12e99..58d8a5b 100644
--- a/msgfmt:ui/lib/ui.html
+++ b/msgfmt:ui/lib/ui.html
@@ -1,5 +1,4 @@
 <template name="mfTrans">
-{{ debug }}
   <div class="container" id="mfTransContainer">
   <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
   <p>Native language: <a href="/translate/{{native}}"><b>{{native}}</b></a> ({{stats.total}} strings)</p>
@@ -61,12 +60,66 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
     <p>For more details see:
     <a href="http://messageformat.meteor.com/">messageformat.meteor.com</a>.
     </p>
-
   {{/if}}
   </div>
 </template>
 
 <template name="mfTransLang">
+  <div class="container" id="mfTransLang">
+    <div id="mfTransPreview">
+      <table>
+        <thead>
+          <tr>
+            {{#if showKey}}
+              <th><a href="#" class="translationSort" data-sortField="key">Key</a></th>
+            {{/if}}
+            <th><a href="#" class="translationSort" data-sortField="orig">Original String ({{orig}})</a></th>
+            <th>Translation ({{trans}})</th>
+          </tr>
+        </thead>
+      </table>
+      <div class="tbodyScroll">
+        <table>
+          <tbody>
+          {{#each sortedStrings strings}}
+            <tr data-key="{{key}}" class="{{stateClass}} {{isCurrent}}">
+              {{#if showKey}}
+                <td>{{key}}</td>
+              {{/if}}
+              <td>{{orig}}</td>
+              <td>
+                {{#if isCurrent}}
+                  {{#if hasMoreRows}}
+                    <textarea rows="1" placeholder="{{orig}}" type="text" class="transInput">{{trans}}</textarea>
+                  {{else}}
+                    <input value="{{trans}}" placeholder="{{orig}}" type="text" class="transInput">
+                  {{/if}}
+
+                {{else}}
+                  {{trans}}
+                {{/if}}
+              </td>
+            </tr>
+          {{/each}}
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <p><input type="checkbox" id="translationShowKey">Show key, Use Tab and Shift+Tab quickly change keys</p>
+    <span><b>{{keyInfo.key}}</b> in {{keyInfo.file}}:{{keyInfo.line
+      }}{{#if keyInfo.template}} (template
+        {{#if keyInfo.routeUrl}}
+          <a href="{{keyInfo.routeUrl}}">{{keyInfo.template}}</a
+        >{{else}}"{{keyInfo.template}}"{{/if}}){{/if
+      }}{{#if keyInfo.func}}; {{keyInfo.func}}{{/if}}
+    </span>
+  <p>
+    <a href="/translate">Back to Translation Summary</a>
+  </p>
+  </div>
+</template>
+
+<template name="mfTransLang1">
 {{ debug }}
   <div class="container" id="mfTransLang">
 
@@ -98,7 +151,7 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
                   {{else}}
                     <input value="{{trans}}" placeholder="{{orig}}" type="text" class="transInput">
                   {{/if}}
-                
+
                 {{else}}
                   {{trans}}
                 {{/if}}
@@ -130,4 +183,4 @@ <h2>{{mf 'mf_site_translations' 'Site Translations'}}</h2>
     <h1>{{mf 'access_denied' 'Access Denied'}}</h1>
     <p>{{mf 'login_and_access' 'Please ensure you are logged in and have the relevant access to add/edit translations.'}}</p>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/msgfmt:ui/package.js b/msgfmt:ui/package.js
index 1b9fa48..a8584c9 100644
--- a/msgfmt:ui/package.js
+++ b/msgfmt:ui/package.js
@@ -8,8 +8,8 @@ Package.describe({
 Package.onUse(function (api) {
   api.versionsFrom("METEOR@1.0.1");
   api.use(['templating', 'underscore'], 'client');
-  api.use('iron:router@1.0.0', ['client', 'server']);
   api.use('mongo');
+  api.use(['webapp'], 'server');
   api.use('msgfmt:core@2.0.0-preview.2');
 
   api.addFiles('lib/common.js');

From 6284aa4f30a6a0470f41a6fa2229d724461e118a Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Sat, 30 May 2015 11:50:37 +1000
Subject: [PATCH 10/11] Added weak dependency on iron and flow router,
 configured routers, addresses comments. Missing middleware.

---
 msgfmt:ui/lib/client.js | 70 ++++++++++++++++++++++++-----------------
 msgfmt:ui/lib/router.js | 63 +++++++++++++++++++++++++++++++++++++
 msgfmt:ui/package.js    |  6 +++-
 3 files changed, 110 insertions(+), 29 deletions(-)
 create mode 100644 msgfmt:ui/lib/router.js

diff --git a/msgfmt:ui/lib/client.js b/msgfmt:ui/lib/client.js
index f59bd9d..4c7eb44 100644
--- a/msgfmt:ui/lib/client.js
+++ b/msgfmt:ui/lib/client.js
@@ -3,6 +3,24 @@
 // Setup in msgfmt:core on server, only used on the client in msgfmt:ui
 mfPkg.mfRevisions = new Mongo.Collection('mfRevisions');
 
+mfPkg.uiConfiguration = {
+    flowLayout: 'layout',
+    flowTemplate: 'main',
+    flowMiddleware: function() {
+
+    },
+    ironRouteChange: function() {
+
+    }
+}
+
+mfPkg.configureUI = function(config) {
+  mfPkg.uiConfiguration.flowLayout = config.flowLayout ? config.flowLayout : mfPkg.uiConfiguration.flowLayout;
+  mfPkg.uiConfiguration.flowTemplate = config.flowTemplate ? config.flowTemplate : mfPkg.uiConfiguration.flowTemplate;
+  mfPkg.uiConfiguration.flowMiddleware = config.flowMiddleware ? config.flowMiddleware : mfPkg.uiConfiguration.flowMiddleware;
+  mfPkg.uiConfiguration.ironRouteChange = config.ironRouteChange ? config.ironRouteChange : mfPkg.uiConfiguration.ironRouteChange;
+}
+
 // /*
 //  * Finds the name of the first route using the given template
 //  */
@@ -84,17 +102,16 @@ function changeKey(newKey) {
 //////////////////////////////////////
 // Template Language list
 
-Template.mfTrans.onCreated(function() {
-  this.data.native = mfPkg.native;
-});
-
 Template.mfTrans.helpers({
+  native: function() {
+    return mfPkg.native;
+  },
   strings: function() {
     return mfPkg.mfStrings.find();
-  }, 
+  },
   stats: function() {
     return mfPkg.mfMeta.findOne({_id: '__stats'});
-  } 
+  }
 })
 
 Template.mfTrans.events({
@@ -118,16 +135,9 @@ Template.mfTrans.events({
 /////////////////////////////////
 // Template Language translation
 
-Template.mfTransLang.onCreated(function () {
-  this.data.strings = {};
-  this.data.orig = mfPkg.native;
-  this.data.trans = Session.get("translationLanguage");
-});
-
 Template.mfTransLang.events({
   'click #mfTransLang tr': function(event) {
-    var tr = $(event.target).parents('tr');
-    var key = tr.data('key');
+    var key = this.key;
     if (key) changeKey(key, null);
 
   },
@@ -138,7 +148,7 @@ Template.mfTransLang.events({
     Session.set('translationSortField', event.currentTarget.attributes['data-sortField'].value);
   },
   'change .transInput': function(event) {
-    var destLang = Template.currentData().trans;
+    var destLang = Session.get("translationLanguage");
     var key = Session.get('mfTransKey');
 
     saveChange(destLang, key, $(event.currentTarget).val());
@@ -146,18 +156,18 @@ Template.mfTransLang.events({
   'keydown .transInput': function(event) {
     // if enter is pressed we possibly switch to textarea
     if (event.keyCode == 13 && $(event.currentTarget).val().indexOf('\n') == -1) {
-      var destLang = Template.currentData().trans;
+      var destLang = Session.get("translationLanguage");
       var key = Session.get('mfTransKey');
 
       saveChange(destLang, key, $(event.currentTarget).val() + "\n");
-    } 
+    }
     // if tab was pressed we save the current one and move to next input
     else if (event.keyCode == 9) {
-      
+
       event.preventDefault();
-      var destLang = Template.currentData().trans;
+      var destLang = Session.get("translationLanguage");
       var key = Session.get('mfTransKey');
-      
+
       saveChange(destLang, key, $(event.currentTarget).val());
 
       var tr;
@@ -179,19 +189,21 @@ Template.mfTransLang.events({
 Template.mfTransLang.helpers({
   strings: function() {
     // summarise matching keys (orig + trans) to a single record
-      var self = this;
+      var orig = mfPkg.native;
+      var trans = Session.get("translationLanguage");
+
       var strings = mfPkg.mfStrings.find({
-        $and: [{$or: [{lang: self.orig}, {lang: self.trans}]},
+        $and: [{$or: [{lang: orig}, {lang: trans}]},
           {removed: undefined}]
       }).fetch();
-      
+
       if (!strings) return;
-      
+
       var out = {};
       _.each(strings, function(str) {
         if (!out[str.key])
           out[str.key] = { key: str.key };
-        if (str.lang == self.orig)
+        if (str.lang == orig)
           out[str.key].orig = str.text;
         else
           out[str.key].trans = str.text;
@@ -212,7 +224,7 @@ Template.mfTransLang.helpers({
 
         return a.text - b.text;
       });
-      
+
       return strings;
   },
   sortedStrings: function(strings) {
@@ -228,7 +240,9 @@ Template.mfTransLang.helpers({
     return Session.get('translationShowKey');
   },
   hasMoreRows: function() {
-    return this.trans.indexOf('\n') > -1;
+    if (this.trans) {
+      return this.trans.indexOf('\n') > -1;
+    }
   },
   stateClass: function() {
     if (this.fuzzy)
@@ -252,7 +266,7 @@ Template.mfTransLang.helpers({
   mfTransTrans: function() {
     var str = mfPkg.mfStrings.findOne({
       key: Session.get('mfTransKey'),
-      lang: this.trans
+      lang: Session.get("translationLanguage")
     });
     return str ? str.text : '';
   },
diff --git a/msgfmt:ui/lib/router.js b/msgfmt:ui/lib/router.js
new file mode 100644
index 0000000..be2c213
--- /dev/null
+++ b/msgfmt:ui/lib/router.js
@@ -0,0 +1,63 @@
+if (Package["iron:router"]) {
+  var Router = Package["iron:router"].Router;
+  
+  Router.map(function() {
+    // Main translation page, summary of all language data
+    this.route('mfTrans', {
+      path: '/translate',
+      waitOn: function() {
+        return Meteor.subscribe('mfStats');
+      },
+    });
+
+    // Modify translations for a particular language
+    this.route('mfTransLang', {
+      path: '/translate/:lang',
+      waitOn: function() {
+        Session.set("translationLanguage", this.params.lang);
+        // Note, this is in ADDITION to the regular mfStrings sub
+        return [
+          Meteor.subscribe('mfStrings', [mfPkg.native, this.params.lang], 0, true),
+          Meteor.subscribe('mfRevisions', this.params.lang, 10)
+        ];
+      }
+    });
+  });
+}
+
+if (Package["meteorhacks:flow-router"] && Package["meteorhacks:flow-layout"] ) {
+
+  var FlowRouter = Package["meteorhacks:flow-router"].FlowRouter;
+  var FlowLayout = Package["meteorhacks:flow-layout"].FlowLayout;
+
+  FlowRouter.route("/translate/:lang", {
+    action: function(params) {
+      // hack to pass data to the temaplate
+      Session.set("translationLanguage", params.lang);
+
+      var templates = {};
+      templates[mfPkg.uiConfiguration.flowTemplate] = "mfTransLang";
+
+      FlowLayout.render(mfPkg.uiConfiguration.flowLayout, templates);
+    },
+    subscriptions: function(params) {
+      this.register('strings', Meteor.subscribe('mfStrings', [mfPkg.native, params.lang], 0, true));
+      this.register('revisions', Meteor.subscribe('mfRevisions', params.lang, 10));
+    }
+  });
+
+  FlowRouter.route("/translate/", {
+    action: function(params) {
+      // hack to pass data to the temaplate
+      Session.set("translationLanguage", params.lang);
+
+      var templates = {};
+      templates[mfPkg.uiConfiguration.flowTemplate] = "mfTrans";
+
+      FlowLayout.render(mfPkg.uiConfiguration.flowLayout, templates);
+    },
+    subscriptions: function(params) {
+      this.register('stats', Meteor.subscribe('mfStats'));
+    }
+  });
+}
diff --git a/msgfmt:ui/package.js b/msgfmt:ui/package.js
index a8584c9..54e1d71 100644
--- a/msgfmt:ui/package.js
+++ b/msgfmt:ui/package.js
@@ -10,6 +10,9 @@ Package.onUse(function (api) {
   api.use(['templating', 'underscore'], 'client');
   api.use('mongo');
   api.use(['webapp'], 'server');
+  api.use(['iron:router'], 'client', { weak: true});
+  api.use(['meteorhacks:flow-router'], 'client', { weak: true});
+  api.use(['meteorhacks:flow-layout'], 'client', { weak: true});
   api.use('msgfmt:core@2.0.0-preview.2');
 
   api.addFiles('lib/common.js');
@@ -17,6 +20,7 @@ Package.onUse(function (api) {
 
   // client
   api.addFiles([
+    'lib/router.js',
     'lib/ui.html',
     'lib/ui.css',
     'lib/client.js',
@@ -31,4 +35,4 @@ Package.onTest(function(api) {
 
   api.addFiles('tests/tests-client.js', 'client');
   api.addFiles('tests/tests-server.js', 'server');
-});
\ No newline at end of file
+});

From 6c6b415b5108cedda7ef8843d89ada7f65508d47 Mon Sep 17 00:00:00 2001
From: Tomas Trescak <tomi.trescak@gmail.com>
Date: Sat, 30 May 2015 11:51:08 +1000
Subject: [PATCH 11/11] Added example applications for iron and flow router

---
 .../flow-example/.meteor/.finished-upgraders  |  8 ++
 examples/flow-example/.meteor/.gitignore      |  1 +
 examples/flow-example/.meteor/.id             |  7 ++
 examples/flow-example/.meteor/packages        | 14 ++++
 examples/flow-example/.meteor/platforms       |  2 +
 examples/flow-example/.meteor/release         |  1 +
 examples/flow-example/.meteor/versions        | 68 +++++++++++++++++
 examples/flow-example/client/FlowTest.css     |  1 +
 examples/flow-example/client/FlowTest.html    | 10 +++
 examples/flow-example/client/FlowTest.js      | 23 ++++++
 examples/flow-example/client/layout.html      |  4 +
 examples/flow-example/client/router.js        |  5 ++
 examples/flow-example/packages/msgfmt:core    |  1 +
 examples/flow-example/packages/msgfmt:extract |  1 +
 examples/flow-example/packages/msgfmt:ui      |  1 +
 examples/flow-example/server/config.js        |  1 +
 examples/flow-example/server/extracts.msgfmt  |  1 +
 .../iron-example/.meteor/.finished-upgraders  |  8 ++
 examples/iron-example/.meteor/.gitignore      |  1 +
 examples/iron-example/.meteor/.id             |  7 ++
 examples/iron-example/.meteor/packages        | 13 ++++
 examples/iron-example/.meteor/platforms       |  2 +
 examples/iron-example/.meteor/release         |  1 +
 examples/iron-example/.meteor/versions        | 73 +++++++++++++++++++
 examples/iron-example/client/FlowTest.css     |  1 +
 examples/iron-example/client/FlowTest.html    | 10 +++
 examples/iron-example/client/FlowTest.js      | 23 ++++++
 examples/iron-example/client/layout.html      |  4 +
 examples/iron-example/client/router.js        |  3 +
 examples/iron-example/packages/msgfmt:core    |  1 +
 examples/iron-example/packages/msgfmt:extract |  1 +
 examples/iron-example/packages/msgfmt:ui      |  1 +
 examples/iron-example/server/config.js        |  1 +
 examples/iron-example/server/extracts.msgfmt  |  1 +
 34 files changed, 300 insertions(+)
 create mode 100644 examples/flow-example/.meteor/.finished-upgraders
 create mode 100644 examples/flow-example/.meteor/.gitignore
 create mode 100644 examples/flow-example/.meteor/.id
 create mode 100644 examples/flow-example/.meteor/packages
 create mode 100644 examples/flow-example/.meteor/platforms
 create mode 100644 examples/flow-example/.meteor/release
 create mode 100644 examples/flow-example/.meteor/versions
 create mode 100644 examples/flow-example/client/FlowTest.css
 create mode 100644 examples/flow-example/client/FlowTest.html
 create mode 100644 examples/flow-example/client/FlowTest.js
 create mode 100644 examples/flow-example/client/layout.html
 create mode 100644 examples/flow-example/client/router.js
 create mode 120000 examples/flow-example/packages/msgfmt:core
 create mode 120000 examples/flow-example/packages/msgfmt:extract
 create mode 120000 examples/flow-example/packages/msgfmt:ui
 create mode 100644 examples/flow-example/server/config.js
 create mode 100644 examples/flow-example/server/extracts.msgfmt
 create mode 100644 examples/iron-example/.meteor/.finished-upgraders
 create mode 100644 examples/iron-example/.meteor/.gitignore
 create mode 100644 examples/iron-example/.meteor/.id
 create mode 100644 examples/iron-example/.meteor/packages
 create mode 100644 examples/iron-example/.meteor/platforms
 create mode 100644 examples/iron-example/.meteor/release
 create mode 100644 examples/iron-example/.meteor/versions
 create mode 100644 examples/iron-example/client/FlowTest.css
 create mode 100644 examples/iron-example/client/FlowTest.html
 create mode 100644 examples/iron-example/client/FlowTest.js
 create mode 100644 examples/iron-example/client/layout.html
 create mode 100644 examples/iron-example/client/router.js
 create mode 120000 examples/iron-example/packages/msgfmt:core
 create mode 120000 examples/iron-example/packages/msgfmt:extract
 create mode 120000 examples/iron-example/packages/msgfmt:ui
 create mode 100644 examples/iron-example/server/config.js
 create mode 100644 examples/iron-example/server/extracts.msgfmt

diff --git a/examples/flow-example/.meteor/.finished-upgraders b/examples/flow-example/.meteor/.finished-upgraders
new file mode 100644
index 0000000..8a76103
--- /dev/null
+++ b/examples/flow-example/.meteor/.finished-upgraders
@@ -0,0 +1,8 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
diff --git a/examples/flow-example/.meteor/.gitignore b/examples/flow-example/.meteor/.gitignore
new file mode 100644
index 0000000..4083037
--- /dev/null
+++ b/examples/flow-example/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/examples/flow-example/.meteor/.id b/examples/flow-example/.meteor/.id
new file mode 100644
index 0000000..c4b53f7
--- /dev/null
+++ b/examples/flow-example/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+1nina3n1bv46e61rs3xrt
diff --git a/examples/flow-example/.meteor/packages b/examples/flow-example/.meteor/packages
new file mode 100644
index 0000000..3d0420e
--- /dev/null
+++ b/examples/flow-example/.meteor/packages
@@ -0,0 +1,14 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-platform
+msgfmt:core
+msgfmt:extract
+msgfmt:ui
+meteorhacks:flow-router
+meteorhacks:flow-layout
+accounts-password
+accounts-ui
diff --git a/examples/flow-example/.meteor/platforms b/examples/flow-example/.meteor/platforms
new file mode 100644
index 0000000..efeba1b
--- /dev/null
+++ b/examples/flow-example/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/examples/flow-example/.meteor/release b/examples/flow-example/.meteor/release
new file mode 100644
index 0000000..dab6b55
--- /dev/null
+++ b/examples/flow-example/.meteor/release
@@ -0,0 +1 @@
+METEOR@1.1.0.2
diff --git a/examples/flow-example/.meteor/versions b/examples/flow-example/.meteor/versions
new file mode 100644
index 0000000..e844418
--- /dev/null
+++ b/examples/flow-example/.meteor/versions
@@ -0,0 +1,68 @@
+accounts-base@1.2.0
+accounts-password@1.1.1
+accounts-ui@1.1.5
+accounts-ui-unstyled@1.1.7
+amplify@1.0.0
+autoupdate@1.2.1
+base64@1.0.3
+binary-heap@1.0.3
+blaze@2.1.2
+blaze-tools@1.0.3
+boilerplate-generator@1.0.3
+callback-hook@1.0.3
+check@1.0.5
+coffeescript@1.0.6
+cosmos:browserify@0.1.4
+ddp@1.1.0
+deps@1.0.7
+ejson@1.0.6
+email@1.0.6
+fastclick@1.0.3
+geojson-utils@1.0.3
+html-tools@1.0.4
+htmljs@1.0.4
+http@1.1.0
+id-map@1.0.3
+jag:pince@0.0.6
+jquery@1.11.3_2
+json@1.0.3
+launch-screen@1.0.2
+less@1.0.14
+livedata@1.0.13
+localstorage@1.0.3
+logging@1.0.7
+meteor@1.1.6
+meteor-platform@1.2.2
+meteorhacks:flow-layout@1.3.0
+meteorhacks:flow-router@1.9.0
+meteorhacks:inject-initial@1.0.2
+minifiers@1.1.5
+minimongo@1.0.8
+mobile-status-bar@1.0.3
+mongo@1.1.0
+msgfmt:core@2.0.0-preview.12
+msgfmt:extract@2.0.0-preview.8
+msgfmt:ui@2.0.0-preview.3
+npm-bcrypt@0.7.8_2
+observe-sequence@1.0.6
+ordered-dict@1.0.3
+raix:eventemitter@0.1.2
+random@1.0.3
+reactive-dict@1.1.0
+reactive-var@1.0.5
+reload@1.1.3
+retry@1.0.3
+routepolicy@1.0.5
+service-configuration@1.0.4
+session@1.1.0
+sha@1.0.3
+spacebars@1.0.6
+spacebars-compiler@1.0.6
+srp@1.0.3
+templating@1.1.1
+tracker@1.0.7
+ui@1.0.6
+underscore@1.0.3
+url@1.0.4
+webapp@1.2.0
+webapp-hashing@1.0.3
diff --git a/examples/flow-example/client/FlowTest.css b/examples/flow-example/client/FlowTest.css
new file mode 100644
index 0000000..b6b4052
--- /dev/null
+++ b/examples/flow-example/client/FlowTest.css
@@ -0,0 +1 @@
+/* CSS declarations go here */
diff --git a/examples/flow-example/client/FlowTest.html b/examples/flow-example/client/FlowTest.html
new file mode 100644
index 0000000..8617969
--- /dev/null
+++ b/examples/flow-example/client/FlowTest.html
@@ -0,0 +1,10 @@
+<template name="header">
+  <h1>{{ mf 'welcome'}} </h1>
+</template>
+
+<template name="hello">
+  {{> loginButtons}}
+  
+  <button>{{ mf 'click me' }}</button>
+  <p>{{ mf 'pressed'}} {{counter}} {{ mf 'times' }}</p>
+</template>
diff --git a/examples/flow-example/client/FlowTest.js b/examples/flow-example/client/FlowTest.js
new file mode 100644
index 0000000..c26b48a
--- /dev/null
+++ b/examples/flow-example/client/FlowTest.js
@@ -0,0 +1,23 @@
+// if (Meteor.isClient) {
+//   // counter starts at 0
+//   Session.setDefault('counter', 0);
+//
+//   Template.hello.helpers({
+//     counter: function () {
+//       return Session.get('counter');
+//     }
+//   });
+//
+//   Template.hello.events({
+//     'click button': function () {
+//       // increment the counter when button is clicked
+//       Session.set('counter', Session.get('counter') + 1);
+//     }
+//   });
+// }
+//
+// if (Meteor.isServer) {
+//   Meteor.startup(function () {
+//     // code to run on server at startup
+//   });
+// }
diff --git a/examples/flow-example/client/layout.html b/examples/flow-example/client/layout.html
new file mode 100644
index 0000000..ce248e9
--- /dev/null
+++ b/examples/flow-example/client/layout.html
@@ -0,0 +1,4 @@
+<template name="layout">
+  {{> Template.dynamic template=top}}
+  {{> Template.dynamic template=main}}
+</template>
diff --git a/examples/flow-example/client/router.js b/examples/flow-example/client/router.js
new file mode 100644
index 0000000..77ac5ff
--- /dev/null
+++ b/examples/flow-example/client/router.js
@@ -0,0 +1,5 @@
+FlowRouter.route('/', {
+    action: function(params) {
+      FlowLayout.render('layout', { top: "header", main: "hello" });
+    }
+});
diff --git a/examples/flow-example/packages/msgfmt:core b/examples/flow-example/packages/msgfmt:core
new file mode 120000
index 0000000..1250e60
--- /dev/null
+++ b/examples/flow-example/packages/msgfmt:core
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:core/
\ No newline at end of file
diff --git a/examples/flow-example/packages/msgfmt:extract b/examples/flow-example/packages/msgfmt:extract
new file mode 120000
index 0000000..553e0e3
--- /dev/null
+++ b/examples/flow-example/packages/msgfmt:extract
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:extract/
\ No newline at end of file
diff --git a/examples/flow-example/packages/msgfmt:ui b/examples/flow-example/packages/msgfmt:ui
new file mode 120000
index 0000000..14e9a8a
--- /dev/null
+++ b/examples/flow-example/packages/msgfmt:ui
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:ui
\ No newline at end of file
diff --git a/examples/flow-example/server/config.js b/examples/flow-example/server/config.js
new file mode 100644
index 0000000..0b0b73e
--- /dev/null
+++ b/examples/flow-example/server/config.js
@@ -0,0 +1 @@
+msgfmt.init('en');
diff --git a/examples/flow-example/server/extracts.msgfmt b/examples/flow-example/server/extracts.msgfmt
new file mode 100644
index 0000000..1dfddc6
--- /dev/null
+++ b/examples/flow-example/server/extracts.msgfmt
@@ -0,0 +1 @@
+# Used by server/extracts.msgfmt~, do not delete.
diff --git a/examples/iron-example/.meteor/.finished-upgraders b/examples/iron-example/.meteor/.finished-upgraders
new file mode 100644
index 0000000..8a76103
--- /dev/null
+++ b/examples/iron-example/.meteor/.finished-upgraders
@@ -0,0 +1,8 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
diff --git a/examples/iron-example/.meteor/.gitignore b/examples/iron-example/.meteor/.gitignore
new file mode 100644
index 0000000..4083037
--- /dev/null
+++ b/examples/iron-example/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/examples/iron-example/.meteor/.id b/examples/iron-example/.meteor/.id
new file mode 100644
index 0000000..c4b53f7
--- /dev/null
+++ b/examples/iron-example/.meteor/.id
@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+1nina3n1bv46e61rs3xrt
diff --git a/examples/iron-example/.meteor/packages b/examples/iron-example/.meteor/packages
new file mode 100644
index 0000000..295169f
--- /dev/null
+++ b/examples/iron-example/.meteor/packages
@@ -0,0 +1,13 @@
+# Meteor packages used by this project, one per line.
+# Check this file (and the other files in this directory) into your repository.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+meteor-platform
+msgfmt:core
+msgfmt:extract
+msgfmt:ui
+iron:router
+accounts-password
+accounts-ui
diff --git a/examples/iron-example/.meteor/platforms b/examples/iron-example/.meteor/platforms
new file mode 100644
index 0000000..efeba1b
--- /dev/null
+++ b/examples/iron-example/.meteor/platforms
@@ -0,0 +1,2 @@
+server
+browser
diff --git a/examples/iron-example/.meteor/release b/examples/iron-example/.meteor/release
new file mode 100644
index 0000000..dab6b55
--- /dev/null
+++ b/examples/iron-example/.meteor/release
@@ -0,0 +1 @@
+METEOR@1.1.0.2
diff --git a/examples/iron-example/.meteor/versions b/examples/iron-example/.meteor/versions
new file mode 100644
index 0000000..e61246d
--- /dev/null
+++ b/examples/iron-example/.meteor/versions
@@ -0,0 +1,73 @@
+accounts-base@1.2.0
+accounts-password@1.1.1
+accounts-ui@1.1.5
+accounts-ui-unstyled@1.1.7
+amplify@1.0.0
+autoupdate@1.2.1
+base64@1.0.3
+binary-heap@1.0.3
+blaze@2.1.2
+blaze-tools@1.0.3
+boilerplate-generator@1.0.3
+callback-hook@1.0.3
+check@1.0.5
+coffeescript@1.0.6
+ddp@1.1.0
+deps@1.0.7
+ejson@1.0.6
+email@1.0.6
+fastclick@1.0.3
+geojson-utils@1.0.3
+html-tools@1.0.4
+htmljs@1.0.4
+http@1.1.0
+id-map@1.0.3
+iron:controller@1.0.7
+iron:core@1.0.7
+iron:dynamic-template@1.0.7
+iron:layout@1.0.7
+iron:location@1.0.7
+iron:middleware-stack@1.0.7
+iron:router@1.0.7
+iron:url@1.0.7
+jag:pince@0.0.6
+jquery@1.11.3_2
+json@1.0.3
+launch-screen@1.0.2
+less@1.0.14
+livedata@1.0.13
+localstorage@1.0.3
+logging@1.0.7
+meteor@1.1.6
+meteor-platform@1.2.2
+meteorhacks:inject-initial@1.0.2
+minifiers@1.1.5
+minimongo@1.0.8
+mobile-status-bar@1.0.3
+mongo@1.1.0
+msgfmt:core@2.0.0-preview.12
+msgfmt:extract@2.0.0-preview.8
+msgfmt:ui@2.0.0-preview.3
+npm-bcrypt@0.7.8_2
+observe-sequence@1.0.6
+ordered-dict@1.0.3
+raix:eventemitter@0.1.2
+random@1.0.3
+reactive-dict@1.1.0
+reactive-var@1.0.5
+reload@1.1.3
+retry@1.0.3
+routepolicy@1.0.5
+service-configuration@1.0.4
+session@1.1.0
+sha@1.0.3
+spacebars@1.0.6
+spacebars-compiler@1.0.6
+srp@1.0.3
+templating@1.1.1
+tracker@1.0.7
+ui@1.0.6
+underscore@1.0.3
+url@1.0.4
+webapp@1.2.0
+webapp-hashing@1.0.3
diff --git a/examples/iron-example/client/FlowTest.css b/examples/iron-example/client/FlowTest.css
new file mode 100644
index 0000000..b6b4052
--- /dev/null
+++ b/examples/iron-example/client/FlowTest.css
@@ -0,0 +1 @@
+/* CSS declarations go here */
diff --git a/examples/iron-example/client/FlowTest.html b/examples/iron-example/client/FlowTest.html
new file mode 100644
index 0000000..8617969
--- /dev/null
+++ b/examples/iron-example/client/FlowTest.html
@@ -0,0 +1,10 @@
+<template name="header">
+  <h1>{{ mf 'welcome'}} </h1>
+</template>
+
+<template name="hello">
+  {{> loginButtons}}
+  
+  <button>{{ mf 'click me' }}</button>
+  <p>{{ mf 'pressed'}} {{counter}} {{ mf 'times' }}</p>
+</template>
diff --git a/examples/iron-example/client/FlowTest.js b/examples/iron-example/client/FlowTest.js
new file mode 100644
index 0000000..c26b48a
--- /dev/null
+++ b/examples/iron-example/client/FlowTest.js
@@ -0,0 +1,23 @@
+// if (Meteor.isClient) {
+//   // counter starts at 0
+//   Session.setDefault('counter', 0);
+//
+//   Template.hello.helpers({
+//     counter: function () {
+//       return Session.get('counter');
+//     }
+//   });
+//
+//   Template.hello.events({
+//     'click button': function () {
+//       // increment the counter when button is clicked
+//       Session.set('counter', Session.get('counter') + 1);
+//     }
+//   });
+// }
+//
+// if (Meteor.isServer) {
+//   Meteor.startup(function () {
+//     // code to run on server at startup
+//   });
+// }
diff --git a/examples/iron-example/client/layout.html b/examples/iron-example/client/layout.html
new file mode 100644
index 0000000..ce248e9
--- /dev/null
+++ b/examples/iron-example/client/layout.html
@@ -0,0 +1,4 @@
+<template name="layout">
+  {{> Template.dynamic template=top}}
+  {{> Template.dynamic template=main}}
+</template>
diff --git a/examples/iron-example/client/router.js b/examples/iron-example/client/router.js
new file mode 100644
index 0000000..53bdc7d
--- /dev/null
+++ b/examples/iron-example/client/router.js
@@ -0,0 +1,3 @@
+Router.route('/', function () {
+  this.render('hello');
+});
diff --git a/examples/iron-example/packages/msgfmt:core b/examples/iron-example/packages/msgfmt:core
new file mode 120000
index 0000000..1250e60
--- /dev/null
+++ b/examples/iron-example/packages/msgfmt:core
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:core/
\ No newline at end of file
diff --git a/examples/iron-example/packages/msgfmt:extract b/examples/iron-example/packages/msgfmt:extract
new file mode 120000
index 0000000..553e0e3
--- /dev/null
+++ b/examples/iron-example/packages/msgfmt:extract
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:extract/
\ No newline at end of file
diff --git a/examples/iron-example/packages/msgfmt:ui b/examples/iron-example/packages/msgfmt:ui
new file mode 120000
index 0000000..14e9a8a
--- /dev/null
+++ b/examples/iron-example/packages/msgfmt:ui
@@ -0,0 +1 @@
+/Users/tomi/Documents/Programming/Github/meteor-messageformat/msgfmt:ui
\ No newline at end of file
diff --git a/examples/iron-example/server/config.js b/examples/iron-example/server/config.js
new file mode 100644
index 0000000..0b0b73e
--- /dev/null
+++ b/examples/iron-example/server/config.js
@@ -0,0 +1 @@
+msgfmt.init('en');
diff --git a/examples/iron-example/server/extracts.msgfmt b/examples/iron-example/server/extracts.msgfmt
new file mode 100644
index 0000000..1dfddc6
--- /dev/null
+++ b/examples/iron-example/server/extracts.msgfmt
@@ -0,0 +1 @@
+# Used by server/extracts.msgfmt~, do not delete.