use plurals

4 files changed, 21 insertions, 15 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 6202010ed..9ede8238d 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -892,12 +892,11 @@ public class EncryptActivity extends DrawerActivity {
 
     private void updateView() {
         if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
-            mSelectKeysButton.setText(getString(R.string.no_keys_selected));
-        } else if (mEncryptionKeyIds.length == 1) {
-            mSelectKeysButton.setText(getString(R.string.one_key_selected));
+            mSelectKeysButton.setText(getString(R.string.select_keys_button_default));
         } else {
-            mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " "
-                    + getResources().getString(R.string.n_keys_selected));
+            mSelectKeysButton.setText(getResources().getQuantityString(
+                    R.plurals.select_keys_button, mEncryptionKeyIds.length,
+                    mEncryptionKeyIds.length));
         }
 
         if (mSecretKeyId == Id.key.none) {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 790913d91..55a6085b6 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -355,12 +355,17 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi
                         int bad = returnData.getInt(KeychainIntentService.RESULT_IMPORT_BAD);
                         String toastMessage;
                         if (added > 0 && updated > 0) {
-                            toastMessage = getString(R.string.keys_added_and_updated, added,
-                                    updated);
+                            String addedStr = getResources().getQuantityString(
+                                    R.plurals.keys_added_and_updated_1, added, added);
+                            String updatedStr = getResources().getQuantityString(
+                                    R.plurals.keys_added_and_updated_2, updated, updated);
+                            toastMessage = addedStr + updatedStr;
                         } else if (added > 0) {
-                            toastMessage = getString(R.string.keys_added, added);
+                            toastMessage = getResources().getQuantityString(R.plurals.keys_added,
+                                    added, added);
                         } else if (updated > 0) {
-                            toastMessage = getString(R.string.keys_updated, updated);
+                            toastMessage = getResources().getQuantityString(R.plurals.keys_updated,
+                                    updated, updated);
                         } else {
                             toastMessage = getString(R.string.no_keys_added_or_updated);
                         }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
index 5e3b3d052..85cde1e7e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
@@ -236,8 +236,10 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
                     // avoided!!!
                     if (mQueryType == Id.keyserver.search) {
                         if (mSearchResult != null) {
-                            Toast.makeText(KeyServerQueryActivity.this,
-                                    getString(R.string.keys_found, mSearchResult.size()),
+                            Toast.makeText(
+                                    KeyServerQueryActivity.this,
+                                    getResources().getQuantityString(R.plurals.keys_found,
+                                            mSearchResult.size(), mSearchResult.size()),
                                     Toast.LENGTH_SHORT).show();
                             mAdapter.setKeys(mSearchResult);
                         }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index 46bbd05c9..f73681f54 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
@@ -182,8 +182,8 @@ public class PreferencesActivity extends SherlockPreferenceActivity {
 
         mKeyServerPreference = (PreferenceScreen) findPreference(Constants.pref.KEY_SERVERS);
         String servers[] = mPreferences.getKeyServers();
-        mKeyServerPreference.setSummary(getResources().getString(R.string.n_key_servers,
-                servers.length));
+        mKeyServerPreference.setSummary(getResources().getQuantityString(R.plurals.n_key_servers,
+                servers.length, servers.length));
         mKeyServerPreference
                 .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                     public boolean onPreferenceClick(Preference preference) {
@@ -207,8 +207,8 @@ public class PreferencesActivity extends SherlockPreferenceActivity {
             String servers[] = data
                     .getStringArrayExtra(PreferencesKeyServerActivity.EXTRA_KEY_SERVERS);
             mPreferences.setKeyServers(servers);
-            mKeyServerPreference.setSummary(getResources().getString(R.string.n_key_servers,
-                    servers.length));
+            mKeyServerPreference.setSummary(getResources().getQuantityString(
+                    R.plurals.n_key_servers, servers.length, servers.length));
             break;
         }