flutter · fluttergithubbot · May 1, 2020 · Apr 21, 2020 · Apr 22, 2020 · Apr 23, 2020
diff --git a/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart b/packages/flutter/lib/src/cupertino/bottom_tab_bar.dart
@@ -7,6 +7,7 @@ import 'dart:ui' show ImageFilter;
 import 'package:flutter/widgets.dart';
 
 import 'colors.dart';
+import 'localizations.dart';
 import 'theme.dart';
 
 // Standard iOS 10 tab bar height.
@@ -178,10 +179,13 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
             style: CupertinoTheme.of(context).textTheme.tabLabelTextStyle.copyWith(color: inactive),
             child: Padding(
               padding: EdgeInsets.only(bottom: bottomPadding),
-              child: Row(
-                // Align bottom since we want the labels to be aligned.
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: _buildTabItems(context),
+              child: Semantics(
+                explicitChildNodes: true,
+                child:Row(
+                  // Align bottom since we want the labels to be aligned.
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: _buildTabItems(context),
+                ),
               ),
             ),
           ),
@@ -204,6 +208,7 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
 
   List<Widget> _buildTabItems(BuildContext context) {
     final List<Widget> result = <Widget>[];
+    final CupertinoLocalizations localizations = CupertinoLocalizations.of(context);
 
     for (int index = 0; index < items.length; index += 1) {
       final bool active = index == currentIndex;
@@ -213,8 +218,10 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
           Expanded(
             child: Semantics(
               selected: active,
-              // TODO(xster): This needs localization support. https://github.com/flutter/flutter/issues/13452
-              hint: 'tab, ${index + 1} of ${items.length}',
+              hint: localizations.tabLabel(
+                tabIndex: index + 1,
+                tabCount: items.length,
+              ),
               child: GestureDetector(
                 behavior: HitTestBehavior.opaque,
                 onTap: onTap == null ? null : () { onTap(index); },

diff --git a/packages/flutter/lib/src/cupertino/localizations.dart b/packages/flutter/lib/src/cupertino/localizations.dart
@@ -150,6 +150,14 @@ abstract class CupertinoLocalizations {
   // The global version uses the translated string from the arb file.
   String get alertDialogLabel;
 
+  /// The accessibility label used on a tab in a [CupertinoTabBar].
+  ///
+  /// This message describes the index of the selected tab and how many tabs
+  /// there are, e.g. 'tab, 1 of 2' in United States English.
+  ///
+  /// `tabIndex` and `tabCount` must be greater than or equal to one.
+  String tabLabel({int tabIndex, int tabCount});
+
   /// Hour that is shown in [CupertinoTimerPicker] corresponding to
   /// the given hour value.
   ///
@@ -348,6 +356,13 @@ class DefaultCupertinoLocalizations implements CupertinoLocalizations {
   @override
   String get alertDialogLabel => 'Alert';
 
+  @override
+  String tabLabel({int tabIndex, int tabCount}) {
+    assert(tabIndex >= 1);
+    assert(tabCount >= 1);
+    return 'tab, $tabIndex of $tabCount';
+  }
+
   @override
   String timerPickerHour(int hour) => hour.toString();
 

diff --git a/packages/flutter/test/cupertino/bottom_tab_bar_test.dart b/packages/flutter/test/cupertino/bottom_tab_bar_test.dart
@@ -11,9 +11,16 @@ import '../widgets/semantics_tester.dart';
 
 Future<void> pumpWidgetWithBoilerplate(WidgetTester tester, Widget widget) async {
   await tester.pumpWidget(
-    Directionality(
-      textDirection: TextDirection.ltr,
-      child: widget,
+    Localizations(
+      locale: const Locale('en', 'US'),
+      delegates: <LocalizationsDelegate<dynamic>>[
+        DefaultWidgetsLocalizations.delegate,
+        DefaultCupertinoLocalizations.delegate,
+      ],
+      child: Directionality(
+        textDirection: TextDirection.ltr,
+        child: widget,
+      ),
     ),
   );
 }
 testWidgets('tabs announce semantics', (WidgetTester tester) async { 
 testWidgets('tabs announce semantics', (WidgetTester tester) async { 

diff --git a/packages/flutter/test/cupertino/tab_scaffold_test.dart b/packages/flutter/test/cupertino/tab_scaffold_test.dart
@@ -435,15 +435,22 @@ void main() {
   });
 
   testWidgets('Tab contents bottom padding are not consumed by viewInsets when resizeToAvoidBottomInset overriden', (WidgetTester tester) async {
-    final Widget child = Directionality(
-      textDirection: TextDirection.ltr,
-      child: CupertinoTabScaffold(
-        resizeToAvoidBottomInset: false,
-        tabBar: _buildTabBar(),
-        tabBuilder: (BuildContext context, int index) {
-          return const Placeholder();
-        },
-      ),
+    final Widget child = Localizations(
+      locale: const Locale('en', 'US'),
+      delegates: <LocalizationsDelegate<dynamic>>[
+        DefaultWidgetsLocalizations.delegate,
+        DefaultCupertinoLocalizations.delegate,
+      ],
+      child: Directionality(
+        textDirection: TextDirection.ltr,
+        child: CupertinoTabScaffold(
+          resizeToAvoidBottomInset: false,
+          tabBar: _buildTabBar(),
+          tabBuilder: (BuildContext context, int index) {
+            return const Placeholder();
+          },
+        ),
+      )
     );
 
     await tester.pumpWidget(

diff --git a/packages/flutter_localizations/lib/src/cupertino_localizations.dart b/packages/flutter_localizations/lib/src/cupertino_localizations.dart
@@ -251,6 +251,21 @@ abstract class GlobalCupertinoLocalizations implements CupertinoLocalizations {
     }
   }
 
+  /// The raw version of [tabLabel], with `$tabIndex` and `$tabCount` verbatim
+  /// in the string.
+  @protected
+  String get tabLabelRaw;
+
+  @override
+  String tabLabel({ int tabIndex, int tabCount }) {
+    assert(tabIndex >= 1);
+    assert(tabCount >= 1);
+    final String template = tabLabelRaw;
+    return template
+      .replaceFirst(r'$tabIndex', _decimalFormat.format(tabIndex))
+      .replaceFirst(r'$tabCount', _decimalFormat.format(tabCount));
+  }
+
   @override
   String timerPickerHour(int hour) {
     return _singleDigitHourFormat.format(DateTime.utc(0, 0, 0, hour));

diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_af.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_af.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Knip",
   "copyButtonLabel": "Kopieer",
   "pasteButtonLabel": "Plak",
-  "selectAllButtonLabel": "Kies alles"
+  "selectAllButtonLabel": "Kies alles",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_am.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_am.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "ቁረጥ",
   "copyButtonLabel": "ቅዳ",
   "pasteButtonLabel": "ለጥፍ",
-  "selectAllButtonLabel": "ሁሉንም ምረጥ"
+  "selectAllButtonLabel": "ሁሉንም ምረጥ",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_ar.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_ar.arb
@@ -38,5 +38,6 @@
   "cutButtonLabel": "قص",
   "copyButtonLabel": "نسخ",
   "pasteButtonLabel": "لصق",
-  "selectAllButtonLabel": "اختيار الكل"
+  "selectAllButtonLabel": "اختيار الكل",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_as.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_as.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "কাট কৰক",
   "copyButtonLabel": "প্ৰতিলিপি কৰক",
   "pasteButtonLabel": "পে'ষ্ট কৰক",
-  "selectAllButtonLabel": "সকলো বাছনি কৰক"
+  "selectAllButtonLabel": "সকলো বাছনি কৰক",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_az.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_az.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Kəsin",
   "copyButtonLabel": "Kopyalayın",
   "pasteButtonLabel": "Yerləşdirin",
-  "selectAllButtonLabel": "Hamısını seçin"
+  "selectAllButtonLabel": "Hamısını seçin",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_be.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_be.arb
@@ -28,5 +28,6 @@
   "cutButtonLabel": "Выразаць",
   "copyButtonLabel": "Капіраваць",
   "pasteButtonLabel": "Уставіць",
-  "selectAllButtonLabel": "Выбраць усе"
+  "selectAllButtonLabel": "Выбраць усе",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_bg.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_bg.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Изрязване",
   "copyButtonLabel": "Копиране",
   "pasteButtonLabel": "Поставяне",
-  "selectAllButtonLabel": "Избиране на всички"
+  "selectAllButtonLabel": "Избиране на всички",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_bn.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_bn.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "কাট করুন",
   "copyButtonLabel": "কপি করুন",
   "pasteButtonLabel": "পেস্ট করুন",
-  "selectAllButtonLabel": "সব বেছে নিন"
+  "selectAllButtonLabel": "সব বেছে নিন",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_bs.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_bs.arb
@@ -23,5 +23,6 @@
   "cutButtonLabel": "Izreži",
   "copyButtonLabel": "Kopiraj",
   "pasteButtonLabel": "Zalijepi",
-  "selectAllButtonLabel": "Odaberi sve"
+  "selectAllButtonLabel": "Odaberi sve",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_ca.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_ca.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Retalla",
   "copyButtonLabel": "Copia",
   "pasteButtonLabel": "Enganxa",
-  "selectAllButtonLabel": "Selecciona-ho tot"
+  "selectAllButtonLabel": "Selecciona-ho tot",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_cs.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_cs.arb
@@ -28,5 +28,6 @@
   "cutButtonLabel": "Vyjmout",
   "copyButtonLabel": "Kopírovat",
   "pasteButtonLabel": "Vložit",
-  "selectAllButtonLabel": "Vybrat vše"
+  "selectAllButtonLabel": "Vybrat vše",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_da.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_da.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Klip",
   "copyButtonLabel": "Kopiér",
   "pasteButtonLabel": "Sæt ind",
-  "selectAllButtonLabel": "Vælg alle"
+  "selectAllButtonLabel": "Vælg alle",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_de.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_de.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Ausschneiden",
   "copyButtonLabel": "Kopieren",
   "pasteButtonLabel": "Einsetzen",
-  "selectAllButtonLabel": "Alles auswählen"
+  "selectAllButtonLabel": "Alles auswählen",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_el.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_el.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Αποκοπή",
   "copyButtonLabel": "Αντιγραφή",
   "pasteButtonLabel": "Επικόλληση",
-  "selectAllButtonLabel": "Επιλογή όλων"
+  "selectAllButtonLabel": "Επιλογή όλων",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_en.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_en.arb
@@ -43,6 +43,12 @@
     "description": "The accessibility audio announcement made when an iOS style alert dialog is opened."
   },
 
+  "tabLabel": "tab, $tabIndex of $tabCount",
+  "@tabLabel": {
+    "description": "The accessibility label used on a tab. This message describes the index of the selected tab and how many tabs there are, e.g. 'Tab 1 of 2'. All values are greater than or equal to one.",
+    "parameters": "tabIndex, tabCount"
+  },
+
   "timerPickerHourLabelOne": "hour",
   "timerPickerHourLabelOther": "hours",
   "@timerPickerHourLabel": {

diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_es.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_es.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Cortar",
   "copyButtonLabel": "Copiar",
   "pasteButtonLabel": "Pegar",
-  "selectAllButtonLabel": "Seleccionar todos"
+  "selectAllButtonLabel": "Seleccionar todos",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_et.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_et.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Lõika",
   "copyButtonLabel": "Kopeeri",
   "pasteButtonLabel": "Kleebi",
-  "selectAllButtonLabel": "Vali kõik"
+  "selectAllButtonLabel": "Vali kõik",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_eu.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_eu.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Ebaki",
   "copyButtonLabel": "Kopiatu",
   "pasteButtonLabel": "Itsatsi",
-  "selectAllButtonLabel": "Hautatu guztiak"
+  "selectAllButtonLabel": "Hautatu guztiak",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_fa.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_fa.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "برش",
   "copyButtonLabel": "کپی",
   "pasteButtonLabel": "جای‌گذاری",
-  "selectAllButtonLabel": "انتخاب همه"
+  "selectAllButtonLabel": "انتخاب همه",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_fi.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_fi.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Leikkaa",
   "copyButtonLabel": "Kopioi",
   "pasteButtonLabel": "Liitä",
-  "selectAllButtonLabel": "Valitse kaikki"
+  "selectAllButtonLabel": "Valitse kaikki",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_fil.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_fil.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "I-cut",
   "copyButtonLabel": "Kopyahin",
   "pasteButtonLabel": "I-paste",
-  "selectAllButtonLabel": "Piliin Lahat"
+  "selectAllButtonLabel": "Piliin Lahat",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_fr.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_fr.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Couper",
   "copyButtonLabel": "Copier",
   "pasteButtonLabel": "Coller",
-  "selectAllButtonLabel": "Tout sélect."
+  "selectAllButtonLabel": "Tout sélect.",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_gl.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_gl.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Cortar",
   "copyButtonLabel": "Copiar",
   "pasteButtonLabel": "Pegar",
-  "selectAllButtonLabel": "Seleccionar todo"
+  "selectAllButtonLabel": "Seleccionar todo",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_gsw.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_gsw.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Ausschneiden",
   "copyButtonLabel": "Kopieren",
   "pasteButtonLabel": "Einsetzen",
-  "selectAllButtonLabel": "Alles auswählen"
+  "selectAllButtonLabel": "Alles auswählen",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_gu.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_gu.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "કાપો",
   "copyButtonLabel": "કૉપિ કરો",
   "pasteButtonLabel": "પેસ્ટ કરો",
-  "selectAllButtonLabel": "બધા પસંદ કરો"
+  "selectAllButtonLabel": "બધા પસંદ કરો",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_he.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_he.arb
@@ -28,5 +28,6 @@
   "cutButtonLabel": "גזירה",
   "copyButtonLabel": "העתקה",
   "pasteButtonLabel": "הדבקה",
-  "selectAllButtonLabel": "בחירת הכול"
+  "selectAllButtonLabel": "בחירת הכול",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_hi.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_hi.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "काटें",
   "copyButtonLabel": "कॉपी करें",
   "pasteButtonLabel": "चिपकाएं",
-  "selectAllButtonLabel": "सभी चुनें"
+  "selectAllButtonLabel": "सभी चुनें",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_hr.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_hr.arb
@@ -23,5 +23,6 @@
   "cutButtonLabel": "Izreži",
   "copyButtonLabel": "Kopiraj",
   "pasteButtonLabel": "Zalijepi",
-  "selectAllButtonLabel": "Odaberi sve"
+  "selectAllButtonLabel": "Odaberi sve",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_hu.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_hu.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Kivágás",
   "copyButtonLabel": "Másolás",
   "pasteButtonLabel": "Beillesztés",
-  "selectAllButtonLabel": "Összes kijelölése"
+  "selectAllButtonLabel": "Összes kijelölése",
+  "tabLabel": "TBD"
 }
diff --git a/packages/flutter_localizations/lib/src/l10n/cupertino_hy.arb b/packages/flutter_localizations/lib/src/l10n/cupertino_hy.arb
@@ -18,5 +18,6 @@
   "cutButtonLabel": "Կտրել",
   "copyButtonLabel": "Պատճենել",
   "pasteButtonLabel": "Տեղադրել",
-  "selectAllButtonLabel": "Նշել բոլորը"
+  "selectAllButtonLabel": "Նշել բոլորը",
+  "tabLabel": "TBD"
 }