PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using plurals to define for min length of string

Browse Source 
When a number of min length of a string is singular,
the definition of <plurals> can show a localization with a correct
grammar for singular.

Bug: http://b/78537276
Test: Manual
Change-Id: Ic5d94078f1c80a81a37ff7c11d5d5e106a764bed
This commit is contained in:
prochinwang
2018-04-30 15:03:41 +08:00
committed by Prochin Wang
parent 0e8e89f576
commit ae8fdff1af
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/values/strings.xml
View File

@@ -1371,19 +1371,29 @@
<string name="lock_failed_attempts_now_wiping_dialog_dismiss">Dismiss</string> <string name="lock_failed_attempts_now_wiping_dialog_dismiss">Dismiss</string>
<!-- Hint shown in dialog screen when password is too short --> <!-- Hint shown in dialog screen when password is too short -->
<string name="lockpassword_password_too_short">Must be at least <xliff:g id="count" example="3">%d</xliff:g> characters</string> <plurals name="lockpassword_password_too_short">
<item quantity="one">Must contain at least <xliff:g id="count" example="1">%d</xliff:g> character</item>
<item quantity="other">Must be at least <xliff:g id="count" example="3">%d</xliff:g> characters</item>
</plurals>
<!-- Hint shown in dialog screen when PIN is too short --> <!-- Hint shown in dialog screen when PIN is too short -->
<string name="lockpassword_pin_too_short">PIN must be at least <xliff:g id="count" example="3">%d</xliff:g> digits</string> <plurals name="lockpassword_pin_too_short">
<item quantity="one">PIN must contain at least <xliff:g id="count" example="1">%d</xliff:g> digit</item>
<item quantity="other">PIN must be at least <xliff:g id="count" example="3">%d</xliff:g> digits</item>
</plurals>
<!-- Hint shown after minimum password criteria is met --> <!-- Hint shown after minimum password criteria is met -->
<string name="lockpassword_continue_label">Continue</string> <string name="lockpassword_continue_label">Continue</string>
<!-- Error shown in popup when password is too long --> <!-- Error shown in popup when password is too long -->
<string name="lockpassword_password_too_long">Must be fewer than <plurals name="lockpassword_password_too_long">
<xliff:g id="number" example="17">%d</xliff:g> characters</string> <item quantity="one">Must be fewer than <xliff:g id="number" example="1">%d</xliff:g> character</item>
<item quantity="other">Must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</item>
</plurals>
<!-- Error shown in popup when PIN is too long --> <!-- Error shown in popup when PIN is too long -->
<string name="lockpassword_pin_too_long">Must be fewer than <plurals name="lockpassword_pin_too_long">
<xliff:g id="number" example="17">%d</xliff:g> digits</string> <item quantity="one">Must be fewer than <xliff:g id="number" example="1">%d</xliff:g> digit</item>
<item quantity="other">Must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</item>
</plurals>
<!-- Error shown when in PIN mode and user enters a non-digit --> <!-- Error shown when in PIN mode and user enters a non-digit -->
<string name="lockpassword_pin_contains_non_digits">Must contain only digits 0-9</string> <string name="lockpassword_pin_contains_non_digits">Must contain only digits 0-9</string>

18
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -843,14 +843,20 @@ public class ChooseLockPassword extends SettingsActivity {
mPasswordMinNonLetter)); mPasswordMinNonLetter));
} }
if ((errorCode & TOO_SHORT) > 0) { if ((errorCode & TOO_SHORT) > 0) {
messages.add(getString(mIsAlphaMode ? messages.add(getResources().getQuantityString(
R.string.lockpassword_password_too_short mIsAlphaMode
: R.string.lockpassword_pin_too_short, mPasswordMinLength)); ? R.plurals.lockpassword_password_too_short
: R.plurals.lockpassword_pin_too_short,
mPasswordMinLength,
mPasswordMinLength));
} }
if ((errorCode & TOO_LONG) > 0) { if ((errorCode & TOO_LONG) > 0) {
messages.add(getString(mIsAlphaMode ? messages.add(getResources().getQuantityString(
R.string.lockpassword_password_too_long mIsAlphaMode
: R.string.lockpassword_pin_too_long, mPasswordMaxLength + 1)); ? R.plurals.lockpassword_password_too_long
: R.plurals.lockpassword_pin_too_long,
mPasswordMaxLength + 1,
mPasswordMaxLength + 1));
} }
if ((errorCode & CONTAIN_SEQUENTIAL_DIGITS) > 0) { if ((errorCode & CONTAIN_SEQUENTIAL_DIGITS) > 0) {
messages.add(getString(R.string.lockpassword_pin_no_sequential_digits)); messages.add(getString(R.string.lockpassword_pin_no_sequential_digits));