Skip to content

Moved to NNBD #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OlehMarch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moved to NNBD #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee64eef
added NNBD support
OlehMarch Nov 22, 2021
9b14f2b
fixed AppLocalizations getter from context
OlehMarch Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Localized strings can be accessed through `AppLocalizations.of(context)`

Requirements:

- Add `sprintf: ^4.0.2` to the `dependencies` section of `pubspec.yaml`
- Add `sprintf: ^6.0.0` to the `dependencies` section of `pubspec.yaml`
- Add `AppLocalizationsDelegate()` to `localizationsDelegates` of the app widget constructor
- Specify supported localizations in `supportedLocales` of the app widget constructor
- (Recommended) Add `DefaultIntlLocaleDelegate()` to `localizationsDelegates` of the app widget constructor. This will make `intl`-dependent formatters use currently selected locale.
Expand Down
16 changes: 8 additions & 8 deletions platforms/flutter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (flutter) Header(args *goloc.HeaderArgs) string {
part of 'localizations.dart';

class AppLocalizations%s implements AppLocalizations {
final AppLocalizations fallback;
final AppLocalizations? fallback;

AppLocalizations%s(this.fallback);

Expand All @@ -48,18 +48,18 @@ class AppLocalizations%s implements AppLocalizations {
func (flutter) LocalizedString(args *goloc.LocalizedStringArgs) string {
if len(args.FormatArgs) > 0 {
fArgs := buildFormatArgsList(args.FormatArgs, nil)
return fmt.Sprintf(" String %s(%s) => sprintf(\"%s\", [%s]);\n", args.Key, fArgs, args.Value, fArgs)
return fmt.Sprintf(" String? %s(%s) => sprintf(\"%s\", [%s]);\n", args.Key, fArgs, args.Value, fArgs)
} else {
return fmt.Sprintf(" String get %s => \"%s\";\n", args.Key, args.Value)
return fmt.Sprintf(" String? get %s => \"%s\";\n", args.Key, args.Value)
}
}

func (flutter) FallbackString(args *goloc.LocalizedStringArgs) string {
if len(args.FormatArgs) > 0 {
fArgs := buildFormatArgsList(args.FormatArgs, nil)
return fmt.Sprintf(" String %s(%s) => fallback?.%s(%s);\n", args.Key, fArgs, args.Key, fArgs)
return fmt.Sprintf(" String? %s(%s) => fallback?.%s(%s);\n", args.Key, fArgs, args.Key, fArgs)
} else {
return fmt.Sprintf(" String get %s => fallback?.%s;\n", args.Key, args.Key)
return fmt.Sprintf(" String? get %s => fallback?.%s;\n", args.Key, args.Key)
}
}

Expand Down Expand Up @@ -101,7 +101,7 @@ import 'package:sprintf/sprintf.dart';
%s
abstract class AppLocalizations {
static AppLocalizations of(BuildContext context) {
return Localizations.of<AppLocalizations>(context, AppLocalizations);
return Localizations.of<AppLocalizations>(context, AppLocalizations)!;
}

%s}
Expand Down Expand Up @@ -138,11 +138,11 @@ class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
for _, key := range args.Localizations.SortedKeys() {
fArgs := args.FormatArgs[key]
if len(fArgs) <= 0 {
str := fmt.Sprintf(" String get %s;\n", key)
str := fmt.Sprintf(" String? get %s;\n", key)
locBuilder.WriteString(str)
} else {
typedArgsStr := buildFormatArgsList(fArgs, args.Formats)
str := fmt.Sprintf(" String %s(%s);\n", key, typedArgsStr)
str := fmt.Sprintf(" String? %s(%s);\n", key, typedArgsStr)
locBuilder.WriteString(str)
}
}
Expand Down