tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Text(verbatim:) to indicate non-translatable strings

Browse Source
This commit is contained in:
Terry Yiu
2023-02-16 10:15:38 -05:00
parent 1b4e54582f
commit 98a1b95d12
14 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
damus/Views/ActionBar/EventActionBar.swift
View File

@@ -61,7 +61,7 @@ struct EventActionBar: View {
} }
} }
.accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button")) .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
Text(String("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")) Text(verbatim: "\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
.offset(x: 18) .offset(x: 18)
.font(.footnote.weight(.medium)) .font(.footnote.weight(.medium))
.foregroundColor(bar.boosted ? Color.green : Color.gray) .foregroundColor(bar.boosted ? Color.green : Color.gray)
@@ -76,7 +76,7 @@ struct EventActionBar: View {
send_like() send_like()
} }
} }
Text(String("\(bar.likes > 0 ? "\(bar.likes)" : "")")) Text(verbatim: "\(bar.likes > 0 ? "\(bar.likes)" : "")")
.offset(x: 22) .offset(x: 22)
.font(.footnote.weight(.medium)) .font(.footnote.weight(.medium))
.foregroundColor(bar.liked ? Color.accentColor : Color.gray) .foregroundColor(bar.liked ? Color.accentColor : Color.gray)

6
damus/Views/ActionBar/EventDetailBar.swift
View File

