From 642cca4002b03aec4347f0f4bcbc913958c28bd9 Mon Sep 17 00:00:00 2001 From: Paul Traylor Date: Fri, 27 Jan 2023 14:53:05 +0900 Subject: [PATCH 1/2] Add link to system settings (#404) * Add link to system settings * Add to Localizable.strings * Add .tint(.black) so that it matches NavigationLink --- IceCubesApp/App/Tabs/Settings/SettingsTab.swift | 7 +++++++ .../Resources/Localization/de.lproj/Localizable.strings | 1 + .../Resources/Localization/en.lproj/Localizable.strings | 1 + .../Resources/Localization/es.lproj/Localizable.strings | 1 + .../Resources/Localization/it.lproj/Localizable.strings | 1 + .../Resources/Localization/ja.lproj/Localizable.strings | 1 + .../Resources/Localization/nl.lproj/Localizable.strings | 1 + .../Localization/zh-Hans.lproj/Localizable.strings | 1 + 8 files changed, 14 insertions(+) diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift index 47537f8a..d5345eee 100644 --- a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift +++ b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift @@ -2,6 +2,7 @@ import Account import AppAccount import DesignSystem import Env +import Foundation import Models import Network import SwiftUI @@ -104,6 +105,12 @@ struct SettingsTabs: View { NavigationLink(destination: ContentSettingsView()) { Label("settings.general.content", systemImage: "rectangle.fill.on.rectangle.fill") } + Link(destination: URL(string: UIApplication.openSettingsURLString)!) { + Label("settings.system", systemImage: "gear") + // Tint our label black, so that it matches the other NavigationLink instead of + // defaulting to highlighted like a Link + .tint(.black) + } } .listRowBackground(theme.primaryBackgroundColor) } diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index e0647dff..1bcd7a24 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -111,6 +111,7 @@ "settings.other.hide-openai" = "Aktiviere 🤖 Helfer"; "settings.other.social-keyboard" = "Soziale Tastatur aktivieren"; "settings.general.content" = "Inhaltseinstellungen"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "Inhaltseinstellungen"; "settings.content.use-instance-settings" = "Servereinstellungen verwenden"; "settings.content.main-toggle.description" = "Die Einstellungen von der Heiminstanz übernehmen"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index 37df27df..20cd19e1 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -87,6 +87,7 @@ "settings.push.new-posts" = "New Posts"; "settings.push.polls" = "Poll Results"; "settings.general.content" = "Content Settings"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "Content Settings"; "settings.content.use-instance-settings" = "Use server settings"; "settings.content.main-toggle.description" = "Use the settings from your home Instance"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index d06b92ef..1ff032e8 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -111,6 +111,7 @@ "settings.other.hide-openai" = "Activar ayudante 🤖"; "settings.other.social-keyboard" = "Activar teclado social"; "settings.general.content" = "Ajustes de contenido"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "Ajustes de contenido"; "settings.content.use-instance-settings" = "Usar ajustes del servidor"; "settings.content.main-toggle.description" = "Usar ajustes de tu instancia inicial"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 147f8413..0cfec776 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -111,6 +111,7 @@ "settings.other.hide-openai" = "Abilita l'aiuto del 🤖"; "settings.other.social-keyboard" = "Abilita social keyboard"; "settings.general.content" = "Impostazioni dei contenuti"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "Impostazioni dei contenuti"; "settings.content.use-instance-settings" = "Utilizza le impostazioni del server"; "settings.content.main-toggle.description" = "Utilizza le impostazioni provenienti dalla tua istanza Mastodon"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index 9ea8affe..6c5f25a1 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -341,6 +341,7 @@ "status.visibility.public" = "全員"; "status.visibility.unlisted" = "リスト外"; "settings.general.content" = "コンテンツ設定"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "コンテンツ設定"; "settings.content.use-instance-settings" = "サーバー設定を使用する"; "settings.content.main-toggle.description" = "ホームインスタンスの設定を使用する"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index 4ef17f82..4ff174d4 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -111,6 +111,7 @@ "settings.other.hide-openai" = "Schakel 🤖-hulp in"; "settings.other.social-keyboard" = "Schakel social-toetsenbord in"; "settings.general.content" = "Inhoud"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "Inhoud"; "settings.content.use-instance-settings" = "Gebruik serverinstellingen"; "settings.content.main-toggle.description" = "Gebruik de instellingen van jouw thuisinstantie."; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index da01abc6..9ac9b03b 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -112,6 +112,7 @@ "settings.other.social-keyboard" = "启用社交键盘"; "settings.general.content" = "内容设置"; +"settings.system" = "System Settings"; "settings.content.navigation-title" = "内容设置"; "settings.content.use-instance-settings" = "使用服务器设置"; "settings.content.main-toggle.description" = "使用你主服务器的设置"; From ce233b4062e8656709978a4c440757e3022d536d Mon Sep 17 00:00:00 2001 From: nixzhu Date: Fri, 27 Jan 2023 13:53:19 +0800 Subject: [PATCH 2/2] Update Simplified Chinese localization (#425) * Update translations * Update translations --- .../zh-Hans.lproj/Localizable.strings | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index 9ac9b03b..7dc6b3de 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -62,7 +62,7 @@ "settings.display.restore" = "恢复默认设置"; "settings.display.section.display" = "显示"; "settings.display.section.theme" = "主题"; -"settings.display.section.theme.footer" = "Custom colors can only be set if match system color scheme is disabled"; +"settings.display.section.theme.footer" = "只有在“匹配系统”关闭时才能设置自定义颜色"; "settings.display.status.action-buttons" = "导航栏选项"; "settings.display.status.media-style" = "导航栏排列"; "settings.display.translate-button" = "显示翻译按钮"; @@ -93,7 +93,7 @@ "settings.support.alert.error.message" = "应用内购买失败，请重试。"; "settings.support.alert.message" = "非常感谢你的捐赠！"; "settings.support.alert.title" = "谢谢！"; -"settings.support.message-from-dev" = "你好呀！我叫 Thomas，我非常喜欢写开源应用。 Ice Cubes 绝对是目前为止我最骄傲的项目之一。而且说实话，由于 Mastodon 和社交媒体世界的不断变化，它也是最需要维护的项目。如果你喜欢使用 Ice Cubes，请考虑给我一些捐赠。这真的会让我很开心 (且能鼓励我持续为你完善它)。🚀"; +"settings.support.message-from-dev" = "你好呀！我叫 Thomas，我非常喜欢写开源应用。Ice Cubes 绝对是目前为止我最骄傲的项目之一。而且说实话，由于 Mastodon 和社交媒体世界的不断变化，它也是最需要维护的项目。如果你喜欢使用 Ice Cubes，请考虑给我一些捐赠。这真的会让我很开心 (且能鼓励我持续为你完善它)。🚀"; "settings.support.navigation-title" = "支持 Ice Cubes"; "settings.support.one.subtitle" = "小而可爱，而且它味道不错！"; "settings.support.one.title" = "🍬 一点小费"; @@ -123,8 +123,8 @@ "settings.content.reading" = "阅读设置"; "settings.content.posting" = "发布设置"; -"settings.push.duplicate.title" = "重复推送修复器"; -"settings.push.duplicate.footer" = "有收到重复推送？试试用这个魔法按钮去修复吧"; +"settings.push.duplicate.title" = "重复推送通知修复器"; +"settings.push.duplicate.footer" = "有收到重复的推送通知？试试用这个魔法按钮去修复吧"; "settings.push.duplicate.button.fix" = "🪄 修复"; // MARK: Tabs @@ -159,8 +159,8 @@ "account.action.notify-disable" = "关闭通知"; "account.action.reboosts-show" = "显示转发"; "account.action.reboosts-hide" = "隐藏转发"; -"account.action.block" = "拉黑"; -"account.action.unblock" = "取消拉黑"; +"account.action.block" = "屏蔽"; +"account.action.unblock" = "取消屏蔽"; "account.action.mute" = "免打扰"; "account.action.unmute" = "取消免打扰"; "account.boosted-by" = "转发"; @@ -203,7 +203,7 @@ // MARK: Package: Conversations "conversations.action.delete" = "删除"; "conversations.action.mark-read" = "标记为已读"; -"conversations.empty.message" = "正在社交媒体上寻找乐趣? 你所有的私信和单独提及都在这里。 聊得开心! 📱❤️"; +"conversations.empty.message" = "正在社交媒体上寻找乐趣？你所有的私信和单独提及都在这里。聊得开心！📱❤️"; "conversations.empty.title" = "收件箱为空"; "conversations.error.button" = "重试"; "conversations.error.message" = "加载私信时出错"; @@ -368,6 +368,6 @@ "filter.edit.action" = "过滤器行为"; "account.action.edit-filters" = "编辑过滤器"; -"enum.expand-media.show" = "Show All"; -"enum.expand-media.hide" = "Hide All"; -"enum.expand-media.hide-sensitive" = "Hide Sensitive"; +"enum.expand-media.show" = "显示所有"; +"enum.expand-media.hide" = "隐藏所有"; +"enum.expand-media.hide-sensitive" = "隐藏敏感内容";