Merge pull request siddii#181 from evilaliv3/issue/180

Issue/180

Author: siddii

app/js/_timer.js

@@ -11,6 +11,7 @@ var timerModule = angular.module('timer', [])
         finishCallback: '&finishCallback',
         autoStart: '&autoStart',
         language: '@?',
+        fallback: '@?',
         maxTimeUnit: '='
       },
       controller: ['$scope', '$element', '$attrs', '$timeout', 'I18nService', '$interpolate', 'progressBarService', function ($scope, $element, $attrs, $timeout, I18nService, $interpolate, progressBarService) {
@@ -30,15 +31,18 @@ var timerModule = angular.module('timer', [])
 
 
         $scope.language = $scope.language || 'en';
+        $scope.fallback = $scope.fallback || 'en';
 
         //allow to change the language of the directive while already launched
-        $scope.$watch('language', function() {
-            i18nService.init($scope.language);
+        $scope.$watch('language', function(newVal, oldVal) {
+          if(newVal !== undefined) {
+            i18nService.init(newVal, $scope.fallback);
+          }
         });
 
         //init momentJS i18n, default english
         var i18nService = new I18nService();
-        i18nService.init($scope.language);
+        i18nService.init($scope.language, $scope.fallback);
 
         //progress bar
         $scope.displayProgressBar = 0;

app/js/i18nService.js

@@ -5,10 +5,22 @@ app.factory('I18nService', function() {
     var I18nService = function() {};
 
     I18nService.prototype.language = 'en';
+    I18nService.prototype.fallback = 'en';
     I18nService.prototype.timeHumanizer = {};
 
-    I18nService.prototype.init = function init(lang){
+    I18nService.prototype.init = function init(lang, fallback) {
+        var supported_languages = humanizeDuration.getSupportedLanguages();
+
+        this.fallback = (fallback !== undefined) ? fallback : 'en';
+        if (supported_languages.indexOf(fallback) === -1) {
+            this.fallback = 'en';
+        }
+
         this.language = lang;
+        if (supported_languages.indexOf(lang) === -1) {
+            this.language = this.fallback;
+        }
+
         //moment init
         moment.locale(this.language); //@TODO maybe to remove, it should be handle by the user's application itself, and not inside the directive
 

bower.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "angular": ">= 1.0.7",
     "momentjs": "~2.9.0",
-    "humanize-duration": "~2.4.0"
+    "humanize-duration": "~2.8.0"
   },
   "devDependencies": {
     "bootstrap": "2.3.2",