diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index 15a68b4a0b..7bc1e8742c 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -519,7 +519,7 @@ Future verifyInternationalizations() async { final EvalResult materialGenResult = await _evalCommand( dart, [ - path.join('dev', 'tools', 'localization', 'gen_localizations.dart'), + path.join('dev', 'tools', 'localization', 'bin', 'gen_localizations.dart'), '--material', ], workingDirectory: flutterRoot, @@ -527,7 +527,7 @@ Future verifyInternationalizations() async { final EvalResult cupertinoGenResult = await _evalCommand( dart, [ - path.join('dev', 'tools', 'localization', 'gen_localizations.dart'), + path.join('dev', 'tools', 'localization', 'bin', 'gen_localizations.dart'), '--cupertino', ], workingDirectory: flutterRoot, diff --git a/dev/tools/localization/encode_kn_arb_files.dart b/dev/tools/localization/bin/encode_kn_arb_files.dart similarity index 97% rename from dev/tools/localization/encode_kn_arb_files.dart rename to dev/tools/localization/bin/encode_kn_arb_files.dart index ab648f0b56..805b9b3cd8 100644 --- a/dev/tools/localization/encode_kn_arb_files.dart +++ b/dev/tools/localization/bin/encode_kn_arb_files.dart @@ -18,7 +18,7 @@ // Run this program from the root of the git repository. // // ``` -// dart dev/tools/localization/encode_kn_arb_files.dart +// dart dev/tools/localization/bin/encode_kn_arb_files.dart // ``` import 'dart:async'; @@ -27,7 +27,7 @@ import 'dart:io'; import 'package:path/path.dart' as path; -import 'localizations_utils.dart'; +import '../localizations_utils.dart'; Map loadBundle(File file) { if (!FileSystemEntity.isFileSync(file.path)) diff --git a/dev/tools/localization/gen_date_localizations.dart b/dev/tools/localization/bin/gen_date_localizations.dart similarity index 96% rename from dev/tools/localization/gen_date_localizations.dart rename to dev/tools/localization/bin/gen_date_localizations.dart index 2a52fe79f8..b9c5f725f0 100644 --- a/dev/tools/localization/gen_date_localizations.dart +++ b/dev/tools/localization/bin/gen_date_localizations.dart @@ -16,14 +16,14 @@ /// The following outputs the generated Dart code to the console as a dry run: /// /// ``` -/// dart dev/tools/localization/gen_date_localizations.dart +/// dart dev/tools/localization/bin/gen_date_localizations.dart /// ``` /// /// If the data looks good, use the `--overwrite` option to overwrite the /// lib/src/l10n/date_localizations.dart file: /// /// ``` -/// dart dev/tools/localization/gen_date_localizations.dart --overwrite +/// dart dev/tools/localization/bin/gen_date_localizations.dart --overwrite /// ``` import 'dart:async'; @@ -32,7 +32,7 @@ import 'dart:io'; import 'package:path/path.dart' as path; -import 'localizations_utils.dart'; +import '../localizations_utils.dart'; const String _kCommandName = 'gen_date_localizations.dart'; @@ -84,7 +84,7 @@ Future main(List rawArgs) async { // This file has been automatically generated. Please do not edit it manually. // To regenerate run (omit --overwrite to print to console instead of the file): -// dart --enable-asserts dev/tools/localization/gen_date_localizations.dart --overwrite +// dart --enable-asserts dev/tools/localization/bin/gen_date_localizations.dart --overwrite ''' ); diff --git a/dev/tools/localization/gen_localizations.dart b/dev/tools/localization/bin/gen_localizations.dart similarity index 98% rename from dev/tools/localization/gen_localizations.dart rename to dev/tools/localization/bin/gen_localizations.dart index b10043f69d..5b84a4a63c 100644 --- a/dev/tools/localization/gen_localizations.dart +++ b/dev/tools/localization/bin/gen_localizations.dart @@ -29,7 +29,7 @@ // The following outputs the generated Dart code to the console as a dry run: // // ``` -// dart dev/tools/localization/gen_localizations.dart +// dart dev/tools/localization/bin/gen_localizations.dart // ``` // // If the data looks good, use the `-w` or `--overwrite` option to overwrite the @@ -37,7 +37,7 @@ // and packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart file: // // ``` -// dart dev/tools/localization/gen_localizations.dart --overwrite +// dart dev/tools/localization/bin/gen_localizations.dart --overwrite // ``` import 'dart:async'; @@ -46,10 +46,10 @@ import 'dart:io'; import 'package:path/path.dart' as path; import 'package:meta/meta.dart'; -import 'gen_cupertino_localizations.dart'; -import 'gen_material_localizations.dart'; -import 'localizations_utils.dart'; -import 'localizations_validator.dart'; +import '../gen_cupertino_localizations.dart'; +import '../gen_material_localizations.dart'; +import '../localizations_utils.dart'; +import '../localizations_validator.dart'; /// This is the core of this script; it generates the code used for translations. String generateArbBasedLocalizationSubclasses({ @@ -78,7 +78,7 @@ String generateArbBasedLocalizationSubclasses({ assert(supportedLanguagesDocMacro.isNotEmpty); final StringBuffer output = StringBuffer(); - output.writeln(generateHeader('dart dev/tools/localization/gen_localizations.dart --overwrite')); + output.writeln(generateHeader('dart dev/tools/localization/bin/gen_localizations.dart --overwrite')); final StringBuffer supportedLocales = StringBuffer(); diff --git a/packages/flutter/lib/src/material/material_localizations.dart b/packages/flutter/lib/src/material/material_localizations.dart index f052226189..424a01cb2e 100644 --- a/packages/flutter/lib/src/material/material_localizations.dart +++ b/packages/flutter/lib/src/material/material_localizations.dart @@ -31,8 +31,9 @@ import 'typography.dart'; // you must add it to every other language (all the other *.arb files in that // same directory), listing the translation as `TBD`. After that you have to // re-generate lib/src/l10n/localizations.dart by running -// `dart dev/tools/localization/gen_localizations.dart --overwrite`. There is -// a README file with further information in the lib/src/l10n/ directory. +// `dart dev/tools/localization/bin/gen_localizations.dart --overwrite`. +// There is a README file with further information in the lib/src/l10n/ +// directory. // // 5. If you are a Google employee, you should then also follow the instructions // at go/flutter-l10n. If you're not, don't worry about it. diff --git a/packages/flutter_localizations/lib/src/l10n/README.md b/packages/flutter_localizations/lib/src/l10n/README.md index d14811a648..c68042c42d 100644 --- a/packages/flutter_localizations/lib/src/l10n/README.md +++ b/packages/flutter_localizations/lib/src/l10n/README.md @@ -165,7 +165,7 @@ app called `gen_localizations`. You can see what that script would generate by running this command: ```dart -dart dev/tools/localizations/gen_localizations.dart packages/flutter_localizations/lib/src/l10n material +dart dev/tools/localizations/bin/gen_localizations.dart packages/flutter_localizations/lib/src/l10n material ``` The gen_localizations app just combines the contents of all of the @@ -182,7 +182,7 @@ To in-place update the generated localizations file using the default values, you can just run: ```dart -dart dev/tools/localizations/gen_localizations.dart --overwrite +dart dev/tools/localizations/bin/gen_localizations.dart --overwrite ``` @@ -195,8 +195,9 @@ more information here: https://github.com/flutter/flutter/issues/36704. Rather than risking developers' editor sessions, the strings in these arb files (and the code generated for them) have been encoded using the appropriate escapes for JSON and Dart. The JSON format arb files were rewritten with -dev/tools/localization/encode_kn_arb_files.dart. The localizations code -generator uses generateEncodedString() from dev/tools/localization/localizations_utils. +dev/tools/localization/bin/encode_kn_arb_files.dart. The localizations code +generator uses generateEncodedString() +from dev/tools/localization/localizations_utils.dart. ### Translations Status, Reporting Errors diff --git a/packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart b/packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart index a3fe758c05..a0377e18e0 100644 --- a/packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart +++ b/packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart @@ -4,7 +4,7 @@ // This file has been automatically generated. Please do not edit it manually. // To regenerate the file, use: -// dart dev/tools/localization/gen_localizations.dart --overwrite +// dart dev/tools/localization/bin/gen_localizations.dart --overwrite import 'dart:collection'; diff --git a/packages/flutter_localizations/lib/src/l10n/generated_date_localizations.dart b/packages/flutter_localizations/lib/src/l10n/generated_date_localizations.dart index d0f9641ac6..8e3761ddc0 100644 --- a/packages/flutter_localizations/lib/src/l10n/generated_date_localizations.dart +++ b/packages/flutter_localizations/lib/src/l10n/generated_date_localizations.dart @@ -4,7 +4,7 @@ // This file has been automatically generated. Please do not edit it manually. // To regenerate run (omit --overwrite to print to console instead of the file): -// dart --enable-asserts dev/tools/localization/gen_date_localizations.dart --overwrite +// dart --enable-asserts dev/tools/localization/bin/gen_date_localizations.dart --overwrite /// The subset of date symbols supported by the intl package which are also /// supported by flutter_localizations. diff --git a/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart b/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart index 9a61a7dff0..89c295e9a1 100644 --- a/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart +++ b/packages/flutter_localizations/lib/src/l10n/generated_material_localizations.dart @@ -4,7 +4,7 @@ // This file has been automatically generated. Please do not edit it manually. // To regenerate the file, use: -// dart dev/tools/localization/gen_localizations.dart --overwrite +// dart dev/tools/localization/bin/gen_localizations.dart --overwrite import 'dart:collection';