From ea213080b12c112069e20e15cab592cf73a77170 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 12 Feb 2024 20:08:22 -0800 Subject: [PATCH] fix theme loading when no colors stanza and prep last settings for translation and translations --- lib/l10n/intl_cy.arb | 4 +++- lib/l10n/intl_da.arb | 4 +++- lib/l10n/intl_de.arb | 4 +++- lib/l10n/intl_el.arb | 4 +++- lib/l10n/intl_en.arb | 4 +++- lib/l10n/intl_es.arb | 4 +++- lib/l10n/intl_fr.arb | 4 +++- lib/l10n/intl_it.arb | 4 +++- lib/l10n/intl_ja.arb | 4 +++- lib/l10n/intl_ko.arb | 4 +++- lib/l10n/intl_lb.arb | 4 +++- lib/l10n/intl_nl.arb | 4 +++- lib/l10n/intl_no.arb | 4 +++- lib/l10n/intl_pl.arb | 4 +++- lib/l10n/intl_pt.arb | 4 +++- lib/l10n/intl_pt_BR.arb | 4 +++- lib/l10n/intl_ro.arb | 4 +++- lib/l10n/intl_ru.arb | 4 +++- lib/l10n/intl_sk.arb | 4 +++- lib/l10n/intl_sv.arb | 4 +++- lib/l10n/intl_sw.arb | 4 +++- lib/l10n/intl_tr.arb | 4 +++- lib/l10n/intl_uk.arb | 4 +++- lib/l10n/intl_uz.arb | 4 +++- lib/themes/yamltheme.dart | 2 +- lib/views/globalsettingsaboutview.dart | 4 ++-- 26 files changed, 75 insertions(+), 27 deletions(-) diff --git a/lib/l10n/intl_cy.arb b/lib/l10n/intl_cy.arb index 59419ab9..a2d06eb7 100644 --- a/lib/l10n/intl_cy.arb +++ b/lib/l10n/intl_cy.arb @@ -1,6 +1,8 @@ { "@@locale": "cy", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_da.arb b/lib/l10n/intl_da.arb index 4b46f9b5..74a5b85e 100644 --- a/lib/l10n/intl_da.arb +++ b/lib/l10n/intl_da.arb @@ -1,6 +1,8 @@ { "@@locale": "da", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index c4c8757b..a5125bd2 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -1,6 +1,8 @@ { "@@locale": "de", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceTitle": "Leistungs-Overlay anzeigen", + "settingsExperimentsShowPerformanceDescription": "Zeigt ein Overlay-Diagramm der Renderzeit an.", "defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:", "deleteServerConfirmBtn": "Server wirklich löschen", "groupsOnThisServerLabel": "Gruppen, in denen ich bin, werden auf diesem Server gehostet", diff --git a/lib/l10n/intl_el.arb b/lib/l10n/intl_el.arb index 026a3666..087cfae2 100644 --- a/lib/l10n/intl_el.arb +++ b/lib/l10n/intl_el.arb @@ -1,6 +1,8 @@ { "@@locale": "el", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 7f984f5a..fd61eae4 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,8 @@ { "@@locale": "en", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingThemeOverwriteConfirm": "Confirm", "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?", "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory", diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index e2a1db30..30ae187a 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -1,6 +1,8 @@ { "@@locale": "es", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index 2473fd6b..10dbf6d8 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1,6 +1,8 @@ { "@@locale": "fr", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index c2d0c12b..dcc04f50 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -1,6 +1,8 @@ { "@@locale": "it", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_ja.arb b/lib/l10n/intl_ja.arb index 136458ca..8d2f50c8 100644 --- a/lib/l10n/intl_ja.arb +++ b/lib/l10n/intl_ja.arb @@ -1,6 +1,8 @@ { "@@locale": "ja", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_ko.arb b/lib/l10n/intl_ko.arb index eca53833..a3a9ba17 100644 --- a/lib/l10n/intl_ko.arb +++ b/lib/l10n/intl_ko.arb @@ -1,6 +1,8 @@ { "@@locale": "ko", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "sendAnInvitation": "초대를 보냈습니다: ", "sendInvite": "연락처 또는 그룹 초대 보내기", "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation", diff --git a/lib/l10n/intl_lb.arb b/lib/l10n/intl_lb.arb index 1899555c..814caf88 100644 --- a/lib/l10n/intl_lb.arb +++ b/lib/l10n/intl_lb.arb @@ -1,6 +1,8 @@ { "@@locale": "lb", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_nl.arb b/lib/l10n/intl_nl.arb index 6764af51..d239a815 100644 --- a/lib/l10n/intl_nl.arb +++ b/lib/l10n/intl_nl.arb @@ -1,6 +1,8 @@ { "@@locale": "nl", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_no.arb b/lib/l10n/intl_no.arb index 86021d2d..a64b3ac7 100644 --- a/lib/l10n/intl_no.arb +++ b/lib/l10n/intl_no.arb @@ -1,6 +1,8 @@ { "@@locale": "no", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index ab4e1287..c76d8304 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -1,6 +1,8 @@ { "@@locale": "pl", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index 84ac35dd..1b7649b6 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -1,6 +1,8 @@ { "@@locale": "pt", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_pt_BR.arb b/lib/l10n/intl_pt_BR.arb index e4a6d769..80d8e5c3 100644 --- a/lib/l10n/intl_pt_BR.arb +++ b/lib/l10n/intl_pt_BR.arb @@ -1,6 +1,8 @@ { "@@locale": "pt_BR", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_ro.arb b/lib/l10n/intl_ro.arb index 42d816af..e3543989 100644 --- a/lib/l10n/intl_ro.arb +++ b/lib/l10n/intl_ro.arb @@ -1,6 +1,8 @@ { "@@locale": "ro", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index 8a87007b..14b34adf 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -1,6 +1,8 @@ { "@@locale": "ru", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_sk.arb b/lib/l10n/intl_sk.arb index 237df15b..c1294b01 100644 --- a/lib/l10n/intl_sk.arb +++ b/lib/l10n/intl_sk.arb @@ -1,6 +1,8 @@ { "@@locale": "sk", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_sv.arb b/lib/l10n/intl_sv.arb index d3e07503..1a411707 100644 --- a/lib/l10n/intl_sv.arb +++ b/lib/l10n/intl_sv.arb @@ -1,6 +1,8 @@ { "@@locale": "sv", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_sw.arb b/lib/l10n/intl_sw.arb index 88157daa..21ac589e 100644 --- a/lib/l10n/intl_sw.arb +++ b/lib/l10n/intl_sw.arb @@ -1,6 +1,8 @@ { "@@locale": "sw", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_tr.arb b/lib/l10n/intl_tr.arb index 68946ba2..912181eb 100644 --- a/lib/l10n/intl_tr.arb +++ b/lib/l10n/intl_tr.arb @@ -1,6 +1,8 @@ { "@@locale": "tr", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_uk.arb b/lib/l10n/intl_uk.arb index 7d9a16ce..533607f8 100644 --- a/lib/l10n/intl_uk.arb +++ b/lib/l10n/intl_uk.arb @@ -1,6 +1,8 @@ { "@@locale": "uk", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/l10n/intl_uz.arb b/lib/l10n/intl_uz.arb index 68e1d0f2..67c28904 100644 --- a/lib/l10n/intl_uz.arb +++ b/lib/l10n/intl_uz.arb @@ -1,6 +1,8 @@ { "@@locale": "uz", - "@@last_modified": "2024-02-08T10:33:11+01:00", + "@@last_modified": "2024-02-12T08:05:24+01:00", + "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.", + "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay", "settingsImportThemeButton": "Import Theme", "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch", "settingsImportThemeTitle": "Import Theme", diff --git a/lib/themes/yamltheme.dart b/lib/themes/yamltheme.dart index 7e32b529..a7e8f9c1 100644 --- a/lib/themes/yamltheme.dart +++ b/lib/themes/yamltheme.dart @@ -132,7 +132,7 @@ class YmlTheme extends OpaqueThemeType { val = yml["themes"][mode]["theme"][val] ?? val; } if (!(val is int)) { - val = yml["themes"][mode]?["colors"][val] ?? val; + val = yml["themes"][mode]?["colors"]?[val] ?? val; } if (!(val is int)) { val = yml["colors"]?[val]; diff --git a/lib/views/globalsettingsaboutview.dart b/lib/views/globalsettingsaboutview.dart index ccf8919c..08eee3f8 100644 --- a/lib/views/globalsettingsaboutview.dart +++ b/lib/views/globalsettingsaboutview.dart @@ -52,8 +52,8 @@ class _GlobalSettingsAboutViewState extends State { ]), SwitchListTile( // TODO: Translate, Remove, OR Hide Prior to Release - title: Text("Show Performance Overlay"), - subtitle: Text("Display an overlay graph of render time."), + title: Text(AppLocalizations.of(context)!.settingsExperimentsShowPerformanceTitle), + subtitle: Text(AppLocalizations.of(context)!.settingsExperimentsShowPerformanceDescription), value: settings.profileMode, onChanged: (bool value) { setState(() {