Merge pull request #9332 from ian-liu/clock/Bug842750_Alarm_label_in_…

…French_not_localized Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream
mozilla-b2g · Apr 22, 2013 · 77db64f · 77db64f
2 parents 0874b5e + 5be2951
commit 77db64f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/apps/clock/js/alarm.js b/apps/clock/js/alarm.js
@@ -407,6 +407,7 @@ var AlarmList = {
     d.setHours(alarm.hour);
     d.setMinutes(alarm.minute);
     var time = getLocaleTime(d);
+    var label = (alarm.label === '') ? _('alarm') : escapeHTML(alarm.label);
     content = '<label class="alarmList">' +
               '  <input id="input-enable"' +
                    '" data-id="' + alarm.id +
@@ -421,10 +422,8 @@ var AlarmList = {
               '      <span class="hour24-state">' + time.p + '</span>' +
               '    </div>' +
               '    <div class="alarmList-detail">' +
-              '      <div class="label">' +
-                       escapeHTML(alarm.label) + '</div>' +
-              '      <div class="repeat">' +
-                       summaryRepeat + '</div>' +
+              '      <div class="label">' + label + '</div>' +
+              '      <div class="repeat">' + summaryRepeat + '</div>' +
               '    </div>' +
               '  </div>' +
               '</a>';
@@ -447,6 +446,7 @@ var AlarmList = {
       d.setHours(alarm.hour);
       d.setMinutes(alarm.minute);
       var time = getLocaleTime(d);
+      var label = (alarm.label === '') ? _('alarm') : escapeHTML(alarm.label);
       content += '<li>' +
                  '  <label class="alarmList">' +
                  '    <input id="input-enable"' +
@@ -462,10 +462,8 @@ var AlarmList = {
                  '        <span class="hour24-state">' + time.p + '</span>' +
                  '      </div>' +
                  '      <div class="alarmList-detail">' +
-                 '        <div class="label">' +
-                            escapeHTML(alarm.label) + '</div>' +
-                 '        <div class="repeat">' +
-                            summaryRepeat + '</div>' +
+                 '        <div class="label">' + label + '</div>' +
+                 '        <div class="repeat">' + summaryRepeat + '</div>' +
                  '      </div>' +
                  '    </div>' +
                  '  </a>' +
@@ -1011,8 +1009,7 @@ var AlarmEditView = {
     }
     var error = false;
 
-    var label = this.labelInput.value;
-    this.alarm.label = (label) ? label : 'Alarm';
+    this.alarm.label = this.labelInput.value;
     this.alarm.enabled = true;
     // Get alarm time from time picker.
     if (this.timePicker.is12hFormat) {

diff --git a/apps/clock/js/onring.js b/apps/clock/js/onring.js
@@ -2,6 +2,8 @@
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 'use strict';
 
+var _ = navigator.mozL10n.get;
+
 var RingView = {
 
   _ringtonePlayer: null,
@@ -88,7 +90,8 @@ var RingView = {
   },
 
   setAlarmLabel: function rv_setAlarmLabel() {
-    this.alarmLabel.textContent = this.getAlarmLabel();
+    var label = this.getAlarmLabel();
+    this.alarmLabel.textContent = (label === '') ? _('alarm') : label;
   },
 
   ring: function rv_ring() {