From 091b9383d0a32dc9b6debbb78ce19c1bfd8f8807 Mon Sep 17 00:00:00 2001 From: Erik Gomez Date: Tue, 13 Aug 2024 20:59:14 -0500 Subject: [PATCH 1/5] dont use delay on debug schema --- .../xcshareddata/xcschemes/Nudge - Debug.xcscheme | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Nudge.xcodeproj/xcshareddata/xcschemes/Nudge - Debug.xcscheme b/Nudge.xcodeproj/xcshareddata/xcschemes/Nudge - Debug.xcscheme index 8c6023db..3ae05a98 100644 --- a/Nudge.xcodeproj/xcshareddata/xcschemes/Nudge - Debug.xcscheme +++ b/Nudge.xcodeproj/xcshareddata/xcschemes/Nudge - Debug.xcscheme @@ -76,6 +76,12 @@ ReferencedContainer = "container:Nudge.xcodeproj"> + + + + Date: Fri, 16 Aug 2024 07:53:33 -0500 Subject: [PATCH 2/5] allow line limit of 2 for left side text --- Nudge/UI/StandardMode/LeftSide.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift index 3c429933..2f04e59f 100644 --- a/Nudge/UI/StandardMode/LeftSide.swift +++ b/Nudge/UI/StandardMode/LeftSide.swift @@ -82,20 +82,22 @@ struct InfoRow: View { HStack { Text(label.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale))) .fontWeight(boldText ? .bold : .regular) + .lineLimit(2) Spacer() if isHighlighted { - Text(value) + Text(value.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale))) .foregroundColor(appState.differentiateWithoutColor ? .accessibleRed : .red) .fontWeight(.bold) .minimumScaleFactor(0.01) + .lineLimit(1) } else { - Text(value) + Text(value.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale))) .foregroundColor(colorScheme == .light ? .accessibleSecondaryLight : .accessibleSecondaryDark) .fontWeight(boldText ? .bold : .regular) .minimumScaleFactor(0.01) + .lineLimit(1) } } - .lineLimit(1) } } From d1e78cc348c2f9a9f906e818d264826105ea1c28 Mon Sep 17 00:00:00 2001 From: Erik Gomez Date: Fri, 16 Aug 2024 07:53:52 -0500 Subject: [PATCH 3/5] make true and false localized --- Localizable.xcstrings | 216 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 614c363b..f8701370 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -2045,6 +2045,114 @@ } } }, + "False" : { + "comment" : "Actively Exploited CVEs", + "extractionState" : "manual", + "localizations" : { + "da" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falsk" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falsch" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "False" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falso" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Faux" + } + }, + "hi" : { + "stringUnit" : { + "state" : "translated", + "value" : "असत्य" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falso" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "偽" + } + }, + "ko" : { + "stringUnit" : { + "state" : "translated", + "value" : "거짓" + } + }, + "nb" : { + "stringUnit" : { + "state" : "translated", + "value" : "Usann" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Onwaar" + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fałsz" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falso" + } + }, + "ru" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ложь" + } + }, + "sv" : { + "stringUnit" : { + "state" : "translated", + "value" : "Falskt" + } + }, + "uk" : { + "stringUnit" : { + "state" : "translated", + "value" : "Брехня" + } + }, + "zh" : { + "stringUnit" : { + "state" : "translated", + "value" : "假" + } + } + } + }, "Hours Remaining To Update:" : { "comment" : "Hours Remaining To Update:", "extractionState" : "manual", @@ -3449,6 +3557,114 @@ } } }, + "True" : { + "comment" : "Actively Exploited CVEs", + "extractionState" : "manual", + "localizations" : { + "da" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sand" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Wahr" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "True" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Verdadero" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vrai" + } + }, + "hi" : { + "stringUnit" : { + "state" : "translated", + "value" : "सत्य" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vero" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "真実" + } + }, + "ko" : { + "stringUnit" : { + "state" : "translated", + "value" : "참" + } + }, + "nb" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sann" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Waar" + } + }, + "pl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Prawda" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Verdade" + } + }, + "ru" : { + "stringUnit" : { + "state" : "translated", + "value" : "Правда" + } + }, + "sv" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sant" + } + }, + "uk" : { + "stringUnit" : { + "state" : "translated", + "value" : "Правда" + } + }, + "zh" : { + "stringUnit" : { + "state" : "translated", + "value" : "真" + } + } + } + }, "Update Device" : { "comment" : "actionButtonText", "extractionState" : "manual", From 647f81a4b5851039bb7ea42e19b34ed36a41f3cb Mon Sep 17 00:00:00 2001 From: Erik Gomez Date: Fri, 16 Aug 2024 07:57:27 -0500 Subject: [PATCH 4/5] fix japanese translations from enpipi from https://github.com/enpipi/nudge/commit/f7689855e235cf978ac00ac2a759500e072c8c06 --- Localizable.xcstrings | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index f8701370..42aeb731 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -150,7 +150,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "**ローカルITチームからのリマインドです**" + "value" : "**ITチームからのお知らせです**" } }, "ko" : { @@ -366,7 +366,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "**お使いのデバイスは重要なセキュリティ アップデートを受信できなくなりました**" + "value" : "**あなたの端末は重要なセキュリティアップデートを受け取ることができなくなりました**" } }, "ko" : { @@ -474,7 +474,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "**デバイスは更新中に再起動します**" + "value" : "**更新中に端末が再起動します**" } }, "ko" : { @@ -582,7 +582,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "IT 部門がデバイスを正確に保護するには、完全に最新のデバイスが必要です。\n\n交換用デバイスを入手しない場合、日常業務に必要な一部のアイテムにアクセスできなくなります。\n\n詳細については、[**デバイスを交換する**] ボタンをクリックしてください。" + "value" : "端末の交換が必要です。\n\n端末を交換しないと、業務に必要な一部のアイテムにアクセスできなくなります。\n\n詳細については、[**端末を交換する**] ボタンをクリックしてください。" } }, "ko" : { @@ -690,7 +690,7 @@ "ja" : { "stringUnit" : { "state" : "needs_review", - "value" : "ITが正確にあなたのデバイスを保護するためには、デバイスを完全に最新にすることが必要です。\n\nデバイスを更新しない場合、日々のタスクに必要なアイテムへのアクセスができなくなる可能性があります。\n\n更新を開始するにはデバイスの更新ボタンをクリックし、指示されたステップに従ってください。" + "value" : "あなたの端末を保護するために、OSを最新にしてください。\n\nOSを更新しない場合、日々のタスクに必要なアイテムへのアクセスができなくなる可能性があります。\n\n更新を開始するには端末の更新ボタンをクリックし、指示されたステップに従ってください。" } }, "ko" : { @@ -798,7 +798,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "デバイスの追加情報" + "value" : "端末の追加情報" } }, "ko" : { @@ -1122,7 +1122,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "クリックしてデバイスの追加情報を確認" + "value" : "クリックして端末の追加情報を確認" } }, "ko" : { @@ -1230,7 +1230,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "クリックしてセキュリティ更新の詳細情報を確認" + "value" : "クリックしてセキュリティアップデートの詳細を確認" } }, "ko" : { @@ -1446,7 +1446,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "クリックしスクリーンショットを拡大" + "value" : "クリックしてスクリーンショットを拡大" } }, "ko" : { @@ -1662,7 +1662,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "カスタム" + "value" : "日付を選択" } }, "ko" : { @@ -2958,7 +2958,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "このアプリを使用するには、デバイスを更新してください" + "value" : "このアプリを使用するには、端末を更新してください" } }, "ko" : { @@ -3066,7 +3066,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "地元の IT チームと協力して交換用デバイスを入手してください" + "value" : "ITチームと連携して端末を交換してください" } }, "ko" : { @@ -3174,7 +3174,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "デバイスを交換してください" + "value" : "端末を交換してください" } }, "ko" : { @@ -3282,7 +3282,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "必要な日付：" + "value" : "更新期限：" } }, "ko" : { @@ -3714,7 +3714,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "デバイスの更新" + "value" : "端末を更新する" } }, "ko" : { @@ -3822,7 +3822,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "更新の完了には約30分かかります" + "value" : "更新には約30分かかります" } }, "ko" : { @@ -4146,7 +4146,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "あなたのデバイスは更新が必要です" + "value" : "あなたの端末はセキュリティアップデートが必要です" } }, "ko" : { @@ -4254,7 +4254,7 @@ "ja" : { "stringUnit" : { "state" : "translated", - "value" : "あなたのデバイスはセキュリティの更新が必要です(デモモード)" + "value" : "あなたの端末はセキュリティアップデートが必要です(デモモード)" } }, "ko" : { From cc8a9f26a0a951ce8a96b050dae282c377adec8b Mon Sep 17 00:00:00 2001 From: Erik Gomez Date: Fri, 16 Aug 2024 08:03:43 -0500 Subject: [PATCH 5/5] v2.0.8 changelog and values --- CHANGELOG.md | 14 ++++++++++++++ Nudge.xcodeproj/project.pbxproj | 4 ++-- Nudge/Info.plist | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd5b01b7..ee768a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.8] - 2024-08-16 +Requires macOS 12.0 and higher. + +### Changed +- Japenese Localization + - Thanks to [enpipi](https://github.com/enpipi) for the changes! + - [637](https://github.com/macadmins/nudge/issues/637) +- The `Debug` schema no longer honors `randomDelay` + +### Fixed +- The left side of Nudge is no longer cut off when using more "verbose" languages + - [640](https://github.com/macadmins/nudge/issues/640) +- The left side of Nudge now has proper localization for the values `True` and `False` + ## [2.0.7] - 2024-08-08 Requires macOS 12.0 and higher. diff --git a/Nudge.xcodeproj/project.pbxproj b/Nudge.xcodeproj/project.pbxproj index de99b846..33102844 100644 --- a/Nudge.xcodeproj/project.pbxproj +++ b/Nudge.xcodeproj/project.pbxproj @@ -698,7 +698,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.0.7; + MARKETING_VERSION = 2.0.8; PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -729,7 +729,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 2.0.7; + MARKETING_VERSION = 2.0.8; PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Nudge/Info.plist b/Nudge/Info.plist index 607a5905..ca2f68d5 100644 --- a/Nudge/Info.plist +++ b/Nudge/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 2.0.7 + 2.0.8 CFBundleVersion - 2.0.7 + 2.0.8 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion