From b4cd2dcc83686685371332992287402cc0d8f46e Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 25 Jan 2023 10:19:28 -0800 Subject: [PATCH 1/2] Follow up to #39113 --- lib/ui/platform_dispatcher.dart | 4 ++-- lib/web_ui/lib/platform_dispatcher.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart index f4840689031b0..5a63594690546 100644 --- a/lib/ui/platform_dispatcher.dart +++ b/lib/ui/platform_dispatcher.dart @@ -1943,7 +1943,7 @@ class Locale { const Locale( this._languageCode, [ this._countryCode, - ]) : assert(_languageCode != ''), + ]) : assert(_languageCode.isNotEmpty), scriptCode = null; /// Creates a new Locale object. @@ -1970,7 +1970,7 @@ class Locale { String languageCode = 'und', this.scriptCode, String? countryCode, - }) : assert(languageCode != ''), + }) : assert(languageCode.isNotEmpty), _languageCode = languageCode, assert(scriptCode != ''), assert(countryCode != ''), diff --git a/lib/web_ui/lib/platform_dispatcher.dart b/lib/web_ui/lib/platform_dispatcher.dart index a6db5dbb11c8b..9ab25fc9bdfa5 100644 --- a/lib/web_ui/lib/platform_dispatcher.dart +++ b/lib/web_ui/lib/platform_dispatcher.dart @@ -443,14 +443,14 @@ class Locale { const Locale( this._languageCode, [ this._countryCode, - ]) : assert(_languageCode != ''), + ]) : assert(_languageCode.isNotEmpty), scriptCode = null; const Locale.fromSubtags({ String languageCode = 'und', this.scriptCode, String? countryCode, - }) : assert(languageCode != ''), + }) : assert(languageCode.isNotEmpty), _languageCode = languageCode, assert(scriptCode != ''), assert(countryCode != ''), From 4c954a9bb8dbdc176870e44328b963ea486c1d3a Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Wed, 25 Jan 2023 10:25:28 -0800 Subject: [PATCH 2/2] ++ --- lib/ui/platform_dispatcher.dart | 4 ++-- lib/web_ui/lib/platform_dispatcher.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ui/platform_dispatcher.dart b/lib/ui/platform_dispatcher.dart index 5a63594690546..d1cdca31c2d9f 100644 --- a/lib/ui/platform_dispatcher.dart +++ b/lib/ui/platform_dispatcher.dart @@ -1972,8 +1972,8 @@ class Locale { String? countryCode, }) : assert(languageCode.isNotEmpty), _languageCode = languageCode, - assert(scriptCode != ''), - assert(countryCode != ''), + assert(scriptCode == null || scriptCode.isNotEmpty), + assert(countryCode == null || countryCode.isNotEmpty), _countryCode = countryCode; /// The primary language subtag for the locale. diff --git a/lib/web_ui/lib/platform_dispatcher.dart b/lib/web_ui/lib/platform_dispatcher.dart index 9ab25fc9bdfa5..68e0c10c93ad0 100644 --- a/lib/web_ui/lib/platform_dispatcher.dart +++ b/lib/web_ui/lib/platform_dispatcher.dart @@ -452,8 +452,8 @@ class Locale { String? countryCode, }) : assert(languageCode.isNotEmpty), _languageCode = languageCode, - assert(scriptCode != ''), - assert(countryCode != ''), + assert(scriptCode == null || scriptCode.isNotEmpty), + assert(countryCode == null || countryCode.isNotEmpty), _countryCode = countryCode; String get languageCode => _deprecatedLanguageSubtagMap[_languageCode] ?? _languageCode;