Update timer.js

Removed zero-unit pluralization and added new unit functions with custom string support.

Author: sanderaido

app/js/timer.js

@@ -153,13 +153,20 @@ var timerModule = angular.module('timer', [])
             $scope.months = Math.floor((($scope.millis / (3600000)) / 24 / 30) % 12);
             $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 365);
           }
-          // plural - singular unit decision
-          $scope.secondsS = ($scope.seconds === 1 || $scope.seconds === 0) ? '' : 's';
-          $scope.minutesS = ($scope.minutes === 1 || $scope.minutes === 0) ? '' : 's';
-          $scope.hoursS = ($scope.hours === 1 || $scope.hours === 0) ? '' : 's';
-          $scope.daysS = ($scope.days === 1 || $scope.days === 0)? '' : 's';
-          $scope.monthsS = ($scope.months === 1 || $scope.months === 0)? '' : 's';
-          $scope.yearsS = ($scope.years === 1 || $scope.years === 0)? '' : 's';
+          // plural - singular unit decision (old syntax, for backwards compatibility and English only)
+          $scope.secondsS = ($scope.seconds === 1) ? '' : 's';
+          $scope.minutesS = ($scope.minutes === 1) ? '' : 's';
+          $scope.hoursS = ($scope.hours === 1) ? '' : 's';
+          $scope.daysS = ($scope.days === 1)? '' : 's';
+          $scope.monthsS = ($scope.months === 1)? '' : 's';
+          $scope.yearsS = ($scope.years === 1)? '' : 's';
+          // new plural-singular unit decision functions (for custom units and multilingual support)
+          $scope.secondUnit = function(singleSecond, pluralSecond){if($scope.seconds === 1){return singleSecond} return pluralSecond};
+          $scope.minuteUnit = function(singleMinute, pluralMinute){if($scope.minutes === 1){return singleMinute} return pluralMinute};
+          $scope.hourUnit = function(singleHour, pluralHour){if($scope.hours === 1){return singleHour} return pluralHour};
+          $scope.dayUnit = function(singleDay, pluralDay){if($scope.days === 1){return singleDay} return pluralDay};
+          $scope.monthUnit = function(singleMonth, pluralMonth){if($scope.months === 1){return singleMonth} return pluralMonth};
+          $scope.yearUnit = function(singleYear, pluralYear){if($scope.years === 1){return singleYear} return pluralYear};
           //add leading zero if number is smaller than 10
           $scope.sseconds = $scope.seconds < 10 ? '0' + $scope.seconds : $scope.seconds;
           $scope.mminutes = $scope.minutes < 10 ? '0' + $scope.minutes : $scope.minutes;