cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use plurals

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-19 15:45:43 +01:00
parent b8392719bb
commit f4a9688bd9
10 changed files with 227 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@@ -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) {

13
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -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);
}

6
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
View File

@@ -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);
}

8
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
View File

@@ -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;
}