Merge pull request #9881 from rwldrn/873477

Bug 873477 - [SMS][MMS] Group participants string formatting update per v8.0
mozilla-b2g · May 23, 2013 · 4d360cb · 4d360cb
2 parents 12a0576 + d62a672
commit 4d360cb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/apps/sms/js/thread_list_ui.js b/apps/sms/js/thread_list_ui.js
@@ -101,7 +101,7 @@ var ThreadListUI = {
         };
       }
 
-      name.textContent = navigator.mozL10n.get('contact-title-text', {
+      name.textContent = navigator.mozL10n.get('thread-header-text', {
         name: title,
         n: others
       });

diff --git a/apps/sms/js/thread_ui.js b/apps/sms/js/thread_ui.js
@@ -678,9 +678,9 @@ var ThreadUI = global.ThreadUI = {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=836733
     if (!navigator.mozMobileMessage && callback) {
       this.headerText.textContent = navigator.mozL10n.get(
-        'contact-title-text', {
-          name: number,
-          n: others
+        'thread-header-text', {
+        name: number,
+        n: others
       });
       setTimeout(callback);
       return;
@@ -706,7 +706,7 @@ var ThreadUI = global.ThreadUI = {
 
       this.headerText.dataset.isContact = !!details.isContact;
       this.headerText.textContent = navigator.mozL10n.get(
-        'contact-title-text', {
+        'thread-header-text', {
           name: contactName,
           n: others
       });

diff --git a/apps/sms/locales/sms.en-US.properties b/apps/sms/locales/sms.en-US.properties
@@ -3,13 +3,13 @@ messages           = Messages
 editMode           = Edit messages
 
 # Contact title
-contact-title-text        = {[ plural(n) ]}
-contact-title-text[zero]  = {{name}}
-contact-title-text[one]   = {{name}} and {{n}} other
-contact-title-text[two]   = {{name}} and {{n}} others
-contact-title-text[few]   = {{name}} and {{n}} others
-contact-title-text[many]  = {{name}} and {{n}} others
-contact-title-text[other] = {{name}} and {{n}} others
+thread-header-text        = {[ plural(n) ]}
+thread-header-text[zero]  = {{name}}
+thread-header-text[one]   = {{name}} (+{{n}})
+thread-header-text[two]   = {{name}} (+{{n}})
+thread-header-text[few]   = {{name}} (+{{n}})
+thread-header-text[many]  = {{name}} (+{{n}})
+thread-header-text[other] = {{name}} (+{{n}})
 
 
 

diff --git a/apps/sms/test/unit/sms_test.js b/apps/sms/test/unit/sms_test.js
@@ -241,8 +241,9 @@ suite('SMS App Unit-Test', function() {
         var threadWithContact = document.getElementById('thread-1');
         var contactName =
           threadWithContact.getElementsByClassName('name')[0].innerHTML;
-        assert.equal(contactName,
-                     'contact-title-text{"name":"Pepito Grillo","n":0}');
+        assert.equal(
+          contactName, 'thread-header-text{"name":"Pepito Grillo","n":0}'
+        );
       });
     });