From 8f188582a9cb02988a1a25103aee6d15517d12ad Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 09:56:08 +0200 Subject: [PATCH 01/10] Update locale_extension.dart Add german --- .../language_and_region/extensions/locale_extension.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart b/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart index 6bbd98c671..56740c7cd9 100644 --- a/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart +++ b/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart @@ -18,6 +18,8 @@ extension LocaleExtension on Locale { return AppLocalizations.of(context).languageArabic; case 'it': return AppLocalizations.of(context).languageItalian; + case 'de': + return AppLocalizations.of(context).languageGerman; default: return ''; } @@ -29,6 +31,8 @@ extension LocaleExtension on Locale { return 'Français'; case 'en': return 'English'; + case 'de': + return 'German'; case 'vi': return 'Tiếng Việt'; case 'ru': @@ -41,4 +45,4 @@ extension LocaleExtension on Locale { return ''; } } -} \ No newline at end of file +} From 6eb99a655dfd8aec3ce018f9a87f2a7c87f45a7e Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:02:05 +0200 Subject: [PATCH 02/10] Update intl_messages.arb add German --- lib/l10n/intl_messages.arb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb index cc68d12fd7..ffebc2c757 100644 --- a/lib/l10n/intl_messages.arb +++ b/lib/l10n/intl_messages.arb @@ -1590,6 +1590,12 @@ "placeholders_order": [], "placeholders": {} }, + "languageGerman": "German", + "@languageGerman": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, "messageDialogSendEmailUploadingAttachment": "Your message could not be sent because it uploading attachment", "@messageDialogSendEmailUploadingAttachment": { "type": "text", @@ -4024,4 +4030,4 @@ "placeholders_order": [], "placeholders": {} } -} \ No newline at end of file +} From 78e00d3889f15d41519af585967b19999e95cf6b Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:09:44 +0200 Subject: [PATCH 03/10] Update app_localizations.dart add German --- lib/main/localizations/app_localizations.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart index b818e230e9..0aa0b1e80d 100644 --- a/lib/main/localizations/app_localizations.dart +++ b/lib/main/localizations/app_localizations.dart @@ -1592,6 +1592,12 @@ class AppLocalizations { name: 'languageEnglish'); } + String get languageGerman { + return Intl.message( + 'German', + name: 'languageGerman'); + } + String get languageVietnamese { return Intl.message( 'Vietnamese', @@ -4219,4 +4225,4 @@ class AppLocalizations { 'Find emails', name: 'findEmails'); } -} \ No newline at end of file +} From e57f61f65f43471994a39bca0be821b2e8e5f313 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:10:39 +0200 Subject: [PATCH 04/10] Update language_code_constants.dart add german --- lib/main/localizations/language_code_constants.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/main/localizations/language_code_constants.dart b/lib/main/localizations/language_code_constants.dart index 7b84b16be2..45016940c8 100644 --- a/lib/main/localizations/language_code_constants.dart +++ b/lib/main/localizations/language_code_constants.dart @@ -2,6 +2,7 @@ class LanguageCodeConstants { static const String english = 'en'; static const String french = 'fr'; + static const String french = 'de'; static const String vietnamese = 'vi'; static const String italian = 'it'; static const String russian = 'ru'; From 09df518cc6574ee92858d3fee7f996a83bd10b10 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:12:08 +0200 Subject: [PATCH 05/10] Update localization_service.dart add german --- lib/main/localizations/localization_service.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/main/localizations/localization_service.dart b/lib/main/localizations/localization_service.dart index f58a3773ba..5b4bac3b73 100644 --- a/lib/main/localizations/localization_service.dart +++ b/lib/main/localizations/localization_service.dart @@ -18,7 +18,8 @@ class LocalizationService extends Translations { LanguageCodeConstants.vietnamese, LanguageCodeConstants.russian, LanguageCodeConstants.arabic, - LanguageCodeConstants.italian + LanguageCodeConstants.italian, + LanguageCodeConstants.german ]; static const List supportedLocales = [ @@ -27,7 +28,8 @@ class LocalizationService extends Translations { Locale(LanguageCodeConstants.vietnamese, 'VN'), Locale(LanguageCodeConstants.russian, 'RU'), Locale(LanguageCodeConstants.arabic, 'TN'), - Locale(LanguageCodeConstants.italian, 'IT') + Locale(LanguageCodeConstants.italian, 'IT'), + Locale(LanguageCodeConstants.german, 'DE') ]; static void changeLocale(String langCode) { @@ -65,4 +67,4 @@ class LocalizationService extends Translations { @override Map> get keys => {}; -} \ No newline at end of file +} From 19a47b4916955c32dfa63e6ffc6eb622ce4eceb2 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:13:41 +0200 Subject: [PATCH 06/10] Update app_utils.dart add german --- lib/main/utils/app_utils.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/main/utils/app_utils.dart b/lib/main/utils/app_utils.dart index 1f527f8601..fe7cbc71e4 100644 --- a/lib/main/utils/app_utils.dart +++ b/lib/main/utils/app_utils.dart @@ -72,6 +72,8 @@ class AppUtils { return const date_format.ArabicDateLocale(); } else if (currentLanguageCode == LanguageCodeConstants.italian) { return const date_format.ItalianDateLocale(); + } else if (currentLanguageCode == LanguageCodeConstants.german) { + return const date_format.GermanDateLocale(); } else { return const date_format.EnglishDateLocale(); } @@ -82,4 +84,4 @@ class AppUtils { final timeZoneOffsetAsString = timeZoneOffset >= 0 ? '+$timeZoneOffset' : '$timeZoneOffset'; return 'GMT$timeZoneOffsetAsString'; } -} \ No newline at end of file +} From b9345b51d9939d964a0e50f1f17900af8ef58a77 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 10:28:02 +0200 Subject: [PATCH 07/10] Update language_code_constants.dart --- lib/main/localizations/language_code_constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main/localizations/language_code_constants.dart b/lib/main/localizations/language_code_constants.dart index 45016940c8..f4e985205c 100644 --- a/lib/main/localizations/language_code_constants.dart +++ b/lib/main/localizations/language_code_constants.dart @@ -2,7 +2,7 @@ class LanguageCodeConstants { static const String english = 'en'; static const String french = 'fr'; - static const String french = 'de'; + static const String german = 'de'; static const String vietnamese = 'vi'; static const String italian = 'it'; static const String russian = 'ru'; From 23231913517fc4ffa29998ea2c4f787ff611bac3 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Sun, 20 Oct 2024 19:04:12 +0200 Subject: [PATCH 08/10] Update intl_en.arb add German --- lib/l10n/intl_en.arb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 9b9fd9e7a2..66f04d92b0 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1565,6 +1565,12 @@ "placeholders_order": [], "placeholders": {} }, + "languageItalian": "German", + "@languageGerman": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, "messageDialogSendEmailUploadingAttachment": "Your message could not be sent because it uploading attachment", "@messageDialogSendEmailUploadingAttachment": { "type": "text", @@ -3251,4 +3257,4 @@ "placeholders_order": [], "placeholders": {} } -} \ No newline at end of file +} From 685f7011a698298c7baa02b5897fb6327f1721b8 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Mon, 21 Oct 2024 12:05:26 +0200 Subject: [PATCH 09/10] Update locale_extension.dart german to Deutsch --- .../language_and_region/extensions/locale_extension.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart b/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart index 56740c7cd9..d5254461ca 100644 --- a/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart +++ b/lib/features/manage_account/presentation/language_and_region/extensions/locale_extension.dart @@ -32,7 +32,7 @@ extension LocaleExtension on Locale { case 'en': return 'English'; case 'de': - return 'German'; + return 'Deutsch'; case 'vi': return 'Tiếng Việt'; case 'ru': From b03459bc1f0775c506e452f26600d84e1c4a8058 Mon Sep 17 00:00:00 2001 From: chrismaster Date: Mon, 21 Oct 2024 12:07:56 +0200 Subject: [PATCH 10/10] Update intl_en.arb fix to languageGerman --- lib/l10n/intl_en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 66f04d92b0..118c9e8548 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1565,7 +1565,7 @@ "placeholders_order": [], "placeholders": {} }, - "languageItalian": "German", + "languageGerman": "German", "@languageGerman": { "type": "text", "placeholders_order": [],