Skip to content

Commit 8df1bed

Browse files
author
sanderaido
committed
Added default English values
If no custom strings are given as inputs, returns default English units
1 parent 0ec932e commit 8df1bed

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/js/timer.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ var timerModule = angular.module('timer', [])
161161
$scope.monthsS = ($scope.months === 1)? '' : 's';
162162
$scope.yearsS = ($scope.years === 1)? '' : 's';
163163
// new plural-singular unit decision functions (for custom units and multilingual support)
164-
$scope.secondUnit = function(singleSecond, pluralSecond){if($scope.seconds === 1){return singleSecond;} return pluralSecond;};
165-
$scope.minuteUnit = function(singleMinute, pluralMinute){if($scope.minutes === 1){return singleMinute;} return pluralMinute;};
166-
$scope.hourUnit = function(singleHour, pluralHour){if($scope.hours === 1){return singleHour;} return pluralHour;};
167-
$scope.dayUnit = function(singleDay, pluralDay){if($scope.days === 1){return singleDay;} return pluralDay;};
168-
$scope.monthUnit = function(singleMonth, pluralMonth){if($scope.months === 1){return singleMonth;} return pluralMonth;};
169-
$scope.yearUnit = function(singleYear, pluralYear){if($scope.years === 1){return singleYear;} return pluralYear;};
164+
$scope.secondUnit = function(singleSecond, pluralSecond){if($scope.seconds === 1){if(singleSecond){return singleSecond;} return 'second';} if(pluralSecond){return pluralSecond;} return 'seconds';};
165+
$scope.minuteUnit = function(singleMinute, pluralMinute){if($scope.minutes === 1){if(singleMinute){return singleMinute;} return 'minute';} if(pluralMinute){return pluralMinute;} return 'minutes';};
166+
$scope.hourUnit = function(singleHour, pluralHour){if($scope.hours === 1){if(singleHour){return singleHour;} return 'hour';} if(pluralHour){return pluralHour;} return 'hours';};
167+
$scope.dayUnit = function(singleDay, pluralDay){if($scope.days === 1){if(singleDay){return singleDay;} return 'day';} if(pluralDay){return pluralDay;} return 'days';};
168+
$scope.monthUnit = function(singleMonth, pluralMonth){if($scope.months === 1){if(singleMonth){return singleMonth;} return 'month';} if(pluralMonth){return pluralMonth;} return 'months';};
169+
$scope.yearUnit = function(singleYear, pluralYear){if($scope.years === 1){if(singleYear){return singleYear;} return 'year';} if(pluralYear){return pluralYear;} return 'years';};
170170
//add leading zero if number is smaller than 10
171171
$scope.sseconds = $scope.seconds < 10 ? '0' + $scope.seconds : $scope.seconds;
172172
$scope.mminutes = $scope.minutes < 10 ? '0' + $scope.minutes : $scope.minutes;

0 commit comments

Comments
 (0)