Re-key strings for future SwiftUI use

This commit is contained in:
Justin Mazzocchi 2021-03-23 18:39:04 -07:00
parent f84f81553f
commit 675de4284b
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
12 changed files with 59 additions and 59 deletions

View file

@ -22,10 +22,10 @@
"account.domain-block.confirm-%@" = "Sperre Domain %@?";
"account.domain-unblock-%@" = "Entsperre Domain %@";
"account.domain-unblock.confirm-%@" = "Entsperre Domain %@?";
"account.field.verified" = "Verifiziere %@";
"account.field.verified-%@" = "Verifiziere %@";
"account.follow" = "Folgen";
"account.following" = "Folgen";
"account.following-count" = "%ld werden gefolgt";
"account.following-count-%ld" = "%ld werden gefolgt";
"account.followed-by-%@" = "Gefolgt von %@";
"account.follows-you" = "Folgt dir";
"account.header.accessibility-label-%@" = "Banner: %@";
@ -264,12 +264,12 @@
"more-results.statuses.toot" = "Mehr Toots";
"more-results.tags" = "Mehr Hashtags";
"notifications" = "Benachrichtungen";
"notifications.reblogged-your-status" = "%@ boosteten Ihren Beitrag";
"notifications.favourited-your-status" = "%@ favorisierten ihren Beitrag";
"notifications.followed-you" = "%@ folgten ihnen";
"notifications.reblogged-your-status-%@" = "%@ boosteten Ihren Beitrag";
"notifications.favourited-your-status-%@" = "%@ favorisierten ihren Beitrag";
"notifications.followed-you-%@" = "%@ folgten ihnen";
"notifications.poll-ended" = "Eine Umfrage, an der Sie teilgenommen haben, wurde beendet";
"notifications.your-poll-ended" = "Ihre Umfrage ist beendet";
"notifications.unknown" = "Benachrichtigung von %@";
"notifications.unknown-%@" = "Benachrichtigung von %@";
"remove" = "Entfernen";
"report" = "Melden";
"report.additional-comments" = "Zusätzliche Anmerkungen";
@ -308,10 +308,10 @@
"status.poll.accessibility-label" = "Umfrage";
"status.poll.option-%ld" = "Option %ld";
"status.poll.vote" = "Wählen";
"status.poll.time-left" = "%@ übrig";
"status.poll.time-left-%@" = "%@ übrig";
"status.poll.refresh" = "Neuladen";
"status.poll.closed" = "Geschlossen";
"status.reblogged-by" = "%@ boosted";
"status.reblogged-by-%@" = "%@ boosted";
"status.reply-button.accessibility-label" = "Antworten";
"status.reblog-button.accessibility-label" = "Boost";
"status.reblog-button.undo.accessibility-label" = "Unboost";

View file

@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>tag.people-talking</key>
<key>tag.people-talking-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -18,7 +18,7 @@
<string>%ld Personen sprechen drüber</string>
</dict>
</dict>
<key>status.poll.participation-count</key>
<key>status.poll.participation-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -34,7 +34,7 @@
<string>%ld Leute</string>
</dict>
</dict>
<key>status.reblogs-count</key>
<key>status.reblogs-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@reblogs@</string>
@ -50,7 +50,7 @@
<string>%ld Boosts</string>
</dict>
</dict>
<key>status.favorites-count</key>
<key>status.favorites-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@favorites@</string>
@ -66,7 +66,7 @@
<string>%ld Favoriten</string>
</dict>
</dict>
<key>status.replies-count</key>
<key>status.replies-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@replies@</string>
@ -114,7 +114,7 @@
<string>%ld Toots</string>
</dict>
</dict>
<key>account.followers-count</key>
<key>account.followers-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>

View file

