diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 4981e504..b8f913d3 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -1,6 +1,13 @@ { "@@locale": "de", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Reject this contact request", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 20ef3d49..e8ecdbdf 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,13 @@ { "@@locale": "en", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Reject this contact request", diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index 0e22d582..3e41d232 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -1,6 +1,13 @@ { "@@locale": "es", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Reject this contact request", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index 3ef29e60..5b938195 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1,8 +1,15 @@ { "@@locale": "fr", - "@@last_modified": "2021-07-07T18:42:50+02:00", - "tooltipRemoveThisQuotedMessage": "Remove quoted message.", - "tooltipReplyToThisMessage": "Reply to this message", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Même réglage que pour le mode portrait", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Simple", + "settingUIColumnLandscape": "Colonnes de l'interface utilisateur en mode paysage", + "settingUIColumnPortrait": "Colonnes de l'interface utilisateur en mode portrait", + "localePl": "Polonais", + "tooltipRemoveThisQuotedMessage": "Supprimer le message cité.", + "tooltipReplyToThisMessage": "Répondre à ce message", "tooltipRejectContactRequest": "Refuser cette demande de contact", "tooltipAcceptContactRequest": "Acceptez cette demande de contact.", "notificationNewMessageFromGroup": "Nouveau message dans un groupe !", diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index f076374d..3b792a33 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -1,6 +1,13 @@ { "@@locale": "it", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Rifiuta questa richiesta di contatto", diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index bd4e9125..4467f8af 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -1,6 +1,13 @@ { "@@locale": "pl", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Reject this contact request", diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index e71ae5a6..e2241442 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -1,6 +1,13 @@ { "@@locale": "pt", - "@@last_modified": "2021-07-07T18:42:50+02:00", + "@@last_modified": "2021-07-07T23:42:20+02:00", + "settingUIColumnOptionSame": "Same as portrait mode setting", + "settingUIColumnDouble14Ratio": "Double (1:4)", + "settingUIColumnDouble12Ratio": "Double (1:2)", + "settingUIColumnSingle": "Single", + "settingUIColumnLandscape": "UI Columns in Landscape Mode", + "settingUIColumnPortrait": "UI Columns in Portrait Mode", + "localePl": "Polish", "tooltipRemoveThisQuotedMessage": "Remove quoted message.", "tooltipReplyToThisMessage": "Reply to this message", "tooltipRejectContactRequest": "Reject this contact request", diff --git a/lib/settings.dart b/lib/settings.dart index 843076ba..df42b083 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'opaque.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; const TapirGroupsExperiment = "tapir-groups-experiment"; @@ -200,17 +201,16 @@ class Settings extends ChangeNotifier { return DualpaneMode.Single; } - static String uiColumnModeToString(DualpaneMode m) { - // todo: translate + static String uiColumnModeToString(DualpaneMode m, BuildContext context) { switch (m) { case DualpaneMode.Single: - return "Single"; + return AppLocalizations.of(context)!.settingUIColumnSingle; case DualpaneMode.Dual1to2: - return "Double (1:2)"; + return AppLocalizations.of(context)!.settingUIColumnDouble12Ratio; case DualpaneMode.Dual1to4: - return "Double (1:4)"; + return AppLocalizations.of(context)!.settingUIColumnDouble14Ratio; case DualpaneMode.CopyPortrait: - return "Same as portrait mode setting"; + return AppLocalizations.of(context)!.settingUIColumnOptionSame; } } diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart index 310db952..01f37db2 100644 --- a/lib/views/globalsettingsview.dart +++ b/lib/views/globalsettingsview.dart @@ -1,9 +1,7 @@ import 'dart:convert'; -import 'dart:io'; import 'package:cwtch/cwtch_icons_icons.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:flutter/material.dart'; -import 'package:cwtch/opaque.dart'; import 'package:cwtch/settings.dart'; import 'package:provider/provider.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -80,7 +78,7 @@ class _GlobalSettingsViewState extends State { secondary: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor()), ), ListTile( - title: Text(/*AppLocalizations.of(context)!.settingLanguage*/ "UI Columns in Portrait Mode", style: TextStyle(color: settings.current().mainTextColor())), + title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor())), leading: Icon(Icons.table_chart, color: settings.current().mainTextColor()), trailing: DropdownButton( value: settings.uiColumnModePortrait.toString(), @@ -91,11 +89,11 @@ class _GlobalSettingsViewState extends State { items: Settings.uiColumnModeOptions(false).map>((DualpaneMode value) { return DropdownMenuItem( value: value.toString(), - child: Text(Settings.uiColumnModeToString(value)), + child: Text(Settings.uiColumnModeToString(value, context)), ); }).toList())), ListTile( - title: Text(/*AppLocalizations.of(context)!.settingLanguage*/ "UI Columns in Landscape Mode", style: TextStyle(color: settings.current().mainTextColor())), + title: Text(AppLocalizations.of(context)!.settingUIColumnLandscape, style: TextStyle(color: settings.current().mainTextColor())), leading: Icon(Icons.table_chart, color: settings.current().mainTextColor()), trailing: DropdownButton( value: settings.uiColumnModeLandscape.toString(), @@ -106,7 +104,7 @@ class _GlobalSettingsViewState extends State { items: Settings.uiColumnModeOptions(true).map>((DualpaneMode value) { return DropdownMenuItem( value: value.toString(), - child: Text(Settings.uiColumnModeToString(value)), + child: Text(Settings.uiColumnModeToString(value, context)), ); }).toList())), SwitchListTile( @@ -209,6 +207,9 @@ String getLanguageFull(context, String languageCode) { if (languageCode == "it") { return AppLocalizations.of(context)!.localeIt; } + if (languageCode == "pl") { + return AppLocalizations.of(context)!.localePl; + } return languageCode; }