Merge pull request #27346 from jmcanterafonseca/fix_msg_no_contacts

Bug 1086260 - [Contacts] Wrong message opening contact list (pick activi...
mozilla-b2g · Jan 15, 2015 · 78c37d1 · 78c37d1
2 parents fa8a10e + 4bc31d4
commit 78c37d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/apps/communications/contacts/js/views/list.js b/apps/communications/contacts/js/views/list.js
@@ -870,7 +870,7 @@ contacts.List = (function() {
       return;
     }
 
-    forceICEGroupToBeHidden = !(!!show); 
+    forceICEGroupToBeHidden = !(!!show);
     forceICEGroupToBeHidden ? hideICEGroup() : showICEGroup();
   }
 
@@ -1176,7 +1176,7 @@ contacts.List = (function() {
   };
 
   var showNoContactsAlert = function showNoContactsAlert() {
-    var msg = 'noContactsActivity';
+    var msg = 'noContactsActivity2';
     var noObject = {
       title: 'ok',
       isDanger: false,
@@ -1220,7 +1220,7 @@ contacts.List = (function() {
       successCb();
       return;
     }
-    
+
     var options = {
       filterBy: ['id'],
       filterOp: 'equals',

diff --git a/apps/communications/contacts/locales/contacts.en-US.properties b/apps/communications/contacts/locales/contacts.en-US.properties
@@ -23,9 +23,9 @@ no_contact_email   = This contact does not have an email address
 no_contact_data    = This contact does not have a phone number and email address
 removePhotoConfirm = Remove contact picture?
 loadingContacts    = Loading contacts…
-# LOCALIZATION NOTE(noContactsActivity): Shown when using the context menu to add
-# a number from your call list to a contact, and your contacts list is empty.
-noContactsActivity = Cannot add to contact as your contact list is empty
+# LOCALIZATION NOTE(noContactsActivity2): Shown when trying to pick a contact
+# there are no contacts in your Contacts list
+noContactsActivity2 = No contacts in your Contacts list
 
 # Contact fields
 noName                    = No name

diff --git a/apps/communications/contacts/test/marionette/activities_test.js b/apps/communications/contacts/test/marionette/activities_test.js
@@ -40,9 +40,9 @@ marionette('Contacts > Activities', function() {
 
     setup(function() {
       var selectorsArray = [
-        selectors.formGivenName, 
-        selectors.formFamilyName, 
-        selectors.formOrg, 
+        selectors.formGivenName,
+        selectors.formFamilyName,
+        selectors.formOrg,
         selectors.formTel,
         selectors.formEmailFirst
       ];
@@ -151,7 +151,7 @@ marionette('Contacts > Activities', function() {
       var confirmMsg = client.findElement(selectors.confirmBody);
       var expectedResult = subject.l10n(
         '/locales-obj/en-US.json',
-        'noContactsActivity');
+        'noContactsActivity2');
       assert.equal(confirmMsg.text(), expectedResult);
     });