Merge pull request #47 from dhoko/fix/_commonUndefined

Fix #44 - _common is undefined

bower.json

@@ -1,9 +1,9 @@
 {
   "name": "ngBabelfish",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "homepage": "https://github.com/dhoko/ngBabelfish",
   "authors": [
-    "dhoko <[email protected]>"
+    "dhoko <[email protected]>"
   ],
   "description": "Internationalization module for angular.js, it's magic !",
   "main": "dist/bundle.js",
@@ -22,4 +22,4 @@
     "karma.conf.js",
     "version.js"
   ]
-}
+}

demo/index-lazy.html

@@ -41,9 +41,9 @@ <h1>ngBabelfish - Lazy demo</h1>
         </div>
     </div>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.13/angular.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.10/angular-ui-router.min.js"></script>
     <script src="../dist/bundle.js"></script>
     <script src="appLazy.js"></script>
 </body>
-</html>
+</html>

demo/index-solo.html

@@ -41,9 +41,9 @@ <h1>ngBabelfish - solo demo</h1>
         </div>
     </div>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.13/angular.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.10/angular-ui-router.min.js"></script>
     <script src="../dist/bundle.js"></script>
     <script src="appSolo.js"></script>
 </body>
-</html>
+</html>

demo/index.html

@@ -41,9 +41,9 @@ <h1>ngBabelfish - default demo</h1>
         </div>
     </div>
 
-    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.20/angular.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.13/angular.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.10/angular-ui-router.min.js"></script>
     <script src="../dist/bundle.js"></script>
     <script src="app.js"></script>
 </body>
-</html>
+</html>

dist/bundle.js

@@ -1,4 +1,4 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 /**
  * i18nBind directive
  * Load a translation for a var
@@ -200,21 +200,27 @@ module.exports = ['$rootScope', '$http', function ($rootScope, $http) {
             });
 
             i18n.stateLoaded = true;
-        } else if (config.lazy) {
+        }
 
-            angular.extend(common, i18n.data[lang]._common);
-            currentPageTranslation = angular.extend(common, i18n.data[page]);
+        if (config.lazy) {
 
-            if(config.namespace) {
-                $rootScope[config.namespace] = currentPageTranslation;
-            }else {
-                angular.extend($rootScope, currentPageTranslation);
-            }
+          if(!i18n.data[lang]) {
+            i18n.data[lang] = {};
+          }
 
-            $rootScope.$emit('ngBabelfish.translation:loaded', {
-                currentState: page,
-                lang: lang
-            });
+          angular.extend(common, i18n.data[lang]._common);
+          currentPageTranslation = angular.extend(common, i18n.data[lang][page] || {});
+
+          if(config.namespace) {
+              $rootScope[config.namespace] = currentPageTranslation;
+          }else {
+              angular.extend($rootScope, currentPageTranslation);
+          }
+
+          $rootScope.$emit('ngBabelfish.translation:loaded', {
+              currentState: page,
+              lang: lang
+          });
         }
     }
 
@@ -657,4 +663,4 @@ module.exports = function() {
         return Object.create(translator);
     }];
 };
-},{}]},{},[6])
+},{}]},{},[6]);

i18n/factory/translator.js

@@ -128,21 +128,27 @@ module.exports = ['$rootScope', '$http', function ($rootScope, $http) {
             });
 
             i18n.stateLoaded = true;
-        } else if (config.lazy) {
+        }
 
-            angular.extend(common, i18n.data[lang]._common);
-            currentPageTranslation = angular.extend(common, i18n.data[page]);
+        if (config.lazy) {
 
-            if(config.namespace) {
-                $rootScope[config.namespace] = currentPageTranslation;
-            }else {
-                angular.extend($rootScope, currentPageTranslation);
-            }
+          if(!i18n.data[lang]) {
+            i18n.data[lang] = {};
+          }
 
-            $rootScope.$emit('ngBabelfish.translation:loaded', {
-                currentState: page,
-                lang: lang
-            });
+          angular.extend(common, i18n.data[lang]._common);
+          currentPageTranslation = angular.extend(common, i18n.data[lang][page] || {});
+
+          if(config.namespace) {
+              $rootScope[config.namespace] = currentPageTranslation;
+          }else {
+              angular.extend($rootScope, currentPageTranslation);
+          }
+
+          $rootScope.$emit('ngBabelfish.translation:loaded', {
+              currentState: page,
+              lang: lang
+          });
         }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-babelfish",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Internationalization module for angular.js, it's magic !",
   "main": "dist/bundle.js",
   "scripts": {
@@ -31,4 +31,4 @@
     "karma-mocha-reporter": "^0.2.8",
     "karma-phantomjs-launcher": "^0.1.4"
   }
-}
+}

test/specs/directives/i18nLoadSpec.js

@@ -52,4 +52,4 @@ describe('Directive@i18nLoad: Load a translation', function () {
             expect(translator.updateLang).toHaveBeenCalledWith('fr-FR');
         });
     });
-});
+});

test/specs/factory/translatorLazySpec.js

@@ -271,7 +271,7 @@ describe('Factory@translator: change current data in lazy mode', function(){
         translator = _translator_;
         translator.init(angular.extend({}, configDataLazy));
         translator.load();
-        scope = _$rootScope_;
+        scope = _$rootScope_.$new();
         document.documentElement.lang = '';
     }));
 

test/specs/factory/translatorSpec.js

@@ -315,7 +315,7 @@ describe('Factory@translator: Sir can you translate this application with data p
         translator = _translator_;
         translator.init(configData);
         translator.load();
-        
+
         scope = _$rootScope_;
 
         document.documentElement.lang = '';
@@ -453,7 +453,7 @@ describe('Factory@translator: Add a namespace with data provider', function(){
         translator = _translator_;
         translator.init(angular.extend({}, configData, {namespace: 'i18n'}));
         translator.load();
-        
+
         scope = _$rootScope_;
 
         document.documentElement.lang = '';