Merge remote-tracking branch 'upstream/master' into quiet-pub-output-…

…from-flutter-create
fluttergithubbot · Jan 11, 2023 · b33c5fd · b33c5fd
2 parents 33f2371 + 55e3894
commit b33c5fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-c1d61cf11da89cfcf83e8df2c20aa0ebe4dd9995
+53bd4bbf9646b5a0300785474db643e7e5696ce0
diff --git a/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart b/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart
@@ -13227,7 +13227,7 @@ class MaterialLocalizationFi extends GlobalMaterialLocalizations {
   String get tabLabelRaw => r'Välilehti $tabIndex/$tabCount';
 
   @override
-  TimeOfDayFormat get timeOfDayFormatRaw => TimeOfDayFormat.HH_colon_mm;
+  TimeOfDayFormat get timeOfDayFormatRaw => TimeOfDayFormat.HH_dot_mm;
 
   @override
   String get timePickerDialHelpText => 'VALITSE AIKA';

diff --git a/packages/flutter_localizations/lib/src/l10n/material_fi.arb b/packages/flutter_localizations/lib/src/l10n/material_fi.arb
@@ -1,6 +1,6 @@
 {
   "scriptCategory": "English-like",
-  "timeOfDayFormat": "HH:mm",
+  "timeOfDayFormat": "HH.mm",
   "openAppDrawerTooltip": "Avaa navigointivalikko",
   "backButtonTooltip": "Takaisin",
   "closeButtonTooltip": "Sulje",

diff --git a/packages/flutter_localizations/test/material/date_time_test.dart b/packages/flutter_localizations/test/material/date_time_test.dart
@@ -107,6 +107,11 @@ void main() {
         expect(await formatTimeOfDay(tester, const Locale('ja'), const TimeOfDay(hour: 20, minute: 32)), '20:32');
       });
 
+      testWidgets('formats ${TimeOfDayFormat.HH_dot_mm}', (WidgetTester tester) async {
+        expect(await formatTimeOfDay(tester, const Locale('fi'), const TimeOfDay(hour: 20, minute: 32)), '20.32');
+        expect(await formatTimeOfDay(tester, const Locale('fi'), const TimeOfDay(hour: 9, minute: 32)), '09.32');
+      });
+
       testWidgets('formats ${TimeOfDayFormat.frenchCanadian}', (WidgetTester tester) async {
         expect(await formatTimeOfDay(tester, const Locale('fr', 'CA'), const TimeOfDay(hour: 9, minute: 32)), '09 h 32');
       });