Permalink
Browse files

Merge pull request #6822 from arcturus/bug-796163

Bug 796163 - [Contacts] Import contacts from SIM - No contacts detected
  • Loading branch information...
2 parents dcb238b + acb72fd commit fd22b48077a28c02f5d5d2b27b64fa89bcbe7119 @arcturus arcturus committed Dec 6, 2012
@@ -328,8 +328,10 @@ contacts.Settings = (function() {
},
function onimport(num) {
- addMessage(_('simContacts-imported2', {n: num}), after);
- contacts.List.load();
+ if (num > 0) {
+ contacts.List.load();
+ }
+ addMessage(_('simContacts-imported3', {n: num}), after);
Contacts.hideOverlay();
},
function onerror() {
@@ -26,8 +26,8 @@ function importSIMContacts(onread, onimport, onerror) {
// early way out if no contacts have been found
if (nContacts === 0) {
- if (onerror) {
- onerror();
+ if (onimport) {
+ onimport(0);
}
return;
}
@@ -90,13 +90,13 @@ simContacts-importing = Importing SIM contacts…
simContacts-reading = Reading from SIM card…
simContacts-storing = Storing SIM contacts…
simContacts-error = Could not import contacts from SIM
-simContacts-imported2 = {[ plural(n) ]}
-simContacts-imported2[zero] = No contacts imported
-simContacts-imported2[one] = Imported one contact
-simContacts-imported2[two] = Imported {{n}} contacts
-simContacts-imported2[few] = Imported {{n}} contacts
-simContacts-imported2[many] = Imported {{n}} contacts
-simContacts-imported2[other] = Imported {{n}} contacts
+simContacts-imported3 = {[ plural(n) ]}
+simContacts-imported3[zero] = No contacts detected on SIM to import
+simContacts-imported3[one] = Imported one contact
+simContacts-imported3[two] = Imported {{n}} contacts
+simContacts-imported3[few] = Imported {{n}} contacts
+simContacts-imported3[many] = Imported {{n}} contacts
+simContacts-imported3[other] = Imported {{n}} contacts
# Social networks
social-network = Social networks
@@ -178,7 +178,7 @@ var UIManager = {
function() {
feedbackMessage.innerHTML = _('simContacts-reading');
}, function(n) {
- feedbackMessage.innerHTML = _('simContacts-imported2', {n: n});
+ feedbackMessage.innerHTML = _('simContacts-imported3', {n: n});
}, function() {
feedbackMessage.innerHTML = _('simContacts-error');
});
@@ -77,13 +77,13 @@ simContacts-importing = Importing SIM contacts…
simContacts-reading = Reading from SIM card…
simContacts-storing = Storing SIM contacts…
simContacts-error = Could not import contacts from SIM
-simContacts-imported2 = {[ plural(n) ]}
-simContacts-imported2[zero] = No contacts imported
-simContacts-imported2[one] = Imported one contact
-simContacts-imported2[two] = Imported {{n}} contacts
-simContacts-imported2[few] = Imported {{n}} contacts
-simContacts-imported2[many] = Imported {{n}} contacts
-simContacts-imported2[other] = Imported {{n}} contacts
+simContacts-imported3 = {[ plural(n) ]}
+simContacts-imported3[zero] = No contacts detected on SIM to import
+simContacts-imported3[one] = Imported one contact
+simContacts-imported3[two] = Imported {{n}} contacts
+simContacts-imported3[few] = Imported {{n}} contacts
+simContacts-imported3[many] = Imported {{n}} contacts
+simContacts-imported3[other] = Imported {{n}} contacts
importContacts = Import contacts
importSim = Import from SIM
importFb = Import from Facebook

0 comments on commit fd22b48

Please sign in to comment.