From 1202ed2b3abafb4ea5cbb6a1393aea655f2af9b4 Mon Sep 17 00:00:00 2001 From: Lukas Pistrol Date: Thu, 18 Jan 2024 14:19:11 +0100 Subject: [PATCH] minor code fixes, re-add '...' in certain places --- TimeMachineStatus/Localizable.xcstrings | 96 +++++++++++++++---------- TimeMachineStatus/Views/MenuView.swift | 22 +++--- 2 files changed, 74 insertions(+), 44 deletions(-) diff --git a/TimeMachineStatus/Localizable.xcstrings b/TimeMachineStatus/Localizable.xcstrings index e48a1de..cf9b2de 100644 --- a/TimeMachineStatus/Localizable.xcstrings +++ b/TimeMachineStatus/Localizable.xcstrings @@ -114,19 +114,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Neues Feedback senden" + "value" : "Neues Feedback senden..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Submit New Feedback" + "value" : "Submit New Feedback..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Invia un nuovo feedback" + "value" : "Invia un nuovo feedback..." } } } @@ -136,19 +136,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Buy Me a Coffee" + "value" : "Buy Me a Coffee..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Buy Me a Coffee" + "value" : "Buy Me a Coffee..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Offrimi un caffè" + "value" : "Offrimi un caffè..." } } } @@ -158,19 +158,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Feedback senden" + "value" : "Feedback senden..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Send Feedback" + "value" : "Send Feedback..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Invia un feedback" + "value" : "Invia un feedback..." } } } @@ -180,19 +180,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "GitHub Sponsors" + "value" : "GitHub Sponsors..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "GitHub Sponsors" + "value" : "GitHub Sponsors..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Gli sponsor di GitHub" + "value" : "Gli sponsor di GitHub..." } } } @@ -294,19 +294,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Unterstütze den Entwickler" + "value" : "Unterstütze den Entwickler..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Support the Developer" + "value" : "Support the Developer..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Supporta lo sviluppatore" + "value" : "Supporta lo sviluppatore..." } } } @@ -316,19 +316,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Offene Tickets durchsuchen" + "value" : "Offene Tickets durchsuchen..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Browse Open Tickets" + "value" : "Browse Open Tickets..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Sfoglia i ticket aperti" + "value" : "Sfoglia i ticket aperti..." } } } @@ -838,36 +838,48 @@ } } }, - "general_info_autobackup_enabled" : { + "general_info_autobackup_disabled" : { "extractionState" : "manual", "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Deaktiviert" + } + }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Enabled" + "value" : "Disabled" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Abilitati" + "value" : "Disabilitati" } } } }, - "general_info_autobackup_disabled" : { + "general_info_autobackup_enabled" : { "extractionState" : "manual", "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aktiviert" + } + }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Disabled" + "value" : "Enabled" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Disabilitati" + "value" : "Abilitati" } } } @@ -918,36 +930,48 @@ } } }, - "general_info_requirespower_true" : { + "general_info_requirespower_false" : { "extractionState" : "manual", "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nein" + } + }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Yes" + "value" : "No" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Si" + "value" : "No" } } } }, - "general_info_requirespower_false" : { + "general_info_requirespower_true" : { "extractionState" : "manual", "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ja" + } + }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "No" + "value" : "Yes" } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "No" + "value" : "Si" } } } @@ -1049,19 +1073,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Backup auf \"%@\" läuft" + "value" : "Backup auf \"%@\" läuft..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Backing up to \"%@\"" + "value" : "Backing up to \"%@\"..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Backup su \"%@\"" + "value" : "Backup su \"%@\"..." } } } @@ -1185,19 +1209,19 @@ "de" : { "stringUnit" : { "state" : "translated", - "value" : "Nach Updates suchen" + "value" : "Nach Updates suchen..." } }, "en" : { "stringUnit" : { "state" : "translated", - "value" : "Check for updates" + "value" : "Check for updates..." } }, "it" : { "stringUnit" : { "state" : "translated", - "value" : "Controlla gli aggiornamenti" + "value" : "Controlla gli aggiornamenti..." } } } diff --git a/TimeMachineStatus/Views/MenuView.swift b/TimeMachineStatus/Views/MenuView.swift index aa5284e..89e1a84 100644 --- a/TimeMachineStatus/Views/MenuView.swift +++ b/TimeMachineStatus/Views/MenuView.swift @@ -69,10 +69,13 @@ struct MenuView: View { .card(.background.secondary) } if let autoBackup = preferences.autoBackup { - LabeledContent("general_info_autobackup", content: { - let value = autoBackup ? "enabled" : "disabled" - Text("general_info_autobackup_\(value)") - }) + LabeledContent("general_info_autobackup") { + if autoBackup { + Text("general_info_autobackup_enabled") + } else { + Text("general_info_autobackup_disabled") + } + } .padding(10) .card(.background.secondary) if let interval = preferences.autoBackupInterval, autoBackup { @@ -89,10 +92,13 @@ struct MenuView: View { } } if let requiresACPower = preferences.requiresACPower { - LabeledContent("general_info_requirespower", content: { - let value = requiresACPower ? "yes" : "false" - Text("general_info_requirespower_\(value)") - }) + LabeledContent("general_info_requirespower") { + if requiresACPower { + Text("general_info_requirespower_true") + } else { + Text("general_info_requirespower_false") + } + } .padding(10) .card(.background.secondary) }