diff --git a/Localization/StringsConvertor/input/en.lproj/app.json b/Localization/StringsConvertor/input/en.lproj/app.json index a965b23ae..21c8ab481 100644 --- a/Localization/StringsConvertor/input/en.lproj/app.json +++ b/Localization/StringsConvertor/input/en.lproj/app.json @@ -676,9 +676,9 @@ } }, "account_list": { - "tab_bar_hint": "Current selected profile: %s. Double tap then hold to show account switcher", "dismiss_account_switcher": "Dismiss Account Switcher", - "add_account": "Add Account" + "add_account": "Add Account", + "switch_accounts": "Switch Accounts" }, "wizard": { "new_in_mastodon": "New in Mastodon", diff --git a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift index d56a18aed..0eea7288e 100644 --- a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift +++ b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift @@ -309,8 +309,7 @@ extension MainTabBarController { } if let profileTabItem { profileTabItem.accessibilityCustomActions = [ - // TODO: i18n (scene.account_list.switch_accounts) - UIAccessibilityCustomAction(name: "Switch Accounts") { [weak self] _ in + UIAccessibilityCustomAction(name: L10n.Scene.AccountList.switchAccounts) { [weak self] _ in self?.showAccountSwitcher() return true } diff --git a/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift b/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift index 97284e7b8..2a8082e47 100644 --- a/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift +++ b/Mastodon/Scene/Root/Sidebar/SidebarViewModel.swift @@ -136,8 +136,7 @@ extension SidebarViewModel { case .me: if self.authContext?.mastodonAuthenticationBox.authenticationRecord.object(in: self.context.managedObjectContext)?.user != nil { cell.accessibilityCustomActions = [ - // TODO: i18n (scene.account_list.switch_accounts) - UIAccessibilityCustomAction(name: "Switch Accounts") { [weak self] _ in + UIAccessibilityCustomAction(name: L10n.Scene.AccountList.switchAccounts) { [weak self] _ in guard let self, let delegate = self.delegate else { return false } delegate.sidebarViewModelDidSwitchAccounts(self) return true diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 52ed59c09..00c3747d7 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -406,10 +406,8 @@ public enum L10n { public static let addAccount = L10n.tr("Localizable", "Scene.AccountList.AddAccount") /// Dismiss Account Switcher public static let dismissAccountSwitcher = L10n.tr("Localizable", "Scene.AccountList.DismissAccountSwitcher") - /// Current selected profile: %@. Double tap then hold to show account switcher - public static func tabBarHint(_ p1: Any) -> String { - return L10n.tr("Localizable", "Scene.AccountList.TabBarHint", String(describing: p1)) - } + /// Switch Accounts + public static let switchAccounts = L10n.tr("Localizable", "Scene.AccountList.SwitchAccounts") } public enum Bookmark { /// Your Bookmarks diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings index 6917eb0c7..f54ea8442 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings @@ -153,7 +153,7 @@ Your profile looks like this to them."; "Common.Controls.Timeline.Timestamp.Now" = "Now"; "Scene.AccountList.AddAccount" = "Add Account"; "Scene.AccountList.DismissAccountSwitcher" = "Dismiss Account Switcher"; -"Scene.AccountList.TabBarHint" = "Current selected profile: %@. Double tap then hold to show account switcher"; +"Scene.AccountList.SwitchAccounts" = "Switch Accounts"; "Scene.Bookmark.Title" = "Your Bookmarks"; "Scene.Compose.Accessibility.AppendAttachment" = "Add Attachment"; "Scene.Compose.Accessibility.AppendPoll" = "Add Poll";