firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gen_l10n] correct variable name when the placeholder requiresFormatting (#86842)

Browse Source
This commit is contained in:
Ahmed Ashour
2021-07-22 22:55:18 +02:00
committed by GitHub
parent def18c7103
commit bf132daef3
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/flutter_tools/lib/src/localizations/gen_l10n.dart
View File

@@ -202,21 +202,16 @@ String _generatePluralMethod(Message message, String translationForMessage) {
if (match != null && match.groupCount == 2) {
String argValue = generateString(match.group(2)!);
for (final Placeholder placeholder in message.placeholders) {
if (placeholder != countPlaceholder && placeholder.requiresFormatting) {
argValue = argValue.replaceAll(
'#${placeholder.name}#',
_needsCurlyBracketStringInterpolation(argValue, placeholder.name)
? '\${${placeholder.name}String}'
: '\$${placeholder.name}String'
);
} else {
argValue = argValue.replaceAll(
'#${placeholder.name}#',
_needsCurlyBracketStringInterpolation(argValue, placeholder.name)
? '\${${placeholder.name}}'
: '\$${placeholder.name}'
);
String variable = placeholder.name;
if (placeholder.requiresFormatting) {
variable += 'String';
}
argValue = argValue.replaceAll(
'#${placeholder.name}#',
_needsCurlyBracketStringInterpolation(argValue, placeholder.name)
? '\${$variable}'
: '\$$variable'
);
}
pluralLogicArgs.add(' ${pluralIds[pluralKey]}: $argValue');
}
@@ -368,21 +363,16 @@ String _generateMethod(Message message, String translationForMessage) {
String generateMessage() {
String messageValue = generateString(translationForMessage);
for (final Placeholder placeholder in message.placeholders) {
String variable = placeholder.name;
if (placeholder.requiresFormatting) {
messageValue = messageValue.replaceAll(
'{${placeholder.name}}',
_needsCurlyBracketStringInterpolation(messageValue, placeholder.name)
? '\${${placeholder.name}String}'
: '\$${placeholder.name}String'
);
} else {
messageValue = messageValue.replaceAll(
'{${placeholder.name}}',
_needsCurlyBracketStringInterpolation(messageValue, placeholder.name)
? '\${${placeholder.name}}'
: '\$${placeholder.name}'
);
variable += 'String';
}
messageValue = messageValue.replaceAll(
'{${placeholder.name}}',
_needsCurlyBracketStringInterpolation(messageValue, placeholder.name)
? '\${$variable}'
: '\$$variable'
);
}
return messageValue;

14
packages/flutter_tools/test/general.shard/generate_localizations_test.dart
View File

@@ -2166,6 +2166,16 @@ import 'output-localization-file_en.dart' deferred as output-localization-file_e
"placeholders": {
"count": {}
}
},
"third": "{total,plural, =0{test {total}} other{ {total}}",
"@third": {
"description": "Third set of plural messages to test, for number.",
"placeholders": {
"total": {
"type": "int",
"format": "compactLong"
}
}
}
}
''';
@@ -2206,6 +2216,9 @@ import 'output-localization-file_en.dart' deferred as output-localization-file_e
expect(localizationsFile, contains(r'${count}m'));
expect(localizationsFile, contains(r'test $count'));
expect(localizationsFile, contains(r' $count'));
expect(localizationsFile, contains(r'String totalString = totalNumberFormat'));
expect(localizationsFile, contains(r'test $totalString'));
expect(localizationsFile, contains(r' $totalString'));
});
testWithoutContext(
@@ -2493,7 +2506,6 @@ String orderNumber(int number) {
final String localizationsFile = fs.file(
fs.path.join(syntheticL10nPackagePath, 'output-localization-file.dart'),
).readAsStringSync();
print(localizationsFile);
expect(localizationsFile, containsIgnoringWhitespace(r'''
AppLocalizations lookupAppLocalizations(Locale locale) {
'''));