zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

fix: Localizable string issues

This commit is contained in:
Marcus Kida 2022-11-25 18:47:49 +01:00
parent 6a9b29e4a6
commit 0c571a2df6
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mastodon/Scene/HashtagTimeline/HashtagTimelineHeaderView.swift
View File

@ -10,6 +10,7 @@ import CoreDataStack
import MastodonSDK import MastodonSDK
import MastodonUI import MastodonUI
import MastodonAsset import MastodonAsset
import MastodonLocalization
fileprivate extension CGFloat { fileprivate extension CGFloat {
static let padding: CGFloat = 16 static let padding: CGFloat = 16
@ -155,10 +156,19 @@ extension HashtagTimelineHeaderView {
followButton.setTitle(entity.following == true ? L10n.Scene.FollowedTags.Actions.unfollow : L10n.Scene.FollowedTags.Actions.follow, for: .normal) followButton.setTitle(entity.following == true ? L10n.Scene.FollowedTags.Actions.unfollow : L10n.Scene.FollowedTags.Actions.follow, for: .normal)
followButton.backgroundColor = entity.following == true ? Asset.Colors.Button.tagUnfollow.color : Asset.Colors.Button.tagFollow.color followButton.backgroundColor = entity.following == true ? Asset.Colors.Button.tagUnfollow.color : Asset.Colors.Button.tagFollow.color
switch traitCollection.userInterfaceStyle {
case .dark:
followButton.setTitleColor(
.lightGray,
for: .normal
)
default:
followButton.setTitleColor( followButton.setTitleColor(
entity.following == true ? Asset.Colors.Button.tagFollow.color : Asset.Colors.Button.tagUnfollow.color, entity.following == true ? Asset.Colors.Button.tagFollow.color : Asset.Colors.Button.tagUnfollow.color,
for: .normal for: .normal
) )
}
postCountLabel.text = String(entity.postCount) postCountLabel.text = String(entity.postCount)
participantsLabel.text = String(entity.participantsCount) participantsLabel.text = String(entity.participantsCount)

4
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -639,6 +639,8 @@ public enum L10n {
public enum Actions { public enum Actions {
/// follow /// follow
public static let follow = L10n.tr("Localizable", "Scene.FollowedTags.Actions.Follow", fallback: "follow") public static let follow = L10n.tr("Localizable", "Scene.FollowedTags.Actions.Follow", fallback: "follow")
/// unfollow
public static let unfollow = L10n.tr("Localizable", "Scene.FollowedTags.Actions.Unfollow", fallback: "unfollow")
} }
public enum Header { public enum Header {
/// participants /// participants
@ -647,8 +649,6 @@ public enum L10n {
public static let posts = L10n.tr("Localizable", "Scene.FollowedTags.Header.Posts", fallback: "posts") public static let posts = L10n.tr("Localizable", "Scene.FollowedTags.Header.Posts", fallback: "posts")
/// posts today /// posts today
public static let postsToday = L10n.tr("Localizable", "Scene.FollowedTags.Header.PostsToday", fallback: "posts today") public static let postsToday = L10n.tr("Localizable", "Scene.FollowedTags.Header.PostsToday", fallback: "posts today")
/// unfollow
public static let unfollow = L10n.tr("Localizable", "Scene.FollowedTags.Header.Unfollow", fallback: "unfollow")
} }
} }
public enum Follower { public enum Follower {

2
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -236,7 +236,7 @@ uploaded to Mastodon.";
"Scene.FollowedTags.Header.Participants" = "participants"; "Scene.FollowedTags.Header.Participants" = "participants";
"Scene.FollowedTags.Header.PostsToday" = "posts today"; "Scene.FollowedTags.Header.PostsToday" = "posts today";
"Scene.FollowedTags.Actions.Follow" = "follow"; "Scene.FollowedTags.Actions.Follow" = "follow";
"Scene.FollowedTags.Header.Unfollow" = "unfollow"; "Scene.FollowedTags.Actions.Unfollow" = "unfollow";
"Scene.Following.Footer" = "Follows from other servers are not displayed."; "Scene.Following.Footer" = "Follows from other servers are not displayed.";
"Scene.Following.Title" = "following"; "Scene.Following.Title" = "following";
"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location"; "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location";

2
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
View File

@ -236,7 +236,7 @@ uploaded to Mastodon.";
"Scene.FollowedTags.Header.Participants" = "participants"; "Scene.FollowedTags.Header.Participants" = "participants";
"Scene.FollowedTags.Header.PostsToday" = "posts today"; "Scene.FollowedTags.Header.PostsToday" = "posts today";
"Scene.FollowedTags.Actions.Follow" = "follow"; "Scene.FollowedTags.Actions.Follow" = "follow";
"Scene.FollowedTags.Header.Unfollow" = "unfollow"; "Scene.FollowedTags.Actions.Unfollow" = "unfollow";
"Scene.Following.Footer" = "Follows from other servers are not displayed."; "Scene.Following.Footer" = "Follows from other servers are not displayed.";
"Scene.Following.Title" = "following"; "Scene.Following.Title" = "following";
"Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location"; "Scene.HomeTimeline.NavigationBarState.Accessibility.LogoHint" = "Tap to scroll to top and tap again to previous location";