From b8cbddf362c414e5ce2f9771ade0ae7b3fa084dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20La=C5=A1t=C5=AFvka?=
 <lastuvka.lukas3@gmail.com>
Date: Thu, 30 May 2024 16:40:55 +0200
Subject: [PATCH] CQ: Days, Hours, Minutes, Seconds ago

---
 .../ApplicationDateTimeFormatter.cs           | 12 ++++-------
 src/Files.App/Strings/en-US/Resources.resw    | 20 ++++---------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/Files.App/Services/DateTimeFormatter/ApplicationDateTimeFormatter.cs b/src/Files.App/Services/DateTimeFormatter/ApplicationDateTimeFormatter.cs
index d4a54a92de26..11ffcbe83a72 100644
--- a/src/Files.App/Services/DateTimeFormatter/ApplicationDateTimeFormatter.cs
+++ b/src/Files.App/Services/DateTimeFormatter/ApplicationDateTimeFormatter.cs
@@ -23,14 +23,10 @@ public override string ToShortLabel(DateTimeOffset offset)
 			return elapsed switch
 			{
 				{ TotalDays: >= 7 } => ToString(offset, "D"),
-				{ TotalDays: >= 2 } => string.Format("DaysAgo".GetLocalizedResource(), elapsed.Days),
-				{ TotalDays: >= 1 } => string.Format("DayAgo".GetLocalizedResource(), elapsed.Days),
-				{ TotalHours: >= 2 } => string.Format("HoursAgo".GetLocalizedResource(), elapsed.Hours),
-				{ TotalHours: >= 1 } => string.Format("HourAgo".GetLocalizedResource(), elapsed.Hours),
-				{ TotalMinutes: >= 2 } => string.Format("MinutesAgo".GetLocalizedResource(), elapsed.Minutes),
-				{ TotalMinutes: >= 1 } => string.Format("MinuteAgo".GetLocalizedResource(), elapsed.Minutes),
-				{ TotalSeconds: >= 2 } => string.Format("SecondsAgo".GetLocalizedResource(), elapsed.Seconds),
-				{ TotalSeconds: >= 1 } => "OneSecondAgo".GetLocalizedResource(),
+				{ TotalDays: >= 1 } => "DaysAgo".GetLocalizedFormatResource(elapsed.Days),
+				{ TotalHours: >= 1 } => "HoursAgo".GetLocalizedFormatResource(elapsed.Hours),
+				{ TotalMinutes: >= 1 } => "MinutesAgo".GetLocalizedFormatResource(elapsed.Minutes),
+				{ TotalSeconds: >= 1 } => "SecondsAgo".GetLocalizedFormatResource(elapsed.Seconds),
 				{ TotalSeconds: >= 0 } => "Now".GetLocalizedResource(),
 				_ => ToString(offset, "D"),
 			};
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index e327e1dd40da..412af3910d40 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -385,28 +385,16 @@
     <value>Read-only</value>
   </data>
   <data name="DaysAgo" xml:space="preserve">
-    <value>{0} days ago</value>
-  </data>
-  <data name="DayAgo" xml:space="preserve">
-    <value>{0} day ago</value>
+    <value>{0, plural, one {# day ago} other {# days ago}}</value>
   </data>
   <data name="HoursAgo" xml:space="preserve">
-    <value>{0} hours ago</value>
-  </data>
-  <data name="HourAgo" xml:space="preserve">
-    <value>{0} hour ago</value>
+    <value>{0, plural, one {# hour ago} other {# hours ago}}</value>
   </data>
   <data name="MinutesAgo" xml:space="preserve">
-    <value>{0} minutes ago</value>
-  </data>
-  <data name="MinuteAgo" xml:space="preserve">
-    <value>{0} minute ago</value>
+    <value>{0, plural, one {# minute ago} other {# minutes ago}}</value>
   </data>
   <data name="SecondsAgo" xml:space="preserve">
-    <value>{0} seconds ago</value>
-  </data>
-  <data name="OneSecondAgo" xml:space="preserve">
-    <value>1 second ago</value>
+    <value>{0, plural, one {# second ago} other {# seconds ago}}</value>
   </data>
   <data name="Now" xml:space="preserve">
     <value>Now</value>