From 19c74c88725cc35c100d7366b109d47be89f0d4a Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Thu, 1 Oct 2020 19:16:07 -0300
Subject: [PATCH] Fix English use of quantity zero string.

---
 .../components/reminder/OutdatedBuildReminder.java         | 7 ++++++-
 app/src/main/res/values/strings.xml                        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
index 93d4853d4..0a860135b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java
@@ -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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccd7a4fbf..9097d39ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>