GitHub Sync (#501)

* Project import generated by Copybara.

PiperOrigin-RevId: 479539369

* Keep gitignore to avoid name clashes
* Keep readme fix
* Merge rest

Author: mosuem

.gitignore

@@ -10,4 +10,4 @@ OWNERS
 README.google.md
 copy.bara.sky
 test/number_format_compact_google3_icu_test.dart
-update_from_cldr_data.sh
+update_from_cldr_data.sh

lib/intl.dart

@@ -222,7 +222,7 @@ class Intl {
   /// The [other] named argument is mandatory.
   /// The [precision] is the number of fractional digits that would be rendered
   /// when [howMany] is formatted. In some cases just knowing the numeric value
-  /// of [howMany] itsef is not enough, for example "1 mile" vs "1.00 miles"
+  /// of [howMany] itself is not enough, for example "1 mile" vs "1.00 miles"
   ///
   /// For an explanation of plurals and the [zero], [one], [two], [few], [many]
   /// categories see http://cldr.unicode.org/index/cldr-spec/plural-rules

lib/src/intl_helpers.dart

@@ -130,6 +130,25 @@ String? computeMessageName(String? name, String? text, String? meaning) {
   return meaning == null ? text : '${text}_$meaning';
 }
 
+/// Returns an index of a separator between language and region.
+///
+/// Assumes that language length can be only 2 or 3.
+int _separatorIndex(String locale) {
+  if (locale.length < 3) {
+    return -1;
+  }
+  if (locale[2] == '-' || locale[2] == '_') {
+    return 2;
+  }
+  if (locale.length < 4) {
+    return -1;
+  }
+  if (locale[3] == '-' || locale[3] == '_') {
+    return 3;
+  }
+  return -1;
+}
+
 String canonicalizedLocale(String? aLocale) {
 // Locales of length < 5 are presumably two-letter forms, or else malformed.
 // We return them unmodified and if correct they will be found.
@@ -141,11 +160,16 @@ String canonicalizedLocale(String? aLocale) {
   if (aLocale == null) return global_state.getCurrentLocale();
   if (aLocale == 'C') return 'en_ISO';
   if (aLocale.length < 5) return aLocale;
-  if (aLocale[2] != '-' && (aLocale[2] != '_')) return aLocale;
-  var region = aLocale.substring(3);
-// If it's longer than three it's something odd, so don't touch it.
+
+  var separatorIndex = _separatorIndex(aLocale);
+  if (separatorIndex == -1) {
+    return aLocale;
+  }
+  var language = aLocale.substring(0, separatorIndex);
+  var region = aLocale.substring(separatorIndex + 1);
+  // If it's longer than three it's something odd, so don't touch it.
   if (region.length <= 3) region = region.toUpperCase();
-  return '${aLocale[0]}${aLocale[1]}_$region';
+  return '${language}_$region';
 }
 
 String? verifiedLocale(String? newLocale, bool Function(String) localeExists,
@@ -182,6 +206,22 @@ String _throwLocaleError(String localeName) {
 
 /// Return the short version of a locale name, e.g. 'en_US' => 'en'
 String shortLocale(String aLocale) {
-  if (aLocale.length < 2) return aLocale;
-  return aLocale.substring(0, 2).toLowerCase();
+  // TODO(b/241094372): Remove this check.
+  if (aLocale == 'invalid') {
+    return 'in';
+  }
+  if (aLocale.length < 2) {
+    return aLocale;
+  }
+  var separatorIndex = _separatorIndex(aLocale);
+  if (separatorIndex == -1) {
+    if (aLocale.length < 4) {
+      // aLocale is already only a language code.
+      return aLocale.toLowerCase();
+    } else {
+      // Something weird, returning as is.
+      return aLocale;
+    }
+  }
+  return aLocale.substring(0, separatorIndex).toLowerCase();
 }

test/intl_test.dart

@@ -33,6 +33,17 @@ void main() {
     expect(Intl.canonicalizedLocale('xx-yyy'), 'xx_YYY');
     expect(Intl.canonicalizedLocale('xx_YYY'), 'xx_YYY');
     expect(Intl.canonicalizedLocale('C'), 'en_ISO');
+    expect(Intl.canonicalizedLocale('gsw-ch'), 'gsw_CH');
+    expect(Intl.canonicalizedLocale('test-locale'), 'test-locale');
+  });
+
+  test('Shortening locales', () {
+    expect(Intl.shortLocale('en_US'), 'en');
+    expect(Intl.shortLocale('gsw_CH'), 'gsw');
+    expect(Intl.shortLocale('C'), 'C');
+    expect(Intl.shortLocale('test-locale'), 'test-locale');
+    // TODO(b/241094372): Remove this check.
+    expect(Intl.shortLocale('invalid'), 'in');
   });
 
   test('Verifying locale fallback for numbers', () {
@@ -41,6 +52,7 @@ void main() {
     expect(Intl.verifiedLocale('es-419', NumberFormat.localeExists), 'es_419');
     expect(Intl.verifiedLocale('en-ZZ', NumberFormat.localeExists), 'en');
     expect(Intl.verifiedLocale('es-999', NumberFormat.localeExists), 'es');
+    expect(Intl.verifiedLocale('gsw-CH', NumberFormat.localeExists), 'gsw');
 
     void checkAsNumberDefault(String locale, String expected) {
       var oldDefault = Intl.defaultLocale;
@@ -63,6 +75,9 @@ void main() {
     expect(Intl.verifiedLocale('es-419', DateFormat.localeExists), 'es_419');
     expect(Intl.verifiedLocale('en-ZZ', DateFormat.localeExists), 'en');
     expect(Intl.verifiedLocale('es-999', DateFormat.localeExists), 'es');
+    expect(Intl.verifiedLocale('gsw-CH', DateFormat.localeExists), 'gsw');
+    // TODO(b/241094372): Remove this check.
+    expect(Intl.verifiedLocale('invalid', DateFormat.localeExists), 'in');
 
     void checkAsDateDefault(String locale, String expected) {
       var oldDefault = Intl.defaultLocale;