diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-07 13:52:35 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-07-07 13:53:56 -0400 |
| commit | 91bc7980041628fb807ee19f5588abe5615be26b (patch) | |
| tree | 5b4722eb25c438665bba0ae9a187afecf3c761f4 | |
| parent | fa14b80793711f72f190fef5a41228776b97e6a0 (diff) | |
| download | android_packages_apps_PackageInstaller-91bc7980041628fb807ee19f5588abe5615be26b.tar.gz android_packages_apps_PackageInstaller-91bc7980041628fb807ee19f5588abe5615be26b.tar.bz2 android_packages_apps_PackageInstaller-91bc7980041628fb807ee19f5588abe5615be26b.zip | |
Make "1 more" a plurals for translation purposes
Bug: 22229652
Change-Id: Id0a142eddfe1e3dda5d5910196dce138484a7a7d
3 files changed, 10 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f71dfe99..b143b5ec 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -213,7 +213,10 @@ <string name="additional_permissions">Additional permissions</string> <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] --> - <string name="additional_permissions_more"><xliff:g id="count" example="2">%1$d</xliff:g> more</string> + <plurals name="additional_permissions_more"> + <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> more</item> + <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> more</item> + </plurals> <!-- Warning for turning off permissions on older apps --> <string name="old_sdk_deny_warning">This app was designed for an older version of Android. Denying permission may cause it to no longer function as intended.</string> diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index 92ad7c8a..7cdb33af 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -243,8 +243,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader return true; } }); - extraPerms.setSummary(getString(R.string.additional_permissions_more, - mExtraScreen.getPreferenceCount())); + int count = mExtraScreen.getPreferenceCount(); + extraPerms.setSummary(getResources().getQuantityString( + R.plurals.additional_permissions_more, count, count)); screen.addPreference(extraPerms); } } diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java index d0609fd0..6eaa3d91 100644 --- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java @@ -253,8 +253,9 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment return true; } }); - extraScreenPreference.setSummary(getString(R.string.additional_permissions_more, - mExtraScreen.getPreferenceCount())); + int count = mExtraScreen.getPreferenceCount(); + extraScreenPreference.setSummary(getResources().getQuantityString( + R.plurals.additional_permissions_more, count, count)); screen.addPreference(extraScreenPreference); } } |