From 563213d98fb8415620ac0c0e2bd790e29b7c097a Mon Sep 17 00:00:00 2001 From: Ege Sucu Date: Mon, 22 Jul 2024 08:17:42 +0300 Subject: [PATCH 1/3] Changed a Translation Wording (#2136) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "Yükselişteki" is not a 100% translation for "Trend", we also have "Trend" in Turkish & this old longer version breaks UI on the tab because of more characters. --- .../Localization/Localizable.xcstrings | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/IceCubesApp/Resources/Localization/Localizable.xcstrings b/IceCubesApp/Resources/Localization/Localizable.xcstrings index e3ac1be8..9861f416 100644 --- a/IceCubesApp/Resources/Localization/Localizable.xcstrings +++ b/IceCubesApp/Resources/Localization/Localizable.xcstrings @@ -13539,6 +13539,12 @@ "value" : "Verwijder profielfoto" } }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Avatarı Sil" + } + }, "zh-Hans" : { "stringUnit" : { "state" : "translated", @@ -14050,6 +14056,12 @@ "value" : "Verwijder omslagfoto" } }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Başlığı Sil" + } + }, "zh-Hans" : { "stringUnit" : { "state" : "translated", @@ -28642,8 +28654,8 @@ }, "tr" : { "stringUnit" : { - "state" : "needs_review", - "value" : "Yükselişteki Bağlantılar" + "state" : "translated", + "value" : "Trend Bağlantılar" } }, "uk" : { @@ -28762,7 +28774,7 @@ "tr" : { "stringUnit" : { "state" : "translated", - "value" : "Yükselişteki Gönderiler" + "value" : "Trend Gönderiler" } }, "uk" : { @@ -28881,7 +28893,7 @@ "tr" : { "stringUnit" : { "state" : "translated", - "value" : "Yükselişteki Etiketler" + "value" : "Trend Etiketler" } }, "uk" : { @@ -35874,7 +35886,7 @@ }, "tr" : { "stringUnit" : { - "state" : "needs_review", + "state" : "translated", "value" : "Ayarlar ..." } }, @@ -62385,7 +62397,14 @@ } }, "Show Content Gradient" : { - + "localizations" : { + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "İçerik Gradyanını Göster" + } + } + } }, "status.action.bookmark" : { "extractionState" : "manual", @@ -78056,7 +78075,7 @@ "tr" : { "stringUnit" : { "state" : "translated", - "value" : "Yükselişte" + "value" : "Trend" } }, "uk" : { @@ -83096,14 +83115,14 @@ "plural" : { "one" : { "stringUnit" : { - "state" : "needs_review", - "value" : "%lld kişi konuşuyor" + "state" : "translated", + "value" : "%lld gönderi" } }, "other" : { "stringUnit" : { - "state" : "needs_review", - "value" : "%lld kişi konuşuyor" + "state" : "translated", + "value" : "%lld gönderi" } } } From a3326c3fc2650e846e172a6736b88810f15a4f3f Mon Sep 17 00:00:00 2001 From: Klaus Dresbach Date: Mon, 22 Jul 2024 07:17:49 +0200 Subject: [PATCH 2/3] AddAccountView: fix error handling (#2137) --- IceCubesApp/App/Tabs/Settings/AddAccountsView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift index 9fadcd51..2d0a84ce 100644 --- a/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift +++ b/IceCubesApp/App/Tabs/Settings/AddAccountsView.swift @@ -136,11 +136,12 @@ struct AddAccountView: View { instance = nil instanceFetchError = nil } - } catch _ as DecodingError { + } catch _ as ServerError { instance = nil instanceFetchError = "account.add.error.instance-not-supported" } catch { instance = nil + instanceFetchError = nil } } } From be02b2ea760360bdb2eda7b24cec8da7e14ae55d Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Mon, 22 Jul 2024 08:28:42 +0200 Subject: [PATCH 3/3] Fix toolbar --- IceCubesApp/App/Tabs/ToolbarTab.swift | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/IceCubesApp/App/Tabs/ToolbarTab.swift b/IceCubesApp/App/Tabs/ToolbarTab.swift index e28fdd17..2e8087b2 100644 --- a/IceCubesApp/App/Tabs/ToolbarTab.swift +++ b/IceCubesApp/App/Tabs/ToolbarTab.swift @@ -15,17 +15,19 @@ struct ToolbarTab: ToolbarContent { var body: some ToolbarContent { if !isSecondaryColumn { - ToolbarItem(placement: .topBarLeading) { - if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { - Button { - withAnimation { - userPreferences.isSidebarExpanded.toggle() - } - } label: { - if userPreferences.isSidebarExpanded { - Image(systemName: "sidebar.squares.left") - } else { - Image(systemName: "sidebar.left") + if horizontalSizeClass == .regular { + ToolbarItem(placement: .topBarLeading) { + if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { + Button { + withAnimation { + userPreferences.isSidebarExpanded.toggle() + } + } label: { + if userPreferences.isSidebarExpanded { + Image(systemName: "sidebar.squares.left") + } else { + Image(systemName: "sidebar.left") + } } } }