Plural string fixes

This commit is contained in:
str4d
2014-09-25 01:07:42 +00:00
parent e4b8732d5f
commit 53abc52bd1
3 changed files with 9 additions and 7 deletions

View File

@@ -177,7 +177,7 @@ public class EmailListFragment extends AuthenticatedListFragment implements
if (numIncompleteEmails > 0) {
mNumIncompleteEmails = new TextView(getActivity());
mNumIncompleteEmails.setText(getResources().getQuantityString(R.plurals.incomplete_emails,
numIncompleteEmails));
numIncompleteEmails, numIncompleteEmails));
mNumIncompleteEmails.setPadding(16, 5, 16, 5);
getListView().addHeaderView(mNumIncompleteEmails, null, false);
}

View File

@@ -218,13 +218,15 @@ public class SettingsActivity extends PreferenceActivity {
addPreferencesFromResource(R.xml.settings_general);
ListPreference numSendHops = (ListPreference) findPreference("numSendHops");
numSendHops.setSummary(getResources().getQuantityText(R.plurals.pref_summ_numHops,
Integer.valueOf(numSendHops.getValue())));
int value = Integer.valueOf(numSendHops.getValue());
numSendHops.setSummary(getResources().getQuantityString(R.plurals.pref_summ_numHops,
value, value));
numSendHops.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
preference.setSummary(getResources().getQuantityText(R.plurals.pref_summ_numHops,
Integer.valueOf((String) newValue)));
int value = Integer.valueOf((String) newValue);
preference.setSummary(getResources().getQuantityString(R.plurals.pref_summ_numHops,
value, value));
return true;
}
});

View File

@@ -46,7 +46,7 @@
<string name="check_email">Check email</string>
<!-- Argument is a number -->
<plurals name="incomplete_emails">
<item quantity="one">%d incomplete emails</item>
<item quantity="one">One incomplete email</item>
<item quantity="other">%d incomplete emails</item>
</plurals>
<!-- Argument is a number -->
@@ -79,7 +79,7 @@
<string name="connected_to_network">Connected to the Bote network</string>
<plurals name="n_new_emails">
<item quantity="one">%d new email</item>
<item quantity="one">One new email</item>
<item quantity="other">%d new emails</item>
</plurals>