@ -22,10 +22,10 @@
"account.domain-block.confirm-%@" = "Block domain %@?";
"account.domain-unblock-%@" = "Unblock domain %@";
"account.domain-unblock.confirm-%@" = "Unblock domain %@?";
"account.field.verified" = "Verified %@";
"account.field.verified-%@" = "Verified %@";
"account.follow" = "Follow";
"account.following" = "Following";
"account.following-count" = "%ld Following";
"account.following-count-%ld" = "%ld Following";
"account.followed-by-%@" = "Followed by %@";
"account.follows-you" = "Follows you";
"account.header.accessibility-label-%@" = "Header image: %@";
@ -265,12 +265,12 @@
"more-results.statuses.toot" = "More toots";
"more-results.tags" = "More hashtags";
"notifications" = "Notifications";
"notifications.reblogged-your-status" = "%@ boosted your status";
"notifications.favourited-your-status" = "%@ favorited your status";
"notifications.followed-you" = "%@ followed you";
"notifications.reblogged-your-status-%@" = "%@ boosted your status";
"notifications.favourited-your-status-%@" = "%@ favorited your status";
"notifications.followed-you-%@" = "%@ followed you";
"notifications.poll-ended" = "A poll you have voted in has ended";
"notifications.your-poll-ended" = "Your poll has ended";
"notifications.unknown" = "Notification from %@";
"notifications.unknown-%@" = "Notification from %@";
"remove" = "Remove";
"report" = "Report";
"report.additional-comments" = "Additional comments";
@ -309,10 +309,10 @@
"status.poll.accessibility-label" = "Poll";
"status.poll.option-%ld" = "Option %ld";
"status.poll.vote" = "Vote";
"status.poll.time-left" = "%@ left";
"status.poll.time-left-%@" = "%@ left";
"status.poll.refresh" = "Refresh";
"status.poll.closed" = "Closed";
"status.reblogged-by" = "%@ boosted";
"status.reblogged-by-%@" = "%@ boosted";
"status.reply-button.accessibility-label" = "Reply";
"status.reblog-button.accessibility-label" = "Boost";
"status.reblog-button.undo.accessibility-label" = "Unboost";

View file

@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>tag.people-talking</key>
<key>tag.people-talking-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -18,7 +18,7 @@
<string>%ld people talking</string>
</dict>
</dict>
<key>status.poll.participation-count</key>
<key>status.poll.participation-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -34,7 +34,7 @@
<string>%ld people</string>
</dict>
</dict>
<key>status.reblogs-count</key>
<key>status.reblogs-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@reblogs@</string>
@ -50,7 +50,7 @@
<string>%ld Boosts</string>
</dict>
</dict>
<key>status.favorites-count</key>
<key>status.favorites-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@favorites@</string>
@ -66,7 +66,7 @@
<string>%ld Favorites</string>
</dict>
</dict>
<key>status.replies-count</key>
<key>status.replies-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@replies@</string>
@ -114,7 +114,7 @@
<string>%ld Toots</string>
</dict>
</dict>
<key>account.followers-count</key>
<key>account.followers-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>

View file

@ -22,10 +22,10 @@
"account.domain-block.confirm-%@" = "%@をドメインブロックしますか?";
"account.domain-unblock-%@" = "%@をドメインブロック解除";
"account.domain-unblock.confirm-%@" = "%@をドメインブロック解除しますか?";
"account.field.verified" = "%@は検証されています";
"account.field.verified-%@" = "%@は検証されています";
"account.follow" = "フォロー";
"account.following" = "フォロー中";
"account.following-count" = "%ld フォロー";
"account.following-count-%ld" = "%ld フォロー";
"account.followed-by-%@" = "%@にフォローされています";
"account.follows-you" = "あなたをフォロー";
"account.header.accessibility-label-%@" = "ヘッダー画像: %@";
@ -265,12 +265,12 @@
"more-results.statuses.toot" = "もっとトゥートを表示";
"more-results.tags" = "もっとハッシュタグを表示";
"notifications" = "通知";
"notifications.reblogged-your-status" = "%@があなたのステータスをブーストしました";
"notifications.favourited-your-status" = "%@があなたのステータスをお気に入りしました";
"notifications.followed-you" = "%@があなたをフォローしました";
"notifications.reblogged-your-status-%@" = "%@があなたのステータスをブーストしました";
"notifications.favourited-your-status-%@" = "%@があなたのステータスをお気に入りしました";
"notifications.followed-you-%@" = "%@があなたをフォローしました";
"notifications.poll-ended" = "あなたが投票したアンケートが終了しました";
"notifications.your-poll-ended" = "アンケートが終了しました";
"notifications.unknown" = "%@からの通知";
"notifications.unknown-%@" = "%@からの通知";
"remove" = "削除";
"report" = "通報";
"report.additional-comments" = "追加コメント";
@ -309,10 +309,10 @@
"status.poll.accessibility-label" = "アンケート";
"status.poll.option-%ld" = "オプション %ld";
"status.poll.vote" = "投票";
"status.poll.time-left" = "残り%@";
"status.poll.time-left-%@" = "残り%@";
"status.poll.refresh" = "更新";
"status.poll.closed" = "終了";
"status.reblogged-by" = "%@さんがブースト";
"status.reblogged-by-%@" = "%@さんがブースト";
"status.reply-button.accessibility-label" = "返信する";
"status.reblog-button.accessibility-label" = "ブーストする";
"status.reblog-button.undo.accessibility-label" = "ブーストを解除する";

