Code Quality: Convert Multiple Localized Strings to ICU Message Format | Stage Two (#15508)

Author: XTorLukas

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"),
 			};

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>