From 2d2940314561273f9363c91bf5ec7034f24ec692 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 11 Jun 2023 14:45:03 -0400 Subject: [PATCH] Remove string referencing tipping posts, add missing localized string comments, and export strings for translation --- damus/Views/CarouselView.swift | 2 +- damus/Views/EventView.swift | 2 +- damus/Views/Events/ZapEvent.swift | 4 ++-- .../Localized Contents/en-US.xliff | 21 +++++++++++------- .../damus/en-US.lproj/Localizable.strings | Bin 89514 -> 89700 bytes 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/damus/Views/CarouselView.swift b/damus/Views/CarouselView.swift index 3c95c452..42f1110f 100644 --- a/damus/Views/CarouselView.swift +++ b/damus/Views/CarouselView.swift @@ -21,7 +21,7 @@ let carousel_items = [ CarouselItem(image: Image("undercover"), text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")), CarouselItem(image: Image("bitcoin-p2p"), - text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) + text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) ] struct CarouselView: View { diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 68cddb83..1d4d9045 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -40,7 +40,7 @@ struct EventView: View { if let zap = damus.zaps.zaps[event.id] { ZapEvent(damus: damus, zap: zap, is_top_zap: options.contains(.top_zap)) } else { - Text("Invalid Zap") + Text("Invalid Zap", comment: "Text indicating that a zap event is malformed and could not be displayed.") EmptyView() } } else { diff --git a/damus/Views/Events/ZapEvent.swift b/damus/Views/Events/ZapEvent.swift index 2fe29b2d..cb39a635 100644 --- a/damus/Views/Events/ZapEvent.swift +++ b/damus/Views/Events/ZapEvent.swift @@ -18,11 +18,11 @@ struct ZapEvent: View { Image("zap.fill") .foregroundColor(.orange) - Text("\(format_msats(zap.amount))", comment: "Text indicating the zap amount. i.e. number of satoshis that were tipped to a user") + Text(verbatim: format_msats(zap.amount)) .font(.headline) if is_top_zap { - Text("Top Zap") + Text("Top Zap", comment: "Text indicating that this zap is the one with the highest amount of sats.") .font(.caption) .foregroundColor(.gray) .padding([.top], 2) diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index 63d1a138..7d6c40c5 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -73,9 +73,9 @@ Sentence composed of 2 variables to describe how many people are following a use %@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string. - - %@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet. - %@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet. + + %@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet. + %@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet. Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string. @@ -651,6 +651,11 @@ Sentence composed of 2 variables to describe how many people are following a use Invalid Tip Address Title of alerting as invalid tip address. + + Invalid Zap + Invalid Zap + Text indicating that a zap event is malformed and could not be displayed. + Invalid key Invalid key @@ -1395,6 +1400,11 @@ Button text to indicate that the zap type is a private zap. Thread Navigation bar title for note thread. + + Top Zap + Top Zap + Text indicating that this zap is the one with the highest amount of sats. + Translate DMs Translate DMs @@ -1802,11 +1812,6 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. %@ and %@ zapped your profile Notification that 2 users zapped the current user's profile - - ⚡️ %@ - ⚡️ %@ - Text indicating the zap amount. i.e. number of satoshis that were tipped to a user - diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index df66dccbe57304842d8a8f51d1736d70233500ab..d16e4855e126fdb6c04c88670d9b121c533a7fce 100644 GIT binary patch delta 262 zcmZ3roAt>a)(uT+lP9R{0^**@Crm5hBStJh9V$4l_3QvmIzb{6JgOl;d61jIHZdpxS++o|#DF3`+16coyP6K; GDgywbuu2L5 delta 205 zcmaE|hjrC%)(uT+%<2rqlM}neC-9%44`l^P_hKbN(7P$4CO#YML-M^%Va13!c>No>5cr1q6P{KS`7LOTntJK3)T4l XDKMxqH~`rS47NawDrOB-#l-*sGYB