From 1231eed674b962f0bae400db7140d4365a6caf28 Mon Sep 17 00:00:00 2001
From: Aayushi Mathur <aayushimathur6@gmail.com>
Date: Sat, 16 Sep 2023 23:52:47 +0530
Subject: [PATCH 1/4] "added time_ago in plurals"

---
 .../databinding/TextViewBindingAdapters.java  |  6 +++---
 app/src/main/res/values/strings.xml           | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
index 349c680f221..4286e54565f 100644
--- a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
+++ b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
@@ -83,13 +83,13 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) {
     } else if (timeDifferenceMillis < TimeUnit.MINUTES.toMillis(50)) {
       return getPluralString(
               resourceHandler,
-          R.plurals.minutes,
+          R.plurals.minutes_ago,
           (int) TimeUnit.MILLISECONDS.toMinutes(timeDifferenceMillis)
       );
     } else if (timeDifferenceMillis < TimeUnit.DAYS.toMillis(1)) {
       return getPluralString(
               resourceHandler,
-          R.plurals.hours,
+          R.plurals.hours_ago,
           (int) TimeUnit.MILLISECONDS.toHours(timeDifferenceMillis)
       );
     } else if (timeDifferenceMillis < TimeUnit.DAYS.toMillis(2)) {
@@ -97,7 +97,7 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) {
     }
     return getPluralString(
             resourceHandler,
-        R.plurals.days,
+        R.plurals.days_ago,
         (int) TimeUnit.MILLISECONDS.toDays(timeDifferenceMillis)
     );
   }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 408a4095aca..1eca7c1b14f 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -481,17 +481,18 @@
   <string name="up_button_disabled">Up</string>
   <string name="down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
-  <plurals name="minutes">
-    <item quantity="one">a minute</item>
-    <item quantity="other">%s minutes</item>
+  <plurals name="minutes_ago">
+    <item quantity="zero">zero minutes ago</item>
+    <item quantity="one">a minute ago</item>
+    <item quantity="other">%s minutes ago</item>
   </plurals>
-  <plurals name="hours">
-    <item quantity="one">an hour</item>
-    <item quantity="other">%s hours</item>
+  <plurals name="hours_ago">
+    <item quantity="one">an hour ago</item>
+    <item quantity="other">%s hours ago</item>
   </plurals>
-  <plurals name="days">
-    <item quantity="one">a day</item>
-    <item quantity="other">%s days</item>
+  <plurals name="days_ago">
+    <item quantity="one">a day ago</item>
+    <item quantity="other">%s days ago</item>
   </plurals>
   <!-- ViewTags -->
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>

From dbb8a5ea41263a052de33e8e202b30fcd8f1c493 Mon Sep 17 00:00:00 2001
From: Aayushi Mathur <aayushimathur6@gmail.com>
Date: Tue, 19 Sep 2023 18:54:50 +0530
Subject: [PATCH 2/4] checking by making minor changes

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1eca7c1b14f..a9c99136bc4 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -468,7 +468,7 @@
   <!-- TextViewBindingAdapters -->
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
-  <string name="time_ago">%s ago</string>
+  <string name="time_ago">%s</string>
   <string name="yesterday">yesterday</string>
   <string name="return_to_topic">Return to topic</string>
   <string name="return_to_lesson">Return to lesson</string>

From b68ac786cc7954a878879404745520a2ba2c1c78 Mon Sep 17 00:00:00 2001
From: Aayushi Mathur <aayushimathur6@gmail.com>
Date: Tue, 19 Sep 2023 20:26:52 +0530
Subject: [PATCH 3/4] changed plural zero quantity

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9c99136bc4..f5e3bacaba0 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -482,7 +482,7 @@
   <string name="down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
   <plurals name="minutes_ago">
-    <item quantity="zero">zero minutes ago</item>
+    <item quantity="zero">0 minute ago</item>
     <item quantity="one">a minute ago</item>
     <item quantity="other">%s minutes ago</item>
   </plurals>

From aa3818455057676330c411b6720c7e3a5766224a Mon Sep 17 00:00:00 2001
From: Aayushi Mathur <aayushimathur6@gmail.com>
Date: Thu, 21 Sep 2023 15:30:11 +0530
Subject: [PATCH 4/4] suggested changes

---
 .../android/app/databinding/TextViewBindingAdapters.java  | 8 ++------
 app/src/main/res/values/strings.xml                       | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
index 4286e54565f..591e8c88738 100644
--- a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
+++ b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
@@ -107,13 +107,9 @@ private static String getPluralString(
       @PluralsRes int pluralsResId,
       int count
   ) {
-    // TODO(#3841): Combine these strings together.
-    return resourceHandler.getStringInLocaleWithWrapping(
-        R.string.time_ago,
-        resourceHandler.getQuantityStringInLocaleWithWrapping(
+    return resourceHandler.getQuantityStringInLocaleWithWrapping(
             pluralsResId, count, String.valueOf(count)
-        )
-    );
+        );
   }
 
   private static long ensureTimestampIsInMilliseconds(long lastVisitedTimestamp) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5e3bacaba0..3f48fef86cc 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -468,7 +468,6 @@
   <!-- TextViewBindingAdapters -->
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
-  <string name="time_ago">%s</string>
   <string name="yesterday">yesterday</string>
   <string name="return_to_topic">Return to topic</string>
   <string name="return_to_lesson">Return to lesson</string>
@@ -482,7 +481,7 @@
   <string name="down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
   <plurals name="minutes_ago">
-    <item quantity="zero">0 minute ago</item>
+    <item quantity="zero">0 minutes ago</item>
     <item quantity="one">a minute ago</item>
     <item quantity="other">%s minutes ago</item>
   </plurals>