From 14978665979bbe0ee65201a44c5347d043f958cf Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:05:31 +0530 Subject: [PATCH 1/2] Restrict locale to en --- lib/app/view/app.dart | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index e57f3138d3..717ebc4421 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -27,6 +27,9 @@ class App extends StatefulWidget { class _AppState extends State { StreamSubscription _signedOutEvent; StreamSubscription _signedInEvent; + static const List supportedLocales = [ + Locale('en'), + ]; @override void initState() { @@ -78,7 +81,16 @@ class _AppState extends State { theme: lightTheme, darkTheme: dartTheme, debugShowCheckedModeBanner: false, - supportedLocales: AppLocalizations.supportedLocales, + supportedLocales: supportedLocales, + localeListResolutionCallback: (locales, supportedLocales) { + for (Locale locale in locales) { + if (supportedLocales.contains(locale)) { + return locale; + } + } + // if device language is not supported by the app, use en as default + return const Locale('en'); + }, localizationsDelegates: AppLocalizations.localizationsDelegates, routes: _getRoutes, ), @@ -90,7 +102,16 @@ class _AppState extends State { theme: lightThemeData, darkTheme: darkThemeData, debugShowCheckedModeBanner: false, - supportedLocales: AppLocalizations.supportedLocales, + supportedLocales: supportedLocales, + localeListResolutionCallback: (locales, supportedLocales) { + for (Locale locale in locales) { + if (supportedLocales.contains(locale)) { + return locale; + } + } + // if device language is not supported by the app, use en as default + return const Locale('en'); + }, localizationsDelegates: const [ AppLocalizations.delegate, GlobalMaterialLocalizations.delegate, From 2017506b2891fadc0c186aa64fd5b42da9161d61 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:06:01 +0530 Subject: [PATCH 2/2] bump version to 1.0.25+25 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 82a6184a6c..12754986ef 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: ente_auth description: ente two-factor authenticator -version: 1.0.24+24 +version: 1.0.25+25 publish_to: none environment: