Merge pull request siddii#54 from itslenny/master

added simple variable for S for plural/singular units

Author: siddii

app/js/timer.js

@@ -95,10 +95,15 @@ angular.module('timer', [])
         });
 
         function calculateTimeUnits() {
+
             $scope.seconds = Math.floor(($scope.millis / 1000) % 60);
+            $scope.secondsS = $scope.seconds==1 ? '' : 's';
             $scope.minutes = Math.floor((($scope.millis / (60000)) % 60));
+            $scope.minutesS = $scope.minutes==1 ? '' : 's';
             $scope.hours = Math.floor((($scope.millis / (3600000)) % 24));
+            $scope.hoursS = $scope.hours==1 ? '' : 's';
             $scope.days = Math.floor((($scope.millis / (3600000)) / 24));
+            $scope.daysS = $scope.days==1 ? '' : 's';
 
             //add leading zero if number is smaller than 10
             $scope.sseconds = $scope.seconds < 10 ? '0' + $scope.seconds : $scope.seconds;

dist/angular-timer.js

@@ -102,17 +102,24 @@ angular.module('timer', [])
         });
 
         function calculateTimeUnits() {
+
             $scope.seconds = Math.floor(($scope.millis / 1000) % 60);
+            $scope.secondsS = $scope.seconds==1 ? '' : 's';
             $scope.minutes = Math.floor((($scope.millis / (60000)) % 60));
+            $scope.minutesS = $scope.minutes==1 ? '' : 's';
             $scope.hours = Math.floor((($scope.millis / (3600000)) % 24));
+            $scope.hoursS = $scope.hours==1 ? '' : 's';
             $scope.days = Math.floor((($scope.millis / (3600000)) / 24));
+            $scope.daysS = $scope.days==1 ? '' : 's';
+
 
             //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;
             $scope.hhours =  $scope.hours < 10 ? '0' + $scope.hours : $scope.hours;
             $scope.ddays =  $scope.days < 10 ? '0' + $scope.days : $scope.days;
 
+
         }
         //determine initial values of time units and add AddSeconds functionality
         if ($scope.countdownattr) {

dist/angular-timer.min.js

@@ -161,6 +161,26 @@ <h3>
         <button class="btn" onclick="stopResumeTimer('auto-start-false-timer', this)" type="button">Start</button>
     </div>
 </section>
+
+<section id="plural-unit-timer">
+    <h3>Plural / Singular units</h3>
+
+    <div class="bs-docs-example">
+        <p>
+            Two stopped countdown timers to illustrate how to handle pluralization of time units.
+            <code ng-non-bindable="">
+            &lt;timer autostart="false" countdown="90061"&gt;{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.&lt;/timer&gt;
+            </code>
+
+        <h3 class="singular-counter">
+            <timer autostart="false" countdown="90061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
+        </h3>
+        <h3 class="plural-counter">
+            <timer autostart="false" countdown="190061">{{days}} day{{daysS}}, {{hours}} hour{{hoursS}}, {{minutes}} minute{{minutesS}}, {{seconds}} second{{secondsS}}.</timer>
+        </h3>
+    </div>
+</section>
+
 <section id="markup">
     <h3>
         Markup</h3>

index.html

@@ -86,16 +86,28 @@ describe('Angular Timer E2E Tests', function () {
     var afterTime = element('#timer-with-end-time timer span').html();
     expect(beforeTime).toHaveMoreSecondsThan(afterTime);
   });
+
+  it('Plural / Singular Units - Should properly pluralize units', function () {
+    expect(element('#plural-unit-timer .singular-counter timer').html()).toMatch(/1 day,/);
+    expect(element('#plural-unit-timer .singular-counter timer').html()).toMatch(/1 hour,/);
+    expect(element('#plural-unit-timer .singular-counter timer').html()).toMatch(/1 minute,/);
+    expect(element('#plural-unit-timer .singular-counter timer').html()).toMatch(/1 second/);  
 
-    it('Leading zero timer - should add a leading zero if number is smaller than 10', function() {
-        sleep(1);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 hours,/);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 minutes,/);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/01 seconds./);
-        sleep(10);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 hours,/);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 minutes,/);
-        expect(element('#clock-timer-leading-zero timer').html()).toMatch(/11 seconds./);
-    });
+    expect(element('#plural-unit-timer .plural-counter timer').html()).toMatch(/days,/);
+    expect(element('#plural-unit-timer .plural-counter timer').html()).toMatch(/hours,/);
+    expect(element('#plural-unit-timer .plural-counter timer').html()).toMatch(/minutes,/);
+    expect(element('#plural-unit-timer .plural-counter timer').html()).toMatch(/seconds/);      
+  });  
+
+  it('Leading zero timer - should add a leading zero if number is smaller than 10', function() {
+    sleep(1);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 hours,/);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 minutes,/);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/01 seconds./);
+    sleep(10);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 hours,/);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/00 minutes,/);
+    expect(element('#clock-timer-leading-zero timer').html()).toMatch(/11 seconds./);
+  });
 
 });