rebuild and no more uppercase

build/bundle.js

@@ -6542,7 +6542,7 @@ var str = exports.str = function(key, params) {
   return template(
     strings[key][locale],
     params
-  ).toUpperCase();
+  );
 };
 
 var getIntlKey = exports.getIntlKey = function(obj, key) {
@@ -6599,6 +6599,11 @@ var getStartDialog = exports.getStartDialog = function(level) {
 });
 
 require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = {
+  ///////////////////////////////////////////////////////////////////////////
+  'learn-git-branching': {
+    '__desc__': 'The title of the app, with spaces',
+    'en_US': 'Learn Git Branching'
+  },
   ///////////////////////////////////////////////////////////////////////////
   'select-a-level': {
     '__desc__': 'The prompt to select a level on the drop down view',
@@ -6754,6 +6759,16 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
     'en_US': 'You are in a level builder, so multiple forms of help are available. Please select either "help general" or "help builder"'
   },
   ///////////////////////////////////////////////////////////////////////////
+  'goal-to-reach': {
+    '__desc__': 'title of window that shoes the goal tree to reach',
+    'en_US': 'Goal To Reach'
+  },
+  ///////////////////////////////////////////////////////////////////////////
+  'hide-goal': {
+    '__desc__': 'the helper message for the window that shows the goal tree',
+    'en_US': 'You can hide this window with "hide goal"'
+  },
+  ///////////////////////////////////////////////////////////////////////////
   'hide-start': {
     '__desc__': 'The helper message for the window that shows the start tree for a level',
     'en_US': 'You can hide this window with "hide start"'
@@ -10337,6 +10352,7 @@ var Q = require('q');
 var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
 
 var Main = require('../app');
+var intl = require('../intl');
 var Constants = require('../util/constants');
 var KeyboardListener = require('../util/keyboard').KeyboardListener;
 var GitError = require('../util/errors').GitError;
@@ -10923,8 +10939,8 @@ var CanvasTerminalHolder = BaseView.extend({
     options = options || {};
     this.destination = $('body');
     this.JSON = {
-      title: options.title || 'Goal To Reach',
+      title: options.title || intl.str('goal-to-reach'),
-      text: options.text || 'You can hide this window with "hide goal"'
+      text: options.text || intl.str('hide-goal')
     };
 
     this.render();
@@ -22810,7 +22826,7 @@ var str = exports.str = function(key, params) {
   return template(
     strings[key][locale],
     params
-  ).toUpperCase();
+  );
 };
 
 var getIntlKey = exports.getIntlKey = function(obj, key) {
@@ -22868,6 +22884,11 @@ var getStartDialog = exports.getStartDialog = function(level) {
 require("/src/js/intl/index.js");
 
 require.define("/src/js/intl/strings.js",function(require,module,exports,__dirname,__filename,process,global){exports.strings = {
+  ///////////////////////////////////////////////////////////////////////////
+  'learn-git-branching': {
+    '__desc__': 'The title of the app, with spaces',
+    'en_US': 'Learn Git Branching'
+  },
   ///////////////////////////////////////////////////////////////////////////
   'select-a-level': {
     '__desc__': 'The prompt to select a level on the drop down view',
@@ -23023,6 +23044,16 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
     'en_US': 'You are in a level builder, so multiple forms of help are available. Please select either "help general" or "help builder"'
   },
   ///////////////////////////////////////////////////////////////////////////
+  'goal-to-reach': {
+    '__desc__': 'title of window that shoes the goal tree to reach',
+    'en_US': 'Goal To Reach'
+  },
+  ///////////////////////////////////////////////////////////////////////////
+  'hide-goal': {
+    '__desc__': 'the helper message for the window that shows the goal tree',
+    'en_US': 'You can hide this window with "hide goal"'
+  },
+  ///////////////////////////////////////////////////////////////////////////
   'hide-start': {
     '__desc__': 'The helper message for the window that shows the start tree for a level',
     'en_US': 'You can hide this window with "hide start"'
@@ -26634,6 +26665,7 @@ var Q = require('q');
 var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
 
 var Main = require('../app');
+var intl = require('../intl');
 var Constants = require('../util/constants');
 var KeyboardListener = require('../util/keyboard').KeyboardListener;
 var GitError = require('../util/errors').GitError;
@@ -27220,8 +27252,8 @@ var CanvasTerminalHolder = BaseView.extend({
     options = options || {};
     this.destination = $('body');
     this.JSON = {
-      title: options.title || 'Goal To Reach',
+      title: options.title || intl.str('goal-to-reach'),
-      text: options.text || 'You can hide this window with "hide goal"'
+      text: options.text || intl.str('hide-goal')
     };
 
     this.render();

index.html

@@ -39,7 +39,9 @@
             </div>
             <div>
               <i class="icon-home"></i>
-              Learn Git Branching
+              <span class="intl-aware" data-intl="learn-git-branching">
+                Learn Git Branching
+              </span>
             </div>
           </div>
         <div id="terminal" class="box flex1 horizontal startAlign">
@@ -410,7 +412,7 @@
        For a much easier time perusing the source, see the individual files at:
           https://github.com/pcottle/learnGitBranching
   -->
-  <script src="build/bundle.min.71a24b09.js"></script>
+  <script src="build/bundle.min.6e347137.js"></script>
 
   <!-- The advantage of github pages: super-easy, simple, slick static hostic.
        The downside? No raw logs to parse for analytics, so I have to include

src/js/intl/index.js

@@ -53,7 +53,7 @@ var str = exports.str = function(key, params) {
   return template(
     strings[key][locale],
     params
-  ).toUpperCase();
+  );
 };
 
 var getIntlKey = exports.getIntlKey = function(obj, key) {

src/js/intl/strings.js

@@ -1,4 +1,9 @@
 exports.strings = {
+  ///////////////////////////////////////////////////////////////////////////
+  'learn-git-branching': {
+    '__desc__': 'The title of the app, with spaces',
+    'en_US': 'Learn Git Branching'
+  },
   ///////////////////////////////////////////////////////////////////////////
   'select-a-level': {
     '__desc__': 'The prompt to select a level on the drop down view',
@@ -154,6 +159,16 @@ exports.strings = {
     'en_US': 'You are in a level builder, so multiple forms of help are available. Please select either "help general" or "help builder"'
   },
   ///////////////////////////////////////////////////////////////////////////
+  'goal-to-reach': {
+    '__desc__': 'title of window that shoes the goal tree to reach',
+    'en_US': 'Goal To Reach'
+  },
+  ///////////////////////////////////////////////////////////////////////////
+  'hide-goal': {
+    '__desc__': 'the helper message for the window that shows the goal tree',
+    'en_US': 'You can hide this window with "hide goal"'
+  },
+  ///////////////////////////////////////////////////////////////////////////
   'hide-start': {
     '__desc__': 'The helper message for the window that shows the start tree for a level',
     'en_US': 'You can hide this window with "hide start"'

src/js/views/index.js

@@ -4,6 +4,7 @@ var Q = require('q');
 var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.Backbone;
 
 var Main = require('../app');
+var intl = require('../intl');
 var Constants = require('../util/constants');
 var KeyboardListener = require('../util/keyboard').KeyboardListener;
 var GitError = require('../util/errors').GitError;
@@ -590,8 +591,8 @@ var CanvasTerminalHolder = BaseView.extend({
     options = options || {};
     this.destination = $('body');
     this.JSON = {
-      title: options.title || 'Goal To Reach',
+      title: options.title || intl.str('goal-to-reach'),
-      text: options.text || 'You can hide this window with "hide goal"'
+      text: options.text || intl.str('hide-goal')
     };
 
     this.render();

src/template.index.html

@@ -39,7 +39,9 @@
             </div>
             <div>
               <i class="icon-home"></i>
-              Learn Git Branching
+              <span class="intl-aware" data-intl="learn-git-branching">
+                Learn Git Branching
+              </span>
             </div>
           </div>
         <div id="terminal" class="box flex1 horizontal startAlign">

todo.txt

@@ -2,19 +2,21 @@ Mega Things
 ~~~~~~~~~~~~~~~~~~~~~~~~
 [ ] origin support
 
+Intl TODO
+~~~~~~~~~~~~~~~~~~~
+[ ] git/index.js translation -- rest of the strings
+[ ] next level confirm translation
+[ ] rest of views/index translation
 
 Big Things
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 [ ] compare settings for a level!!! integrated into builder...
-[ ] hash agnostic comparison
+[ ] rebase -i solution demonstration (blink and fade thing?)
-[ ] rebase -i solution demonstration (blink and fade thing)
 [ ] hash agnotisc comparison with asserts for ammends
 [ ] tree pruning
 
 Medium things:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[ ] fix clickthrough when goal and start are shown
-[ ] animating lock refactor -- not just a boolean, but a stack?
 [ ] fix refreshing during solution animation
 
 Cases to handle / things to edit
@@ -36,6 +38,8 @@ Ideas for cleaning
 Done things:
 (I only started this on Dec 17th 2012 to get a better sense of what was done)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[x] fix clickthrough when goal is shown
+[x] hash agnostic comparison
 [x] get automated SHA hash appending in the html source :OOOOO... template? or what?t
 [x] import random level JSON
 [x] export / import tree from JSON