View file

@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>tag.people-talking</key>
<key>tag.people-talking-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -16,7 +16,7 @@
<string>%ld 人が話題</string>
</dict>
</dict>
<key>status.poll.participation-count</key>
<key>status.poll.participation-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
@ -30,7 +30,7 @@
<string>%ld 人</string>
</dict>
</dict>
<key>status.reblogs-count</key>
<key>status.reblogs-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@reblogs@</string>
@ -44,7 +44,7 @@
<string>%ld ブースト</string>
</dict>
</dict>
<key>status.favorites-count</key>
<key>status.favorites-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@favorites@</string>
@ -58,7 +58,7 @@
<string>%ld お気に入り</string>
</dict>
</dict>
<key>status.replies-count</key>
<key>status.replies-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@replies@</string>
@ -100,7 +100,7 @@
<string>%ld トゥート</string>
</dict>
</dict>
<key>account.followers-count</key>
<key>account.followers-count-%ld</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@followers@</string>

View file

@ -101,7 +101,7 @@ final class AccountFieldView: UIView {
if let verifiedAt = verifiedAt {
checkButton.menu = UIMenu(
title: String.localizedStringWithFormat(
NSLocalizedString("account.field.verified", comment: ""),
NSLocalizedString("account.field.verified-%@", comment: ""),
Self.dateFormatter.string(from: verifiedAt)),
options: .displayInline,
children: [UIAction(title: NSLocalizedString("ok", comment: "")) { _ in }])
@ -156,7 +156,7 @@ final class AccountFieldView: UIView {
if let verifiedAt = verifiedAt {
accessibilityAttributedLabel.appendWithSeparator(
String.localizedStringWithFormat(
NSLocalizedString("account.field.verified", comment: ""),
NSLocalizedString("account.field.verified-%@", comment: ""),
Self.dateFormatter.string(from: verifiedAt)))
}

View file

@ -186,10 +186,10 @@ final class AccountHeaderView: UIView {
noteTextView.isHidden = false
followingButton.setAttributedLocalizedTitle(
localizationKey: "account.following-count",
localizationKey: "account.following-count-%ld",
count: accountViewModel.followingCount)
followersButton.setAttributedLocalizedTitle(
localizationKey: "account.followers-count",
localizationKey: "account.followers-count-%ld",
count: accountViewModel.followersCount)
followStackView.isHidden = false
} else {

View file

@ -170,21 +170,21 @@ private extension NotificationView {
switch viewModel.type {
case .follow:
typeLabel.attributedText = "notifications.followed-you".localizedBolding(
typeLabel.attributedText = "notifications.followed-you-%@".localizedBolding(
displayName: viewModel.accountViewModel.displayName,
emojis: viewModel.accountViewModel.emojis,
label: typeLabel,
identityContext: viewModel.identityContext)
iconImageView.tintColor = nil
case .reblog:
typeLabel.attributedText = "notifications.reblogged-your-status".localizedBolding(
typeLabel.attributedText = "notifications.reblogged-your-status-%@".localizedBolding(
displayName: viewModel.accountViewModel.displayName,
emojis: viewModel.accountViewModel.emojis,
label: typeLabel,
identityContext: viewModel.identityContext)
iconImageView.tintColor = .systemGreen
case .favourite:
typeLabel.attributedText = "notifications.favourited-your-status".localizedBolding(
typeLabel.attributedText = "notifications.favourited-your-status-%@".localizedBolding(
displayName: viewModel.accountViewModel.displayName,
emojis: viewModel.accountViewModel.emojis,
label: typeLabel,
@ -198,7 +198,7 @@ private extension NotificationView {
comment: "")
iconImageView.tintColor = nil
default:
typeLabel.attributedText = "notifications.unknown".localizedBolding(
typeLabel.attributedText = "notifications.unknown-%@".localizedBolding(
displayName: viewModel.accountViewModel.displayName,
emojis: viewModel.accountViewModel.emojis,
label: typeLabel,

View file

@ -482,7 +482,7 @@ private extension StatusView {
hasReplyFollowingView.isHidden = !viewModel.configuration.hasReplyFollowing
if viewModel.isReblog {
let attributedTitle = "status.reblogged-by".localizedBolding(
let attributedTitle = "status.reblogged-by-%@".localizedBolding(
displayName: viewModel.rebloggedByDisplayName,
emojis: viewModel.rebloggedByDisplayNameEmojis,
label: infoLabel,
@ -576,11 +576,11 @@ private extension StatusView {
let noInteractions = !isContextParent || (noReblogs && noFavorites)
rebloggedByButton.setAttributedLocalizedTitle(
localizationKey: "status.reblogs-count",
localizationKey: "status.reblogs-count-%ld",
count: viewModel.reblogsCount)
rebloggedByButton.isHidden = noReblogs
favoritedByButton.setAttributedLocalizedTitle(
localizationKey: "status.favorites-count",
localizationKey: "status.favorites-count-%ld",
count: viewModel.favoritesCount)
favoritedByButton.isHidden = noFavorites
@ -793,7 +793,7 @@ private extension StatusView {
if statusConfiguration.viewModel.repliesCount > 0 {
accessibilityAttributedLabel.appendWithSeparator(
String.localizedStringWithFormat(
NSLocalizedString("status.replies-count", comment: ""),
NSLocalizedString("status.replies-count-%ld", comment: ""),
statusConfiguration.viewModel.repliesCount))
}
@ -801,14 +801,14 @@ private extension StatusView {
if statusConfiguration.viewModel.reblogsCount > 0 {
accessibilityAttributedLabel.appendWithSeparator(
String.localizedStringWithFormat(
NSLocalizedString("status.reblogs-count", comment: ""),
NSLocalizedString("status.reblogs-count-%ld", comment: ""),
statusConfiguration.viewModel.reblogsCount))
}
if statusConfiguration.viewModel.favoritesCount > 0 {
accessibilityAttributedLabel.appendWithSeparator(
String.localizedStringWithFormat(
NSLocalizedString("status.favorites-count", comment: ""),
NSLocalizedString("status.favorites-count-%ld", comment: ""),
statusConfiguration.viewModel.favoritesCount))
}
}

View file

@ -95,7 +95,7 @@ private extension TagView {
if let accounts = viewModel.accounts {
let accountsText = String.localizedStringWithFormat(
NSLocalizedString("tag.people-talking", comment: ""),
NSLocalizedString("tag.people-talking-%ld", comment: ""),
accounts)
accountsLabel.text = accountsText
accessibilityLabel.appendWithSeparator(accountsText)

View file

@ -122,7 +122,7 @@ final class PollView: UIView {
stackView.addArrangedSubview(bottomStackView)
let votesCount = String.localizedStringWithFormat(
NSLocalizedString("status.poll.participation-count", comment: ""),
NSLocalizedString("status.poll.participation-count-%ld", comment: ""),
viewModel.pollVotersCount)
votesCountLabel.text = votesCount
@ -132,7 +132,7 @@ final class PollView: UIView {
if !viewModel.isPollExpired, let pollTimeLeft = viewModel.pollTimeLeft {
expiryLabel.text = String.localizedStringWithFormat(
NSLocalizedString("status.poll.time-left", comment: ""),
NSLocalizedString("status.poll.time-left-%@", comment: ""),
pollTimeLeft)
refreshButton.isHidden = false
accessibilityCustomActions =