Skip to content

Commit 13e1336

Browse files
authored
Generate message lookup in gen_l10n (flutter#50733)
1 parent 9b3754d commit 13e1336

File tree

5 files changed

+688
-770
lines changed

5 files changed

+688
-770
lines changed

dev/tools/localization/bin/gen_l10n.dart

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ Future<void> main(List<String> arguments) async {
6363
exit(0);
6464
}
6565

66-
final String flutterRoot = Platform.environment['FLUTTER_ROOT'];
67-
final String flutterBin = Platform.isWindows ? 'flutter.bat' : 'flutter';
68-
final String flutterPath = flutterRoot == null ? flutterBin : path.join(flutterRoot, 'bin', flutterBin);
66+
await precacheLanguageAndRegionTags();
67+
6968
final String arbPathString = results['arb-dir'] as String;
7069
final String outputFileString = results['output-localization-file'] as String;
7170
final String templateArbFileName = results['template-arb-file'] as String;
@@ -74,6 +73,7 @@ Future<void> main(List<String> arguments) async {
7473

7574
const local.LocalFileSystem fs = local.LocalFileSystem();
7675
final LocalizationsGenerator localizationsGenerator = LocalizationsGenerator(fs);
76+
7777
try {
7878
localizationsGenerator
7979
..initialize(
@@ -83,34 +83,13 @@ Future<void> main(List<String> arguments) async {
8383
classNameString: classNameString,
8484
preferredSupportedLocaleString: preferredSupportedLocaleString,
8585
)
86-
..parseArbFiles()
87-
..generateClassMethods()
88-
..generateOutputFile();
86+
..loadResources()
87+
..writeOutputFile();
8988
} on FileSystemException catch (e) {
9089
exitWithError(e.message);
9190
} on FormatException catch (e) {
9291
exitWithError(e.message);
9392
} on L10nException catch (e) {
9493
exitWithError(e.message);
9594
}
96-
97-
final ProcessResult pubGetResult = await Process.run(flutterPath, <String>['pub', 'get']);
98-
if (pubGetResult.exitCode != 0) {
99-
stderr.write(pubGetResult.stderr);
100-
exit(1);
101-
}
102-
103-
final ProcessResult generateFromArbResult = await Process.run(flutterPath, <String>[
104-
'pub',
105-
'run',
106-
'intl_translation:generate_from_arb',
107-
'--output-dir=${localizationsGenerator.l10nDirectory.path}',
108-
'--no-use-deferred-loading',
109-
localizationsGenerator.outputFile.path,
110-
...localizationsGenerator.arbPathStrings,
111-
]);
112-
if (generateFromArbResult.exitCode != 0) {
113-
stderr.write(generateFromArbResult.stderr);
114-
exit(1);
115-
}
11695
}

0 commit comments

Comments
 (0)