Merge branch 'main' into iOS-18

This commit is contained in:
Thomas Ricouard 2024-07-22 08:28:48 +02:00
commit 9646fb0cac
3 changed files with 45 additions and 23 deletions

View file

@ -139,11 +139,12 @@ struct AddAccountView: View {
instance = nil instance = nil
instanceFetchError = nil instanceFetchError = nil
} }
} catch _ as DecodingError { } catch _ as ServerError {
instance = nil instance = nil
instanceFetchError = "account.add.error.instance-not-supported" instanceFetchError = "account.add.error.instance-not-supported"
} catch { } catch {
instance = nil instance = nil
instanceFetchError = nil
} }
} }
} }

View file

@ -15,6 +15,7 @@ struct ToolbarTab: ToolbarContent {
var body: some ToolbarContent { var body: some ToolbarContent {
if !isSecondaryColumn { if !isSecondaryColumn {
if horizontalSizeClass == .regular {
ToolbarItem(placement: .topBarLeading) { ToolbarItem(placement: .topBarLeading) {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
Button { Button {
@ -30,6 +31,7 @@ struct ToolbarTab: ToolbarContent {
} }
} }
} }
}
statusEditorToolbarItem(routerPath: routerPath, statusEditorToolbarItem(routerPath: routerPath,
visibility: userPreferences.postVisibility) visibility: userPreferences.postVisibility)
if UIDevice.current.userInterfaceIdiom != .pad || if UIDevice.current.userInterfaceIdiom != .pad ||

View file

@ -13539,6 +13539,12 @@
"value" : "Verwijder profielfoto" "value" : "Verwijder profielfoto"
} }
}, },
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Avatarı Sil"
}
},
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
@ -14050,6 +14056,12 @@
"value" : "Verwijder omslagfoto" "value" : "Verwijder omslagfoto"
} }
}, },
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Başlığı Sil"
}
},
"zh-Hans" : { "zh-Hans" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
@ -28642,8 +28654,8 @@
}, },
"tr" : { "tr" : {
"stringUnit" : { "stringUnit" : {
"state" : "needs_review", "state" : "translated",
"value" : "Yükselişteki Bağlantılar" "value" : "Trend Bağlantılar"
} }
}, },
"uk" : { "uk" : {
@ -28762,7 +28774,7 @@
"tr" : { "tr" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "Yükselişteki Gönderiler" "value" : "Trend Gönderiler"
} }
}, },
"uk" : { "uk" : {
@ -28881,7 +28893,7 @@
"tr" : { "tr" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "Yükselişteki Etiketler" "value" : "Trend Etiketler"
} }
}, },
"uk" : { "uk" : {
@ -35874,7 +35886,7 @@
}, },
"tr" : { "tr" : {
"stringUnit" : { "stringUnit" : {
"state" : "needs_review", "state" : "translated",
"value" : "Ayarlar ..." "value" : "Ayarlar ..."
} }
}, },
@ -62385,7 +62397,14 @@
} }
}, },
"Show Content Gradient" : { "Show Content Gradient" : {
"localizations" : {
"tr" : {
"stringUnit" : {
"state" : "translated",
"value" : "İçerik Gradyanını Göster"
}
}
}
}, },
"status.action.bookmark" : { "status.action.bookmark" : {
"extractionState" : "manual", "extractionState" : "manual",
@ -78056,7 +78075,7 @@
"tr" : { "tr" : {
"stringUnit" : { "stringUnit" : {
"state" : "translated", "state" : "translated",
"value" : "Yükselişte" "value" : "Trend"
} }
}, },
"uk" : { "uk" : {
@ -83096,14 +83115,14 @@
"plural" : { "plural" : {
"one" : { "one" : {
"stringUnit" : { "stringUnit" : {
"state" : "needs_review", "state" : "translated",
"value" : "%lld kişi konuşuyor" "value" : "%lld gönderi"
} }
}, },
"other" : { "other" : {
"stringUnit" : { "stringUnit" : {
"state" : "needs_review", "state" : "translated",
"value" : "%lld kişi konuşuyor" "value" : "%lld gönderi"
} }
} }
} }