blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix English use of quantity zero string.

master
Alan Evans 2020-10-01 19:16:07 -03:00
parent 50edb5d1f4
commit 19c74c8872
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
View File

@ -23,7 +23,12 @@ public class OutdatedBuildReminder extends Reminder {
private static CharSequence getPluralsText(final Context context) {
int days = getDaysUntilExpiry() - 1;
return context.getResources().getQuantityString(R.plurals.OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days, days, days);
if (days == 0) {
return context.getString(R.string.OutdatedBuildReminder_your_version_of_signal_will_expire_today);
} else {
return context.getResources().getQuantityString(R.plurals.OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days, days, days);
}
}
@Override

2
app/src/main/res/values/strings.xml
View File

@ -1109,8 +1109,8 @@
<!-- OutdatedBuildReminder -->
<string name="OutdatedBuildReminder_update_now">Update now</string>
<string name="OutdatedBuildReminder_your_version_of_signal_will_expire_today">This version of Signal will expire today. Update to the most recent version.</string>
<plurals name="OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days">
<item quantity="zero">This version of Signal will expire today. Update to the most recent version.</item>
<item quantity="one">This version of Signal will expire tomorrow. Update to the most recent version.</item>
<item quantity="other">This version of Signal will expire in %d days. Update to the most recent version.</item>
</plurals>