Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #109 from davidmorgan/update-from-g3
Browse files Browse the repository at this point in the history
Update from google3.
  • Loading branch information
davidmorgan authored Aug 13, 2020
2 parents 98495f5 + 03cae4f commit ff4a4c4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## 0.17.11-dev
* Generate code that passes analysis with `implicit-casts: false`.

## 0.17.10
* Update petitparser dependency.
* Update petitparser dependency.

## 0.17.9
* Fix pub complaint trying to precompile a library file in bin by moving that file to lib/src.
Expand Down
14 changes: 7 additions & 7 deletions lib/generate_localized.dart
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ import '${generatedFilePrefix}messages_all.dart' show evaluateJsonTemplate;
void writeTranslations(
Iterable<TranslatedMessage> usableTranslations, String locale) {
output.write(r"""
var _messages;
get messages => _messages ??=
Map<String, dynamic> _messages;
Map<String, dynamic> get messages => _messages ??=
const JsonDecoder().convert(messageText) as Map<String, dynamic>;
""");

Expand Down Expand Up @@ -371,10 +371,10 @@ String evaluateJsonTemplate(dynamic input, List<dynamic> args) {
return "\${args[input]}";
}
List<dynamic> template = input;
var template = input as List<dynamic>;
var messageName = template.first;
if (messageName == "Intl.plural") {
var howMany = args[template[1]];
var howMany = args[template[1] as int] as num;
return evaluateJsonTemplate(
Intl.pluralLogic(
howMany,
Expand All @@ -387,7 +387,7 @@ String evaluateJsonTemplate(dynamic input, List<dynamic> args) {
args);
}
if (messageName == "Intl.gender") {
var gender = args[template[1]];
var gender = args[template[1] as int] as String;
return evaluateJsonTemplate(
Intl.genderLogic(
gender,
Expand All @@ -397,8 +397,8 @@ String evaluateJsonTemplate(dynamic input, List<dynamic> args) {
args);
}
if (messageName == "Intl.select") {
var select = args[template[1]];
var choices = template[2];
var select = args[template[1] as int];
var choices = template[2] as Map<Object, Object>;
return evaluateJsonTemplate(Intl.selectLogic(select, choices), args);
}
Expand Down

0 comments on commit ff4a4c4

Please sign in to comment.