From a64b2b4665ded26f97a4944adbc303d73539fed0 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Wed, 28 Sep 2022 09:16:21 +0530 Subject: [PATCH 1/2] clean up localization code --- l10n-missing-translation.json | 16 +--------------- lib/app.dart | 20 ++++---------------- lib/l10n/app_hi.arb | 3 --- lib/l10n/l10n.dart | 10 ---------- 4 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 lib/l10n/app_hi.arb delete mode 100644 lib/l10n/l10n.dart diff --git a/l10n-missing-translation.json b/l10n-missing-translation.json index a896fb816..9e26dfeeb 100644 --- a/l10n-missing-translation.json +++ b/l10n-missing-translation.json @@ -1,15 +1 @@ -{ - "hi": [ - "sign_up", - "log_in", - "log_in_code_expired", - "incorrect_code_title", - "incorrect_code_msg", - "oops", - "start_backup", - "auth_session_expired", - "auth_login_again", - "auth_logging_out", - "email_already_claimed" - ] -} +{} \ No newline at end of file diff --git a/lib/app.dart b/lib/app.dart index 27623b087..3d244363c 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -8,10 +8,8 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:logging/logging.dart'; import 'package:photos/ente_theme_data.dart'; -import 'package:photos/l10n/l10n.dart'; import 'package:photos/services/app_lifecycle_service.dart'; import 'package:photos/services/sync_service.dart'; import 'package:photos/ui/home_widget.dart'; @@ -58,13 +56,8 @@ class _EnteAppState extends State with WidgetsBindingObserver { home: EnteApp._homeWidget, debugShowCheckedModeBanner: false, builder: EasyLoading.init(), - supportedLocales: L10n.all, - localizationsDelegates: const [ - AppLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], + supportedLocales: AppLocalizations.supportedLocales, + localizationsDelegates: AppLocalizations.localizationsDelegates, ), ); } else { @@ -76,13 +69,8 @@ class _EnteAppState extends State with WidgetsBindingObserver { home: EnteApp._homeWidget, debugShowCheckedModeBanner: false, builder: EasyLoading.init(), - supportedLocales: L10n.all, - localizationsDelegates: const [ - AppLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - ], + supportedLocales: AppLocalizations.supportedLocales, + localizationsDelegates: AppLocalizations.localizationsDelegates, ); } } diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb deleted file mode 100644 index 729e5a1eb..000000000 --- a/lib/l10n/app_hi.arb +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ok": "ok" -} diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart deleted file mode 100644 index e90289d6c..000000000 --- a/lib/l10n/l10n.dart +++ /dev/null @@ -1,10 +0,0 @@ - - -import 'dart:ui'; - -class L10n { - static final all = [ - const Locale('en'), - const Locale('hi'), - ]; -} From 73bcbc64801b3cab089536c3c284c8ae63e95435 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Wed, 28 Sep 2022 09:38:39 +0530 Subject: [PATCH 2/2] delete missing translation file --- l10n-missing-translation.json | 1 - l10n.yaml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 l10n-missing-translation.json diff --git a/l10n-missing-translation.json b/l10n-missing-translation.json deleted file mode 100644 index 9e26dfeeb..000000000 --- a/l10n-missing-translation.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/l10n.yaml b/l10n.yaml index ef392b763..4e6692e55 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -1,4 +1,3 @@ arb-dir: lib/l10n template-arb-file: app_en.arb -output-localization-file: app_localizations.dart -untranslated-messages-file: l10n-missing-translation.json +output-localization-file: app_localizations.dart \ No newline at end of file