From 8bb9bca4b93961696b22c0738b13d9d1252a6929 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Wed, 10 Apr 2024 14:03:13 +0200 Subject: [PATCH] Sprinkle in localization (IOS-234) --- .../input/Base.lproj/app.json | 11 +++------ Localization/app.json | 11 +++------ .../HomeTimeline/TimelineStatusPill.swift | 8 +++---- .../Generated/Strings.swift | 24 +++++++------------ .../Resources/Base.lproj/Localizable.strings | 9 +++---- 5 files changed, 21 insertions(+), 42 deletions(-) diff --git a/Localization/StringsConvertor/input/Base.lproj/app.json b/Localization/StringsConvertor/input/Base.lproj/app.json index 8658e52d8..261d40e95 100644 --- a/Localization/StringsConvertor/input/Base.lproj/app.json +++ b/Localization/StringsConvertor/input/Base.lproj/app.json @@ -474,15 +474,10 @@ "following": "Following", "local_community": "Local" }, - "navigation_bar_state": { + "timeline_pill": { "offline": "Offline", - "new_posts": "See new posts", - "published": "Published!", - "Publishing": "Publishing post...", - "accessibility": { - "logo_label": "Mastodon", - "logo_hint": "Tap to scroll to top and tap again to previous location" - } + "new_posts": "New Posts", + "post_sent": "Post Sent" } }, "suggestion_account": { diff --git a/Localization/app.json b/Localization/app.json index 8658e52d8..261d40e95 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -474,15 +474,10 @@ "following": "Following", "local_community": "Local" }, - "navigation_bar_state": { + "timeline_pill": { "offline": "Offline", - "new_posts": "See new posts", - "published": "Published!", - "Publishing": "Publishing post...", - "accessibility": { - "logo_label": "Mastodon", - "logo_hint": "Tap to scroll to top and tap again to previous location" - } + "new_posts": "New Posts", + "post_sent": "Post Sent" } }, "suggestion_account": { diff --git a/Mastodon/Scene/HomeTimeline/TimelineStatusPill.swift b/Mastodon/Scene/HomeTimeline/TimelineStatusPill.swift index 1e10322b5..2000d24d2 100644 --- a/Mastodon/Scene/HomeTimeline/TimelineStatusPill.swift +++ b/Mastodon/Scene/HomeTimeline/TimelineStatusPill.swift @@ -2,6 +2,7 @@ import UIKit import MastodonAsset +import MastodonLocalization class TimelineStatusPill: UIButton { @@ -80,14 +81,13 @@ class TimelineStatusPill: UIButton { } var title: String { - //TODO: Localization switch self { case .newPosts: - return "New Posts" + return L10n.Scene.HomeTimeline.TimelinePill.newPosts case .postSent: - return "Post Sent" + return L10n.Scene.HomeTimeline.TimelinePill.postSent case .offline: - return "Offline" + return L10n.Scene.HomeTimeline.TimelinePill.offline } } } diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 6fddef9d2..fcd63dc9f 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -843,28 +843,20 @@ public enum L10n { public enum HomeTimeline { /// Home public static let title = L10n.tr("Localizable", "Scene.HomeTimeline.Title", fallback: "Home") - public enum NavigationBarState { - /// See new posts - public static let newPosts = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.NewPosts", fallback: "See new posts") - /// Offline - public static let offline = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Offline", fallback: "Offline") - /// Published! - public static let published = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Published", fallback: "Published!") - /// Publishing post... - public static let publishing = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Publishing", fallback: "Publishing post...") - public enum Accessibility { - /// Tap to scroll to top and tap again to previous location - public static let logoHint = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint", fallback: "Tap to scroll to top and tap again to previous location") - /// Mastodon - public static let logoLabel = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel", fallback: "Mastodon") - } - } public enum TimelineMenu { /// Following public static let following = L10n.tr("Localizable", "Scene.HomeTimeline.TimelineMenu.Following", fallback: "Following") /// Local public static let localCommunity = L10n.tr("Localizable", "Scene.HomeTimeline.TimelineMenu.LocalCommunity", fallback: "Local") } + public enum TimelinePill { + /// New Posts + public static let newPosts = L10n.tr("Localizable", "Scene.HomeTimeline.TimelinePill.NewPosts", fallback: "New Posts") + /// Offline + public static let offline = L10n.tr("Localizable", "Scene.HomeTimeline.TimelinePill.Offline", fallback: "Offline") + /// Post Sent + public static let postSent = L10n.tr("Localizable", "Scene.HomeTimeline.TimelinePill.PostSent", fallback: "Post Sent") + } } public enum Login { /// Log you in on the server you created your account on. diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings index 60fb82e8f..9c6b106d2 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -298,14 +298,11 @@ uploaded to Mastodon."; "Scene.Follower.Title" = "follower"; "Scene.Following.Footer" = "Follows from other servers are not displayed."; "Scene.Following.Title" = "following"; -"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location"; -"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoLabel" = "Mastodon"; -"Scene.HomeTimeline.NavigationBarState.NewPosts" = "See new posts"; -"Scene.HomeTimeline.NavigationBarState.Offline" = "Offline"; -"Scene.HomeTimeline.NavigationBarState.Published" = "Published!"; -"Scene.HomeTimeline.NavigationBarState.Publishing" = "Publishing post..."; "Scene.HomeTimeline.TimelineMenu.Following" = "Following"; "Scene.HomeTimeline.TimelineMenu.LocalCommunity" = "Local"; +"Scene.HomeTimeline.TimelinePill.NewPosts" = "New Posts"; +"Scene.HomeTimeline.TimelinePill.Offline" = "Offline"; +"Scene.HomeTimeline.TimelinePill.PostSent" = "Post Sent"; "Scene.HomeTimeline.Title" = "Home"; "Scene.Login.ServerSearchField.Placeholder" = "Enter URL or search for your server"; "Scene.Login.Subtitle" = "Log you in on the server you created your account on.";