Merge gallery_rewrite

mobile/apps/photos/lib/generated/intl/messages_en.dart

@@ -1463,6 +1463,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "language": MessageLookupByLibrary.simpleMessage("Language"),
         "lastTimeWithThem": m45,
         "lastUpdated": MessageLookupByLibrary.simpleMessage("Last updated"),
+        "lastWeek": MessageLookupByLibrary.simpleMessage("Last week"),
         "lastYearsTrip":
             MessageLookupByLibrary.simpleMessage("Last year\'s trip"),
         "leave": MessageLookupByLibrary.simpleMessage("Leave"),

mobile/apps/photos/lib/generated/l10n.dart

@@ -12326,16 +12326,6 @@ class S {
     );
   }
 
-  /// `Last month`
-  String get lastMonth {
-    return Intl.message(
-      'Last month',
-      name: 'lastMonth',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `This year`
   String get thisYear {
     return Intl.message(
@@ -12346,16 +12336,6 @@ class S {
     );
   }
 
-  /// `Last year`
-  String get lastYear {
-    return Intl.message(
-      'Last year',
-      name: 'lastYear',
-      desc: '',
-      args: [],
-    );
-  }
-
   /// `Group by`
   String get groupBy {
     return Intl.message(

mobile/apps/photos/lib/l10n/intl_en.arb

@@ -1792,9 +1792,7 @@
   "thisWeek": "This week",
   "lastWeek": "Last week",
   "thisMonth": "This month",
-  "lastMonth": "Last month",
   "thisYear": "This year",
-  "lastYear": "Last year",
   "groupBy": "Group by",
   "faceThumbnailGenerationFailed": "Unable to generate face thumbnails",
   "fileAnalysisFailed": "Unable to analyze file",

mobile/apps/photos/lib/ui/viewer/gallery/component/group/type.dart

@@ -223,12 +223,6 @@ extension GroupTypeExtension on GroupType {
       return S.of(context).thisMonth;
     }
 
-    // Check if it's the previous month
-    final lastMonth = DateTime(now.year, now.month - 1);
-    if (date.year == lastMonth.year && date.month == lastMonth.month) {
-      return S.of(context).lastMonth;
-    }
-
     return DateFormat.yMMM(Localizations.localeOf(context).languageCode)
         .format(date);
   }
@@ -241,11 +235,6 @@ extension GroupTypeExtension on GroupType {
       return S.of(context).thisYear;
     }
 
-    // Check if it's the previous year
-    if (date.year == now.year - 1) {
-      return S.of(context).lastYear;
-    }
-
     return DateFormat.y(Localizations.localeOf(context).languageCode)
         .format(date);
   }