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

Fix localization bugs

Browse Source
This commit is contained in:
Terry Yiu
2023-01-06 21:40:06 -05:00
parent c10fcc52e3
commit dcf328e7ac
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
damus/Views/EditMetadataView.swift
View File

@@ -160,9 +160,9 @@ struct EditMetadataView: View {
Text("NIP-05 Verification") Text("NIP-05 Verification")
}, footer: { }, footer: {
if let parts = nip05_parts { if let parts = nip05_parts {
Text(String.localizedStringWithFormat("'%@' at '%@' will be used for verification", parts.username, parts.host)) Text("'\(parts.username)' at '\(parts.host)' will be used for verification", comment: "Description of how the nip05 identifier would be used for verification.")
} else { } else {
Text(String.localizedStringWithFormat("'%@' is an invalid nip05 identifier. It should look like an email.", nip05)) Text("'\(nip05)' is an invalid nip05 identifier. It should look like an email.", comment: "Description of why the nip05 identifier is invalid.")
} }
}) })

6
damus/Views/EventView.swift
View File

@@ -380,13 +380,13 @@ func reply_desc(profiles: Profiles, event: NostrEvent) -> String {
if names.count == 2 { if names.count == 2 {
if n > 2 { if n > 2 {
let othersCount = n - pubkeys.count let othersCount = n - pubkeys.count
return String(format: NSLocalizedString("replying_to_two_and_others", comment: "Label to indicate that the user is replying to 2 users and others."), othersCount, names[0], names[1]) return String(format: NSLocalizedString("replying_to_two_and_others", comment: "Label to indicate that the user is replying to 2 users and others."), names[0], names[1], othersCount)
} }
return String.localizedStringWithFormat("Replying to %@ & %@", names[0], names[1]) return String(format: NSLocalizedString("Replying to %@ & %@", comment: "Label to indicate that the user is replying to 2 users."), names[0], names[1])
} }
let othersCount = n - pubkeys.count let othersCount = n - pubkeys.count
return String(format: NSLocalizedString("replying_to_one_and_others", comment: "Label to indicate that the user is replying to 1 user and others."), othersCount, names[0]) return String(format: NSLocalizedString("replying_to_one_and_others", comment: "Label to indicate that the user is replying to 1 user and others."), names[0], othersCount)
} }

4
damus/en.lproj/Localizable.stringsdict
View File

@@ -5,7 +5,7 @@
<key>replying_to_one_and_others</key> <key>replying_to_one_and_others</key>
<dict> <dict>
<key>NSStringLocalizedFormatKey</key> <key>NSStringLocalizedFormatKey</key>
<string>Replying to %2$@%#@others@</string> <string>Replying to %@%#@others@</string>
<key>others</key> <key>others</key>
<dict> <dict>
<key>NSStringFormatSpecTypeKey</key> <key>NSStringFormatSpecTypeKey</key>
@@ -23,7 +23,7 @@
<key>replying_to_two_and_others</key> <key>replying_to_two_and_others</key>
<dict> <dict>
<key>NSStringLocalizedFormatKey</key> <key>NSStringLocalizedFormatKey</key>
<string>Replying to %2$@, %3$@%#@others@</string> <string>Replying to %@, %@%#@others@</string>
<key>others</key> <key>others</key>
<dict> <dict>
<key>NSStringFormatSpecTypeKey</key> <key>NSStringFormatSpecTypeKey</key>