Skip to content

Commit be601c2

Browse files
author
Hans Muller
authored
Correct gen_date_localizations.dart supported locales computation (flutter#20920)
1 parent e235ccd commit be601c2

File tree

3 files changed

+8253
-4898
lines changed

3 files changed

+8253
-4898
lines changed

dev/tools/gen_date_localizations.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Future<Null> main(List<String> rawArgs) async {
8383
// ignore_for_file: public_member_api_docs
8484
'''
8585
);
86-
buffer.writeln('const Map<String, dynamic> dateSymbols = const <String, dynamic> {');
86+
buffer.writeln('const Map<String, dynamic> dateSymbols = <String, dynamic> {');
8787
symbolFiles.forEach((String locale, File data) {
8888
if (materialLocales.contains(locale))
8989
buffer.writeln(_jsonToMapEntry(locale, json.decode(data.readAsStringSync())));
@@ -92,11 +92,11 @@ Future<Null> main(List<String> rawArgs) async {
9292

9393
// Code that uses datePatterns expects it to contain values of type
9494
// Map<String, String> not Map<String, dynamic>.
95-
buffer.writeln('const Map<String, Map<String, String>> datePatterns = const <String, Map<String, String>> {');
95+
buffer.writeln('const Map<String, Map<String, String>> datePatterns = <String, Map<String, String>> {');
9696
patternFiles.forEach((String locale, File data) {
9797
if (materialLocales.contains(locale)) {
9898
final Map<String, dynamic> patterns = json.decode(data.readAsStringSync());
99-
buffer.writeln("'$locale': const <String, String>{");
99+
buffer.writeln("'$locale': <String, String>{");
100100
patterns.forEach((String key, dynamic value) {
101101
assert(value is String);
102102
buffer.writeln(_jsonToMapEntry(key, value));
@@ -134,10 +134,10 @@ String _jsonToMap(dynamic json) {
134134
}
135135

136136
if (json is Iterable)
137-
return 'const <dynamic>[${json.map(_jsonToMap).join(',')}]';
137+
return '<dynamic>[${json.map(_jsonToMap).join(',')}]';
138138

139139
if (json is Map<String, dynamic>) {
140-
final StringBuffer buffer = new StringBuffer('const <String, dynamic>{');
140+
final StringBuffer buffer = new StringBuffer('<String, dynamic>{');
141141
json.forEach((String key, dynamic value) {
142142
buffer.writeln(_jsonToMapEntry(key, value));
143143
});
@@ -149,7 +149,7 @@ String _jsonToMap(dynamic json) {
149149
}
150150

151151
Iterable<String> _materialLocales() sync* {
152-
final RegExp filenameRE = new RegExp(r'.*_(\w+)\.arb$');
152+
final RegExp filenameRE = new RegExp(r'material_(\w+)\.arb$');
153153
final Directory materialLocalizationsDirectory = new Directory(path.join('packages', 'flutter_localizations', 'lib', 'src', 'l10n'));
154154
for (FileSystemEntity entity in materialLocalizationsDirectory.listSync()) {
155155
final String filePath = entity.path;

0 commit comments

Comments
 (0)