@@ -26,14 +26,14 @@ struct EventDetailBar: View {
HStack { HStack {
if bar.boosts > 0 { if bar.boosts > 0 {
NavigationLink(destination: RepostsView(damus_state: state, model: RepostsModel(state: state, target: target))) { NavigationLink(destination: RepostsView(damus_state: state, model: RepostsModel(state: state, target: target))) {
Text("\(Text(String("\(bar.boosts)")).font(.body.bold())) \(Text(String(format: NSLocalizedString("reposts_count", comment: "Part of a larger sentence to describe how many reposts there are."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.") Text("\(Text(verbatim: "\(bar.boosts)").font(.body.bold())) \(Text(String(format: NSLocalizedString("reposts_count", comment: "Part of a larger sentence to describe how many reposts there are."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.")
} }
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
} }
if bar.likes > 0 { if bar.likes > 0 {
NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) { NavigationLink(destination: ReactionsView(damus_state: state, model: ReactionsModel(state: state, target: target))) {
Text("\(Text(String("\(bar.likes)")).font(.body.bold())) \(Text(String(format: NSLocalizedString("reactions_count", comment: "Part of a larger sentence to describe how many reactions there are on a post."), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.") Text("\(Text(verbatim: "\(bar.likes)").font(.body.bold())) \(Text(String(format: NSLocalizedString("reactions_count", comment: "Part of a larger sentence to describe how many reactions there are on a post."), bar.likes)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many reactions there are on a post. In source English, the first variable is the number of reactions, and the second variable is 'Reaction' or 'Reactions'.")
} }
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
} }
@@ -41,7 +41,7 @@ struct EventDetailBar: View {
if bar.zaps > 0 { if bar.zaps > 0 {
let dst = ZapsView(state: state, target: .note(id: target, author: target_pk)) let dst = ZapsView(state: state, target: .note(id: target, author: target_pk))
NavigationLink(destination: dst) { NavigationLink(destination: dst) {
Text("\(Text(String("\(bar.zaps)")).font(.body.bold())) \(Text(String(format: NSLocalizedString("zaps_count", comment: "Part of a larger sentence to describe how many zap payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.") Text("\(Text(verbatim: "\(bar.zaps)").font(.body.bold())) \(Text(String(format: NSLocalizedString("zaps_count", comment: "Part of a larger sentence to describe how many zap payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
} }
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
} }

4
damus/Views/ChatView.swift
View File

@@ -63,7 +63,7 @@ struct ChatView: View {
} }
var ReplyDescription: some View { var ReplyDescription: some View {
Text(String("\(reply_desc(profiles: damus_state.profiles, event: event))")) Text(verbatim: "\(reply_desc(profiles: damus_state.profiles, event: event))")
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundColor(.gray)
.frame(alignment: .leading) .frame(alignment: .leading)
@@ -89,7 +89,7 @@ struct ChatView: View {
ProfileName(pubkey: event.pubkey, profile: damus_state.profiles.lookup(id: event.pubkey), damus: damus_state, show_friend_confirmed: true) ProfileName(pubkey: event.pubkey, profile: damus_state.profiles.lookup(id: event.pubkey), damus: damus_state, show_friend_confirmed: true)
.foregroundColor(colorScheme == .dark ? id_to_color(event.pubkey) : Color.black) .foregroundColor(colorScheme == .dark ? id_to_color(event.pubkey) : Color.black)
//.shadow(color: Color.black, radius: 2) //.shadow(color: Color.black, radius: 2)
Text(String("\(format_relative_time(event.created_at))")) Text(verbatim: "\(format_relative_time(event.created_at))")
.foregroundColor(.gray) .foregroundColor(.gray)
} }
} }

4
damus/Views/ConfigView.swift
View File

@@ -131,7 +131,7 @@ struct ConfigView: View {
Section(NSLocalizedString("Default Zap Amount in sats", comment: "Section title for zap configuration")) { Section(NSLocalizedString("Default Zap Amount in sats", comment: "Section title for zap configuration")) {
TextField("1000", text: $default_zap_amount) TextField(String("1000"), text: $default_zap_amount)
.keyboardType(.numberPad) .keyboardType(.numberPad)
.onReceive(Just(default_zap_amount)) { newValue in .onReceive(Just(default_zap_amount)) { newValue in
let filtered = newValue.filter { Set("0123456789").contains($0) } let filtered = newValue.filter { Set("0123456789").contains($0) }
@@ -223,7 +223,7 @@ struct ConfigView: View {
let bundleShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String let bundleShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as! String let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
Section(NSLocalizedString("Version", comment: "Section title for displaying the version number of the Damus app.")) { Section(NSLocalizedString("Version", comment: "Section title for displaying the version number of the Damus app.")) {
Text(String("\(bundleShortVersion) (\(bundleVersion))")) Text(verbatim: "\(bundleShortVersion) (\(bundleVersion))")
} }
} }
} }

4
damus/Views/CreateAccountView.swift
View File

@@ -36,14 +36,14 @@ struct CreateAccountView: View {
HStack(alignment: .top) { HStack(alignment: .top) {
VStack { VStack {
Text(String(" ")) Text(verbatim: " ")
.foregroundColor(.white) .foregroundColor(.white)
} }
VStack { VStack {
SignupForm { SignupForm {
FormLabel(NSLocalizedString("Username", comment: "Label to prompt username entry.")) FormLabel(NSLocalizedString("Username", comment: "Label to prompt username entry."))
HStack(spacing: 0.0) { HStack(spacing: 0.0) {
Text(String("@")) Text(verbatim: "@")
.foregroundColor(.white) .foregroundColor(.white)
.padding(.leading, -25.0) .padding(.leading, -25.0)

2
damus/Views/EventDetailView.swift
View File

@@ -10,7 +10,7 @@ import SwiftUI
struct EventDetailView: View { struct EventDetailView: View {
var body: some View { var body: some View {
Text(String("EventDetailView")) Text(verbatim: "EventDetailView")
} }
} }

2
damus/Views/Events/ReplyDescription.swift
View File

@@ -13,7 +13,7 @@ struct ReplyDescription: View {
let profiles: Profiles let profiles: Profiles
var body: some View { var body: some View {
Text(String("\(reply_desc(profiles: profiles, event: event))")) Text(verbatim: "\(reply_desc(profiles: profiles, event: event))")
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundColor(.gray)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)

2
damus/Views/Events/SelectedEventView.swift
View File

@@ -35,7 +35,7 @@ struct SelectedEventView: View {
BuilderEventView(damus: damus, event_id: mention.ref.id) BuilderEventView(damus: damus, event_id: mention.ref.id)
} }
Text(String("\(format_date(event.created_at))")) Text(verbatim: "\(format_date(event.created_at))")
.padding(.top, 10) .padding(.top, 10)
.font(.footnote) .font(.footnote)
.foregroundColor(.gray) .foregroundColor(.gray)

2
damus/Views/Events/TextEvent.swift
View File

@@ -33,7 +33,7 @@ struct TextEvent: View {
HStack(alignment: .center) { HStack(alignment: .center) {
EventProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, size: .normal) EventProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true, size: .normal)
Text(String("\(format_relative_time(event.created_at))")) Text(verbatim: "\(format_relative_time(event.created_at))")
.foregroundColor(.gray) .foregroundColor(.gray)
Spacer() Spacer()

2
damus/Views/MentionView.swift
View File

@@ -17,7 +17,7 @@ struct MentionView: View {
let pk = bech32_pubkey(mention.ref.ref_id) ?? mention.ref.ref_id let pk = bech32_pubkey(mention.ref.ref_id) ?? mention.ref.ref_id
PubkeyView(pubkey: pk, relay: mention.ref.relay_id) PubkeyView(pubkey: pk, relay: mention.ref.relay_id)
case .event: case .event:
Text(String("< e >")) Text(verbatim: "< e >")
//EventBlockView(pubkey: mention.ref.ref_id, relay: mention.ref.relay_id) //EventBlockView(pubkey: mention.ref.ref_id, relay: mention.ref.relay_id)
} }
} }

2
damus/Views/PowView.swift
View File

@@ -11,7 +11,7 @@ import SwiftUI
func PowView(_ mpow: Int?) -> some View func PowView(_ mpow: Int?) -> some View
{ {
let pow = mpow ?? 0 let pow = mpow ?? 0
return Text(String("\(pow)")) return Text(verbatim: "\(pow)")
.font(.callout) .font(.callout)
.foregroundColor(calculate_pow_color(pow)) .foregroundColor(calculate_pow_color(pow))
} }

6
damus/Views/ProfileView.swift
View File

@@ -318,7 +318,7 @@ struct ProfileView: View {
.foregroundColor(.gray) .foregroundColor(.gray)
} else { } else {
let followerCount = followers.count! let followerCount = followers.count!
Text("\(Text(String("\(followerCount)")).font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("followers_count", comment: "Part of a larger sentence to describe how many people are following a user."), followerCount)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many people are following a user. In source English, the first variable is the number of followers, and the second variable is 'Follower' or 'Followers'.") Text("\(Text(verbatim: "\(followerCount)").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("followers_count", comment: "Part of a larger sentence to describe how many people are following a user."), followerCount)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many people are following a user. In source English, the first variable is the number of followers, and the second variable is 'Follower' or 'Followers'.")
} }
} }
} }
@@ -344,7 +344,7 @@ struct ProfileView: View {
let following_model = FollowingModel(damus_state: damus_state, contacts: contacts) let following_model = FollowingModel(damus_state: damus_state, contacts: contacts)
NavigationLink(destination: FollowingView(damus_state: damus_state, following: following_model, whos: profile.pubkey)) { NavigationLink(destination: FollowingView(damus_state: damus_state, following: following_model, whos: profile.pubkey)) {
HStack { HStack {
Text("\(Text("\(profile.following)", comment: "Number of profiles a user is following.").font(.subheadline.weight(.medium))) \(Text("Following", comment: "Part of a larger sentence to describe how many profiles a user is following.").font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.") Text("\(Text(verbatim: "\(profile.following)").font(.subheadline.weight(.medium))) \(Text("Following", comment: "Part of a larger sentence to describe how many profiles a user is following.").font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'.")
} }
} }
.buttonStyle(PlainButtonStyle()) .buttonStyle(PlainButtonStyle())
@@ -367,7 +367,7 @@ struct ProfileView: View {
if let relays = profile.relays { if let relays = profile.relays {
// Only open relay config view if the user is logged in with private key and they are looking at their own profile. // Only open relay config view if the user is logged in with private key and they are looking at their own profile.
let relay_text = Text("\(Text("\(relays.keys.count)", comment: "Number of relay servers a user is connected.").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("relays_count", comment: "Part of a larger sentence to describe how many relay servers a user is connected."), relays.keys.count)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'.") let relay_text = Text("\(Text(verbatim: "\(relays.keys.count)").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("relays_count", comment: "Part of a larger sentence to describe how many relay servers a user is connected."), relays.keys.count)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'.")
if profile.pubkey == damus_state.pubkey && damus_state.is_privkey_user { if profile.pubkey == damus_state.pubkey && damus_state.is_privkey_user {
NavigationLink(destination: RelayConfigView(state: damus_state)) { NavigationLink(destination: RelayConfigView(state: damus_state)) {
relay_text relay_text

2
damus/Views/PubkeyView.swift
View File

@@ -14,7 +14,7 @@ struct PubkeyView: View {
var body: some View { var body: some View {
let color: Color = id_to_color(pubkey) let color: Color = id_to_color(pubkey)
ZStack { ZStack {
Text(String("\(abbrev_pubkey(pubkey))")) Text(verbatim: "\(abbrev_pubkey(pubkey))")
.foregroundColor(color) .foregroundColor(color)
} }
} }

2
damus/Views/Relays/Detail/RelayPaidDetail.swift
View File

@@ -19,7 +19,7 @@ struct RelayPaidDetail: View {
Button(action: { Button(action: {
openURL(url) openURL(url)
}, label: { }, label: {
Text(String("\(url)")) Text(verbatim: "\(url)")
}) })
} }
} }