damus

nostr ios client
git clone git://jb55.com/damus
Log | Files | Refs | README | LICENSE

commit 915f3901a751239b8c5529ebfa309b8cb1ec8460
parent 39f39c7382512f1fbf1a570d258ff65dd0f65ef6
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 31 Mar 2023 10:30:02 -0700

Merge remote-tracking branch 'github/translations'

Diffstat:
MCHANGELOG.md | 31+++++++++++++++++++++++++++----
Mdamus/ContentView.swift | 26++++++--------------------
Mdamus/Models/HomeModel.swift | 37++++++++++++++++++++++---------------
Mdamus/Util/DisplayName.swift | 2+-
Mdamus/Views/Notifications/EventGroupView.swift | 2+-
Mdamus/Views/UserRelaysView.swift | 6+++---
Mdamus/cs.lproj/InfoPlist.strings | 0
Mdamus/cs.lproj/Localizable.strings | 0
Mdamus/cs.lproj/Localizable.stringsdict | 40++++++++++++++++++++++++++++++++++++++++
Mdamus/de.lproj/InfoPlist.strings | 0
Mdamus/de.lproj/Localizable.strings | 0
Mdamus/de.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/en-US.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/en-US.xcloc/Localized Contents/en-US.xliff | 113++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
Mdamus/en-US.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings | 4++++
Mdamus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings | 0
Mdamus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/en-US.xcloc/contents.json | 4++--
Mdamus/es-419.lproj/InfoPlist.strings | 0
Mdamus/es-419.lproj/Localizable.strings | 0
Mdamus/es-419.lproj/Localizable.stringsdict | 36++++++++++++++++++++++++++++++++++++
Mdamus/es-ES.lproj/InfoPlist.strings | 0
Mdamus/es-ES.lproj/Localizable.strings | 0
Mdamus/es-ES.lproj/Localizable.stringsdict | 36++++++++++++++++++++++++++++++++++++
Mdamus/fr-CA.lproj/InfoPlist.strings | 0
Mdamus/fr-CA.lproj/Localizable.strings | 0
Mdamus/fr-CA.lproj/Localizable.stringsdict | 36++++++++++++++++++++++++++++++++++++
Mdamus/fr-FR.lproj/InfoPlist.strings | 0
Mdamus/fr-FR.lproj/Localizable.strings | 0
Mdamus/fr-FR.lproj/Localizable.stringsdict | 36++++++++++++++++++++++++++++++++++++
Mdamus/hu-HU.lproj/Localizable.strings | 0
Mdamus/hu-HU.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/ja.lproj/Localizable.strings | 0
Mdamus/ja.lproj/Localizable.stringsdict | 28++++++++++++++++++++++++++++
Mdamus/nl.lproj/InfoPlist.strings | 0
Mdamus/nl.lproj/Localizable.strings | 0
Mdamus/nl.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/pl-PL.lproj/Localizable.strings | 0
Mdamus/pl-PL.lproj/Localizable.stringsdict | 40++++++++++++++++++++++++++++++++++++++++
Mdamus/pt-BR.lproj/Localizable.strings | 0
Mdamus/pt-BR.lproj/Localizable.stringsdict | 36++++++++++++++++++++++++++++++++++++
Mdamus/ru.lproj/InfoPlist.strings | 0
Mdamus/ru.lproj/Localizable.strings | 0
Mdamus/ru.lproj/Localizable.stringsdict | 44++++++++++++++++++++++++++++++++++++++++++--
Mdamus/sv-SE.lproj/Localizable.strings | 0
Mdamus/sv-SE.lproj/Localizable.stringsdict | 32++++++++++++++++++++++++++++++++
Mdamus/vi.lproj/InfoPlist.strings | 0
Mdamus/vi.lproj/Localizable.strings | 0
Mdamus/vi.lproj/Localizable.stringsdict | 28++++++++++++++++++++++++++++
Mdamus/zh-CN.lproj/InfoPlist.strings | 0
Mdamus/zh-CN.lproj/Localizable.strings | 0
Mdamus/zh-CN.lproj/Localizable.stringsdict | 30+++++++++++++++++++++++++++++-
Mdamus/zh-HK.lproj/InfoPlist.strings | 0
Mdamus/zh-HK.lproj/Localizable.strings | 0
Mdamus/zh-HK.lproj/Localizable.stringsdict | 28++++++++++++++++++++++++++++
Mdamus/zh-TW.lproj/InfoPlist.strings | 0
Mdamus/zh-TW.lproj/Localizable.strings | 0
Mdamus/zh-TW.lproj/Localizable.stringsdict | 28++++++++++++++++++++++++++++
MdamusTests/ZapTests.swift | 3+++
59 files changed, 802 insertions(+), 64 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -5,6 +5,9 @@ - Local zap notifications (Swift) - Add support for video uploads (Swift) - Auto Translation (Terry Yiu) +- Portuguese (Brazil) translations (Andressa Munturo) +- Spanish (Spain) translations (Max Pleb) +- Vietnamese translations (ShiryoRyo) ### Fixed @@ -72,6 +75,10 @@ - Add image uploader (Swift) - Add option to always show images (never blur) (William Casarin) +- Canadian French (Pierre - synoptic_okubo) +- Hungarian translations (Zoltan) +- Korean translations (sogoagain) +- Swedish translations (Pextar) ### Changed @@ -94,6 +101,9 @@ - Extend user tagging search to all local profiles (William Casarin) - Vibrate when a zap is received (Swift) - New and Improved Share sheet (ericholguin) +- Bulgarian translations (elsat) +- Persian translations (Mahdi Taghizadeh) +- Ukrainian translations (Valeriia Khudiakova, Tony B) ### Changed @@ -192,6 +202,8 @@ - Customized zaps (William Casarin) - Add new Notifications View (William Casarin) - Bookmarking (Joel Klabo) +- Chinese, Traditional (Hong Kong) translations (rasputin) +- Chinese, Traditional (Taiwan) translations (rasputin) ### Changed @@ -217,6 +229,9 @@ - Added the ability to select text on posts (OlegAba) - Added Posts or Post & Replies selector to Profile (ericholguin) - Improved profile navbar (OlegAba) +- Czech translations (Martin Gabrhel) +- Indonesian translations (johnybergzy) +- Russian translations (Tony B) ### Changed @@ -265,7 +280,6 @@ ### Added - Relay Filtering (William Casarin) -- Japanese translations (Terry Yiu) - Add password autofill on account login and creation (Terry Yiu) - Show if relay is paid (William Casarin) - Add "Follows You" indicator on profile (William Casarin) @@ -278,6 +292,10 @@ - Copy invoice button (Joel Klabo) - Receive Lightning Zaps (William Casarin) - Allow text selection in bio (Suhail Saqan) +- Chinese, Simplified (China mainland) translations (haolong, rasputin) +- Dutch translations (Heimen Stoffels - Vistaus) +- Greek translations (milicode) +- Japanese translations (akiomik, foxytanuki, Guetsu Ren - Nighthaven, h3y6e, middlingphys) ### Changed @@ -312,6 +330,7 @@ - LibreTranslate note translations (Terry Yiu) - Added support for account deletion (William Casarin) - User tagging and autocompletion in posts (Swift) +- Polish translations (pysiak) ### Changed @@ -334,7 +353,8 @@ ### Added -- Added Arabic and Portuguese translations (Barodane, Antonio Chagas) +- Arabic translations (Barodane) +- Portuguese translations (Antonio Chagas) - Add QRCode view for sharing your pubkey (ericholguin) - Added nostr: uri handling (William Casarin) @@ -361,7 +381,8 @@ ### Added - Reposts view (Terry Yiu) -- Translations for it_IT, it_CH, fr_FR, de_DE, de_AT and lv_LV (Nicolò Carcagnì, Solobalbo, Gregor, Peter Gerstbach, SYX) +- Italian translations (Nicolò Carcagnì) +- Latvian translations (SYX) - Added ability to block users (William Casarin) - Added a way to report content (William Casarin) - Stretchable profile cover header (Swift) @@ -388,7 +409,9 @@ - Show website on profiles (William Casarin) - Add the ability to choose participants when replying (Joel Klabo) -- Translations for de_AT, de_DE, tr_TR, fr_FR (Gregor, Peter Gerstbach, Taylan Benli, Solobalbo) +- German translations (Gregor, Peter Gerstbach) +- Turkish translations (Taylan Benli) +- French (France) translations (Solobalbo) - Add DM Message Requests (William Casarin) diff --git a/damus/ContentView.swift b/damus/ContentView.swift @@ -147,22 +147,8 @@ struct ContentView: View { } var timelineNavItem: Text { - switch selected_timeline { - case .home: - return Text("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") - .bold() - case .dms: - return Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.") - .bold() - case .notifications: - return Text("Notifications", comment: "Toolbar label for Notifications view.") - .bold() - case .search: - return Text("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.") - .bold() - case .none: - return Text(verbatim: "") - } + return Text(timeline_name(selected_timeline)) + .bold() } func MainContent(damus: DamusState) -> some View { @@ -833,12 +819,12 @@ func timeline_name(_ timeline: Timeline?) -> String { } switch timeline { case .home: - return "Home" + return NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") case .notifications: - return "Notifications" + return NSLocalizedString("Notifications", comment: "Toolbar label for Notifications view.") case .search: - return "Universe 🛸" + return NSLocalizedString("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.") case .dms: - return "DMs" + return NSLocalizedString("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.") } } diff --git a/damus/Models/HomeModel.swift b/damus/Models/HomeModel.swift @@ -933,30 +933,37 @@ func zap_vibrate(zap_amount: Int64) { vibration_generator.impactOccurred() } -func describe_zap_type(_ zap: Zap) -> String? { +func zap_notification_title(_ zap: Zap) -> String { if zap.private_request != nil { - return "Private" + return NSLocalizedString("Private Zap", comment: "Title of notification when a private zap is received.") + } else { + return NSLocalizedString("Zap", comment: "Title of notification when a non-private zap is received.") } - - return nil } -func create_in_app_zap_notification(profiles: Profiles, zap: Zap) { - let content = UNMutableNotificationContent() - let typ = describe_zap_type(zap).map({ "\($0) " }) ?? "" - - content.title = typ + "Zap" - let satString = zap.invoice.amount == 1000 ? "sat" : "sats" - +func zap_notification_body(profiles: Profiles, zap: Zap, locale: Locale = Locale.current) -> String { let src = zap.private_request ?? zap.request.ev let anon = event_is_anonymous(ev: src) let pk = anon ? "anon" : src.pubkey let profile = profiles.lookup(id: pk) - let sats = format_msats_abbrev(zap.invoice.amount) + let sats = NSNumber(value: (Double(zap.invoice.amount) / 1000.0)) + let formattedSats = format_msats_abbrev(zap.invoice.amount) let name = Profile.displayName(profile: profile, pubkey: pk).display_name - let message = src.content.count == 0 ? "" : ": \"\(src.content)\"" - - content.body = "You received \(sats) \(satString) from \(name)\(message)" + + if src.content.isEmpty { + let format = localizedStringFormat(key: "zap_notification_no_message", locale: locale) + return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats, name) + } else { + let format = localizedStringFormat(key: "zap_notification_with_message", locale: locale) + return String(format: format, locale: locale, sats.decimalValue as NSDecimalNumber, formattedSats, name, src.content) + } +} + +func create_in_app_zap_notification(profiles: Profiles, zap: Zap, locale: Locale = Locale.current) { + let content = UNMutableNotificationContent() + + content.title = zap_notification_title(zap) + content.body = zap_notification_body(profiles: profiles, zap: zap, locale: locale) content.sound = UNNotificationSound.default let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false) diff --git a/damus/Util/DisplayName.swift b/damus/Util/DisplayName.swift @@ -39,7 +39,7 @@ enum DisplayName { func parse_display_name(profile: Profile?, pubkey: String) -> DisplayName { if pubkey == "anon" { - return .one("Anonymous") + return .one(NSLocalizedString("Anonymous", comment: "Placeholder display name of anonymous user.")) } guard let profile else { diff --git a/damus/Views/Notifications/EventGroupView.swift b/damus/Views/Notifications/EventGroupView.swift @@ -73,7 +73,7 @@ func event_group_author_name(profiles: Profiles, ind: Int, group: EventGroupType } if zap.is_anon { - return "Anonymous" + return NSLocalizedString("Anonymous", comment: "Placeholder author name of the anonymous person who zapped an event.") } return event_author_name(profiles: profiles, pubkey: zap.request.ev.pubkey) diff --git a/damus/Views/UserRelaysView.swift b/damus/Views/UserRelaysView.swift @@ -36,15 +36,15 @@ struct UserRelaysView: View { .onReceive(handle_notify(.relays_changed)) { _ in self.relay_state = UserRelaysView.make_relay_state(pool: state.pool, relays: self.relays) } - .navigationBarTitle("Relays") + .navigationBarTitle(NSLocalizedString("Relays", comment: "Navigation bar title that shows the list of relays for a user.")) .toolbar{ if state.keypair.privkey != nil { if showAddButton { - Button("Done") { + Button(NSLocalizedString("Done", comment: "Button that, when tapped, will finish adding a different user's relays to your relay by hiding the + buttons next to the relays.")) { showAddButton.toggle() } } else { - Button("Show Add") { + Button(NSLocalizedString("Show +", comment: "Button that, when tapped, will show + buttons next to a user's relays.")) { showAddButton.toggle() } } diff --git a/damus/cs.lproj/InfoPlist.strings b/damus/cs.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings Binary files differ. diff --git a/damus/cs.lproj/Localizable.stringsdict b/damus/cs.lproj/Localizable.stringsdict @@ -282,6 +282,46 @@ <string>%2$@ satů</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Dostal jsi %2$@ sat od %3$@</string> + <key>few</key> + <string>Dostal jsi %2$@ satů od %3$@</string> + <key>many</key> + <string>Dostal jsi %2$@ satů od %3$@</string> + <key>other</key> + <string>Dostal jsi %2$@ satů od %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Dostal jsi %2$@ sat od %3$@: "%4$@"</string> + <key>few</key> + <string>Dostal jsi %2$@ satů od %3$@: "%4$@"</string> + <key>many</key> + <string>Dostal jsi %2$@ satů od %3$@: "%4$@"</string> + <key>other</key> + <string>Dostal jsi %2$@ satů od %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/de.lproj/InfoPlist.strings b/damus/de.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/de.lproj/Localizable.strings b/damus/de.lproj/Localizable.strings Binary files differ. diff --git a/damus/de.lproj/Localizable.stringsdict b/damus/de.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Du hast %2$@ Sat von %3$@ erhalten</string> + <key>other</key> + <string>Du hast %2$@ Sats von %3$@ erhalten</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Du hast %2$@ Sat von %3$@ erhalten: "%4$@"</string> + <key>other</key> + <string>Du hast %2$@ Sats von %3$@ erhalten: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>You received %2$@ sat from %3$@</string> + <key>other</key> + <string>You received %2$@ sats from %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>You received %2$@ sat from %3$@: "%4$@"</string> + <key>other</key> + <string>You received %2$@ sats from %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -2,7 +2,7 @@ <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd"> <file original="damus/en-US.lproj/InfoPlist.strings" source-language="en-US" target-language="en-US" datatype="plaintext"> <header> - <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/> + <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3" build-num="14E222b"/> </header> <body> <trans-unit id="CFBundleDisplayName" xml:space="preserve"> @@ -15,11 +15,21 @@ <target>damus</target> <note>Bundle name</note> </trans-unit> + <trans-unit id="NSCameraUsageDescription" xml:space="preserve"> + <source>Damus needs access to your camera if you want to upload photos from it</source> + <target>Damus needs access to your camera if you want to upload photos from it</target> + <note>Privacy - Camera Usage Description</note> + </trans-unit> <trans-unit id="NSFaceIDUsageDescription" xml:space="preserve"> <source>Local authentication to access private key</source> <target>Local authentication to access private key</target> <note>Privacy - Face ID Usage Description</note> </trans-unit> + <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve"> + <source>Damus needs access to your microphone if you want to upload recorded videos from it</source> + <target>Damus needs access to your microphone if you want to upload recorded videos from it</target> + <note>Privacy - Microphone Usage Description</note> + </trans-unit> <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve"> <source>Granting Damus access to your photos allows you to save images.</source> <target>Granting Damus access to your photos allows you to save images.</target> @@ -29,7 +39,7 @@ </file> <file original="damus/en-US.lproj/Localizable.strings" source-language="en-US" target-language="en-US" datatype="plaintext"> <header> - <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/> + <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3" build-num="14E222b"/> </header> <body> <trans-unit id="%@" xml:space="preserve"> @@ -139,12 +149,6 @@ Sentence composed of 2 variables to describe how many people are following a use <note>Button text to add bookmark to a note. Context menu option for adding a note bookmark.</note> </trans-unit> - <trans-unit id="Add Relay" xml:space="preserve"> - <source>Add Relay</source> - <target>Add Relay</target> - <note>Button to add recommended relay server. - Label for section for adding a relay server.</note> - </trans-unit> <trans-unit id="Add all" xml:space="preserve"> <source>Add all</source> <target>Add all</target> @@ -168,7 +172,8 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="Anonymous" xml:space="preserve"> <source>Anonymous</source> <target>Anonymous</target> - <note>Picker option to indicate that a zap should be sent anonymously and not identify the user as who sent it.</note> + <note>Placeholder author name of the anonymous person who zapped an event. + Placeholder display name of anonymous user.</note> </trans-unit> <trans-unit id="Any" xml:space="preserve"> <source>Any</source> @@ -180,6 +185,11 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Are you sure you want to repost this?</target> <note>Alert message to ask if user wants to repost a post.</note> </trans-unit> + <trans-unit id="Automatically translate notes" xml:space="preserve"> + <source>Automatically translate notes</source> + <target>Automatically translate notes</target> + <note>Toggle to automatically translate notes.</note> + </trans-unit> <trans-unit id="Awesome post!" xml:space="preserve"> <source>Awesome post!</source> <target>Awesome post!</target> @@ -296,6 +306,21 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Comment</target> <note>Header text to indicate that the text field below it is a comment that will be used to send as part of a zap to the user.</note> </trans-unit> + <trans-unit id="Connect" xml:space="preserve"> + <source>Connect</source> + <target>Connect</target> + <note>Button to connect to recommended relay server.</note> + </trans-unit> + <trans-unit id="Connect To Relay" xml:space="preserve"> + <source>Connect To Relay</source> + <target>Connect To Relay</target> + <note>Label for section for adding a relay server.</note> + </trans-unit> + <trans-unit id="Connected Relays" xml:space="preserve"> + <source>Connected Relays</source> + <target>Connected Relays</target> + <note>Section title for relay servers that are connected.</note> + </trans-unit> <trans-unit id="Contact" xml:space="preserve"> <source>Contact</source> <target>Contact</target> @@ -411,7 +436,8 @@ Sentence composed of 2 variables to describe how many people are following a use <source>DMs</source> <target>DMs</target> <note>Navigation title for DMs view, where DM is the English abbreviation for Direct Message. - Navigation title for view of DMs, where DM is an English abbreviation for Direct Message.</note> + Navigation title for view of DMs, where DM is an English abbreviation for Direct Message. + Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.</note> </trans-unit> <trans-unit id="Damus" xml:space="preserve"> <source>Damus</source> @@ -437,7 +463,6 @@ Sentence composed of 2 variables to describe how many people are following a use <source>Delete</source> <target>Delete</target> <note>Button for deleting the users account. - Button to delete a relay server that the user connects to. Button to remove a user from their blocklist.</note> </trans-unit> <trans-unit id="Delete Account" xml:space="preserve"> @@ -460,6 +485,16 @@ Sentence composed of 2 variables to describe how many people are following a use <target>Disable animations</target> <note>Button to disable image animation</note> </trans-unit> + <trans-unit id="Disconnect" xml:space="preserve"> + <source>Disconnect</source> + <target>Disconnect</target> + <note>Button to disconnect from a relay server.</note> + </trans-unit> + <trans-unit id="Disconnect From Relay" xml:space="preserve"> + <source>Disconnect From Relay</source> + <target>Disconnect From Relay</target> + <note>Button to disconnect from the relay.</note> + </trans-unit> <trans-unit id="Dismiss" xml:space="preserve"> <source>Dismiss</source> <target>Dismiss</target> @@ -473,7 +508,7 @@ Sentence composed of 2 variables to describe how many people are following a use <trans-unit id="Done" xml:space="preserve"> <source>Done</source> <target>Done</target> - <note>Button to dismiss wallet selection view for paying Lightning invoice.</note> + <note>Button that, when tapped, will finish adding a different user's relays to your relay by hiding the + buttons next to the relays.</note> </trans-unit> <trans-unit id="EULA" xml:space="preserve"> <source>EULA</source> @@ -838,6 +873,11 @@ Picker option to indicate that a zap should be sent privately and not identify t <target>Private Key</target> <note>Title of the secure field that holds the user's private key.</note> </trans-unit> + <trans-unit id="Private Zap" xml:space="preserve"> + <source>Private Zap</source> + <target>Private Zap</target> + <note>Title of notification when a private zap is received.</note> + </trans-unit> <trans-unit id="Pro" xml:space="preserve"> <source>Pro</source> <target>Pro</target> @@ -902,7 +942,9 @@ Picker option to indicate that a zap should be sent privately and not identify t <trans-unit id="Relays" xml:space="preserve"> <source>Relays</source> <target>Relays</target> - <note>Sidebar menu label for Relays view.</note> + <note>Navigation bar title that shows the list of relays for a user. + Sidebar menu label for Relays view. + Title of relays view</note> </trans-unit> <trans-unit id="Relays have been notified and clients will be able to use this information to filter content. Thank you!" xml:space="preserve"> <source>Relays have been notified and clients will be able to use this information to filter content. Thank you!</source> @@ -1086,6 +1128,11 @@ Picker option to indicate that a zap should be sent privately and not identify t <note>Button to show a post from a user who has been blocked. Toggle to show or hide user's secret account login key.</note> </trans-unit> + <trans-unit id="Show +" xml:space="preserve"> + <source>Show +</source> + <target>Show +</target> + <note>Button that, when tapped, will show + buttons next to a user's relays.</note> + </trans-unit> <trans-unit id="Show API Key" xml:space="preserve"> <source>Show API Key</source> <target>Show API Key</target> @@ -1097,6 +1144,11 @@ Picker option to indicate that a zap should be sent privately and not identify t <target>Show more</target> <note>Button to show entire note.</note> </trans-unit> + <trans-unit id="Show only preferred languages on Universe feed" xml:space="preserve"> + <source>Show only preferred languages on Universe feed</source> + <target>Show only preferred languages on Universe feed</target> + <note>Toggle to show notes that are only in the device's preferred languages on the Universe feed and hide notes that are in other languages.</note> + </trans-unit> <trans-unit id="Show wallet selector" xml:space="preserve"> <source>Show wallet selector</source> <target>Show wallet selector</target> @@ -1325,7 +1377,8 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. <source>Zap</source> <target>Zap</target> <note>Accessibility label for zap button - Button to send a zap.</note> + Button to send a zap. + Title of notification when a non-private zap is received.</note> </trans-unit> <trans-unit id="Zap Amount" xml:space="preserve"> <source>Zap Amount</source> @@ -1531,7 +1584,7 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. </file> <file original="damus/en-US.lproj/Localizable.stringsdict" source-language="en-US" target-language="en-US" datatype="plaintext"> <header> - <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.2" build-num="14C18"/> + <tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="14.3" build-num="14E222b"/> </header> <body> <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/one:dict/:string" xml:space="preserve"> @@ -1744,6 +1797,36 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. <target>%2$@ sats</target> <note/> </trans-unit> + <trans-unit id="/zap_notification_no_message:dict/NOTIFICATION:dict/one:dict/:string" xml:space="preserve"> + <source>You received %2$@ sat from %3$@</source> + <target>You received %2$@ sat from %3$@</target> + <note/> + </trans-unit> + <trans-unit id="/zap_notification_no_message:dict/NOTIFICATION:dict/other:dict/:string" xml:space="preserve"> + <source>You received %2$@ sats from %3$@</source> + <target>You received %2$@ sats from %3$@</target> + <note/> + </trans-unit> + <trans-unit id="/zap_notification_no_message:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> + <source>%1$#@NOTIFICATION@</source> + <target>%1$#@NOTIFICATION@</target> + <note/> + </trans-unit> + <trans-unit id="/zap_notification_with_message:dict/NOTIFICATION:dict/one:dict/:string" xml:space="preserve"> + <source>You received %2$@ sat from %3$@: "%4$@"</source> + <target>You received %2$@ sat from %3$@: "%4$@"</target> + <note/> + </trans-unit> + <trans-unit id="/zap_notification_with_message:dict/NOTIFICATION:dict/other:dict/:string" xml:space="preserve"> + <source>You received %2$@ sats from %3$@: "%4$@"</source> + <target>You received %2$@ sats from %3$@: "%4$@"</target> + <note/> + </trans-unit> + <trans-unit id="/zap_notification_with_message:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> + <source>%1$#@NOTIFICATION@</source> + <target>%1$#@NOTIFICATION@</target> + <note/> + </trans-unit> <trans-unit id="/zapped_tagged_in_3:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@ZAPPED@</source> <target>%#@ZAPPED@</target> diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/InfoPlist.strings @@ -2,7 +2,11 @@ "CFBundleDisplayName" = "Damus"; /* Bundle name */ "CFBundleName" = "damus"; +/* Privacy - Camera Usage Description */ +"NSCameraUsageDescription" = "Damus needs access to your camera if you want to upload photos from it"; /* Privacy - Face ID Usage Description */ "NSFaceIDUsageDescription" = "Local authentication to access private key"; +/* Privacy - Microphone Usage Description */ +"NSMicrophoneUsageDescription" = "Damus needs access to your microphone if you want to upload recorded videos from it"; /* Privacy - Photo Library Additions Usage Description */ "NSPhotoLibraryAddUsageDescription" = "Granting Damus access to your photos allows you to save images."; 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 Binary files differ. diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>You received %2$@ sat from %3$@</string> + <key>other</key> + <string>You received %2$@ sats from %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>You received %2$@ sat from %3$@: "%4$@"</string> + <key>other</key> + <string>You received %2$@ sats from %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/en-US.xcloc/contents.json b/damus/en-US.xcloc/contents.json @@ -3,10 +3,10 @@ "project" : "damus.xcodeproj", "targetLocale" : "en-US", "toolInfo" : { - "toolBuildNumber" : "14C18", + "toolBuildNumber" : "14E222b", "toolID" : "com.apple.dt.xcode", "toolName" : "Xcode", - "toolVersion" : "14.2" + "toolVersion" : "14.3" }, "version" : "1.0" } \ No newline at end of file diff --git a/damus/es-419.lproj/InfoPlist.strings b/damus/es-419.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/es-419.lproj/Localizable.strings b/damus/es-419.lproj/Localizable.strings Binary files differ. diff --git a/damus/es-419.lproj/Localizable.stringsdict b/damus/es-419.lproj/Localizable.stringsdict @@ -254,6 +254,42 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Recibiste %2$@ sat de %3$@</string> + <key>many</key> + <string>Recibiste %2$@ sats de %3$@</string> + <key>other</key> + <string>Recibiste %2$@ sats de %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Recibiste %2$@ sat de %3$@: "%4$@"</string> + <key>many</key> + <string>Recibiste %2$@ sats de %3$@: "%4$@"</string> + <key>other</key> + <string>Recibiste %2$@ sats de %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/es-ES.lproj/InfoPlist.strings b/damus/es-ES.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/es-ES.lproj/Localizable.strings b/damus/es-ES.lproj/Localizable.strings Binary files differ. diff --git a/damus/es-ES.lproj/Localizable.stringsdict b/damus/es-ES.lproj/Localizable.stringsdict @@ -254,6 +254,42 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Has recibido %2$@ sat de %3$@</string> + <key>many</key> + <string>Has recibido %2$@ sats de %3$@</string> + <key>other</key> + <string>Has recibido %2$@ sats de %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Has recibido %2$@ sat de %3$@: "%4$@"</string> + <key>many</key> + <string>Has recibido %2$@ sats de %3$@: "%4$@"</string> + <key>other</key> + <string>Has recibido %2$@ sats de %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/fr-CA.lproj/InfoPlist.strings b/damus/fr-CA.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/fr-CA.lproj/Localizable.strings b/damus/fr-CA.lproj/Localizable.strings Binary files differ. diff --git a/damus/fr-CA.lproj/Localizable.stringsdict b/damus/fr-CA.lproj/Localizable.stringsdict @@ -254,6 +254,42 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Vous avez reçu %2$@ sat de %3$@</string> + <key>many</key> + <string>Vous avez reçu %2$@ sats de %3$@</string> + <key>other</key> + <string>Vous avez reçu %2$@ sats de %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>You received %2$@ sat from %3$@: "%4$@"</string> + <key>many</key> + <string>You received %2$@ sats from %3$@: "%4$@"</string> + <key>other</key> + <string>You received %2$@ sats from %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/fr-FR.lproj/InfoPlist.strings b/damus/fr-FR.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/fr-FR.lproj/Localizable.strings b/damus/fr-FR.lproj/Localizable.strings Binary files differ. diff --git a/damus/fr-FR.lproj/Localizable.stringsdict b/damus/fr-FR.lproj/Localizable.stringsdict @@ -254,6 +254,42 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Vous avez reçu %2$@ sat de %3$@</string> + <key>many</key> + <string>Vous avez reçu %2$@ sats de %3$@</string> + <key>other</key> + <string>Vous avez reçu %2$@ sats de %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Vous avez reçu %2$@ sat de %3$@: "%4$@"</string> + <key>many</key> + <string>Vous avez reçu %2$@ sats de %3$@: "%4$@"</string> + <key>other</key> + <string>Vous avez reçu %2$@ sats de %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/hu-HU.lproj/Localizable.strings b/damus/hu-HU.lproj/Localizable.strings Binary files differ. diff --git a/damus/hu-HU.lproj/Localizable.stringsdict b/damus/hu-HU.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat kaptál %3$@-tól</string> + <key>other</key> + <string>%2$@ sats kaptál %3$@-tól</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat kaptál %3$@: "%4$@"-tól</string> + <key>other</key> + <string>%2$@ sats kaptál %3$@: "%4$@"-tól</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/ja.lproj/Localizable.strings b/damus/ja.lproj/Localizable.strings Binary files differ. diff --git a/damus/ja.lproj/Localizable.stringsdict b/damus/ja.lproj/Localizable.stringsdict @@ -198,6 +198,34 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>%3$@ から %2$@ sats を受け取りました</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>%3$@ から %2$@ sats を受け取りました: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/nl.lproj/InfoPlist.strings b/damus/nl.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings Binary files differ. diff --git a/damus/nl.lproj/Localizable.stringsdict b/damus/nl.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Je hebt %2$@ sat ontvangen van %3$@</string> + <key>other</key> + <string>Je hebt %2$@ sats ontvangen van %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Je hebt %2$@ sat ontvangen van %3$@: “%4$@”</string> + <key>other</key> + <string>Je hebt %2$@ sats ontvangen van %3$@: “%4$@”</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/pl-PL.lproj/Localizable.strings b/damus/pl-PL.lproj/Localizable.strings Binary files differ. diff --git a/damus/pl-PL.lproj/Localizable.stringsdict b/damus/pl-PL.lproj/Localizable.stringsdict @@ -282,6 +282,46 @@ <string>%2$@ satsa</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Otrzymano %2$@ sat od %3$@</string> + <key>few</key> + <string>Otrzymano %2$@ satsy od %3$@</string> + <key>many</key> + <string>Otrzymano %2$@ satsów od %3$@</string> + <key>other</key> + <string>Otrzymano %2$@ satsa od %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Otrzymano %2$@ sat od %3$@: "%4$@"</string> + <key>few</key> + <string>Otrzymano %2$@ satsy od %3$@: "%4$@"</string> + <key>many</key> + <string>Otrzymano %2$@ satsów od %3$@: "%4$@"</string> + <key>other</key> + <string>Otrzymano %2$@ satsa od %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/pt-BR.lproj/Localizable.strings b/damus/pt-BR.lproj/Localizable.strings Binary files differ. diff --git a/damus/pt-BR.lproj/Localizable.stringsdict b/damus/pt-BR.lproj/Localizable.stringsdict @@ -254,6 +254,42 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Você recebeu %2$@ sats de %3$@</string> + <key>many</key> + <string>Você recebeu %2$@ sats de %3$@</string> + <key>other</key> + <string>Você recebeu %2$@ sats de %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Você recebeu %2$@ sats de %3$@: "%4$@"</string> + <key>many</key> + <string>Você recebeu %2$@ sats de %3$@: "%4$@"</string> + <key>other</key> + <string>Você recebeu %2$@ sats de %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/ru.lproj/InfoPlist.strings b/damus/ru.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/ru.lproj/Localizable.strings b/damus/ru.lproj/Localizable.strings Binary files differ. diff --git a/damus/ru.lproj/Localizable.stringsdict b/damus/ru.lproj/Localizable.stringsdict @@ -275,13 +275,53 @@ <key>one</key> <string>%2$@ сат</string> <key>few</key> - <string>%2$@ sats</string> + <string>%2$@ сат</string> <key>many</key> - <string>%2$@ sats</string> + <string>%2$@ сат</string> <key>other</key> <string>%2$@ сат</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Вы получили %2$@ сат от %3$@</string> + <key>few</key> + <string>Вы получили %2$@ сат от %3$@</string> + <key>many</key> + <string>Вы получили %2$@ сат от %3$@</string> + <key>other</key> + <string>Вы получили %2$@ сат от %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <key>few</key> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <key>many</key> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + <key>other</key> + <string>Вы получили %2$@ сат от %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings Binary files differ. diff --git a/damus/sv-SE.lproj/Localizable.stringsdict b/damus/sv-SE.lproj/Localizable.stringsdict @@ -226,6 +226,38 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Du fick %2$@ sat från %3$@</string> + <key>other</key> + <string>Du fick %2$@ sats från %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>Du fick %2$@ sat från %3$@: "%4$@"</string> + <key>other</key> + <string>Du fick %2$@ sats från %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/vi.lproj/InfoPlist.strings b/damus/vi.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/vi.lproj/Localizable.strings b/damus/vi.lproj/Localizable.strings Binary files differ. diff --git a/damus/vi.lproj/Localizable.stringsdict b/damus/vi.lproj/Localizable.stringsdict @@ -198,6 +198,34 @@ <string>%2$@ sats</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>Bạn đã nhận được %2$@ sats từ %3$@</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>Bạn đã nhận được %2$@ sats từ %3$@: "%4$@"</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/zh-CN.lproj/InfoPlist.strings b/damus/zh-CN.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/zh-CN.lproj/Localizable.strings b/damus/zh-CN.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-CN.lproj/Localizable.stringsdict b/damus/zh-CN.lproj/Localizable.stringsdict @@ -198,6 +198,34 @@ <string>%2$@ 聪</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你从 %3$@ 收到了 %2$@ 聪</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你从 %3$@: "%4$@" 收到了 %2$@ 聪</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -223,7 +251,7 @@ <key>NSStringFormatValueTypeKey</key> <string>d</string> <key>other</key> - <string>%2$@ 和 %1$d 个其他用户电击了你的推文</string> + <string>%2$@ 和 %1$d 个其他用户电击了你的便条</string> </dict> </dict> <key>zapped_your_profile_3</key> diff --git a/damus/zh-HK.lproj/InfoPlist.strings b/damus/zh-HK.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/zh-HK.lproj/Localizable.strings b/damus/zh-HK.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-HK.lproj/Localizable.stringsdict b/damus/zh-HK.lproj/Localizable.stringsdict @@ -198,6 +198,34 @@ <string>%2$@ 聰</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你從 %3$@ 收到了%2$@ 聰</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你從 %3$@: "%4$@" 收到了%2$@ 聰</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damus/zh-TW.lproj/InfoPlist.strings b/damus/zh-TW.lproj/InfoPlist.strings Binary files differ. diff --git a/damus/zh-TW.lproj/Localizable.strings b/damus/zh-TW.lproj/Localizable.strings Binary files differ. diff --git a/damus/zh-TW.lproj/Localizable.stringsdict b/damus/zh-TW.lproj/Localizable.stringsdict @@ -198,6 +198,34 @@ <string>%2$@ 聰</string> </dict> </dict> + <key>zap_notification_no_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你從 %3$@ 收到了%2$@ 聰</string> + </dict> + </dict> + <key>zap_notification_with_message</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@NOTIFICATION@</string> + <key>NOTIFICATION</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>other</key> + <string>你從 %3$@: "%4$@" 收到了%2$@ 聰</string> + </dict> + </dict> <key>zapped_tagged_in_3</key> <dict> <key>NSStringLocalizedFormatKey</key> diff --git a/damusTests/ZapTests.swift b/damusTests/ZapTests.swift @@ -65,6 +65,9 @@ final class ZapTests: XCTestCase { XCTAssertEqual(zap.zapper, "9630f464cca6a5147aa8a35f0bcdd3ce485324e732fd39e09233b1d848238f31") XCTAssertEqual(zap.target, ZapTarget.profile("32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245")) + + XCTAssertEqual(zap_notification_title(zap), "Zap") + XCTAssertEqual(zap_notification_body(profiles: Profiles(), zap: zap), "You received 1k sats from 107jk7ht:2qlu3nfm") } }