Merge pull request mozilla-b2g#7374 from guiora/bug-822291

Bug 822291 - [Status Bar] AM/PM is incorrectly implemented, r=kaze
dscravag · Jan 9, 2013 · 6a51ebb · 6a51ebb
2 parents 1aaff97 + 8eb1b3d
commit 6a51ebb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -285,7 +285,9 @@ var StatusBar = {
       this._clockTimer =
         window.setTimeout((this.update.time).bind(this), (59 - sec) * 1000);
 
-      this.icons.time.textContent = f.localeFormat(now, _('shortTimeFormat'));
+      var formated = f.localeFormat(now, _('shortTimeFormat'));
+      formated = formated.replace(/\s?(AM|PM)\s?/i, '<span>$1</span>');
+      this.icons.time.innerHTML = formated;
 
       var label = this.icons.label;
       var l10nArgs = JSON.parse(label.dataset.l10nArgs || '{}');

diff --git a/apps/system/style/statusbar/statusbar.css b/apps/system/style/statusbar/statusbar.css
@@ -81,6 +81,11 @@ body, html {
   bottom: 2px;
 }
 
+#statusbar-time span {
+  margin: 0 0.3rem;
+  font-size: 1rem;
+}
+
 #screen.locked #statusbar-time {
   display: none;
 }