commit 173b22b772104f9159091d3b0fc9be26ec0df433 parent 18c7cba53c466f7941c10e79a6740f660c86bc72 Author: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sat, 14 Jan 2023 14:24:48 -0500 localization: fix string bugs Closes: #321 Diffstat:
10 files changed, 235 insertions(+), 145 deletions(-)
diff --git a/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff b/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff @@ -85,16 +85,6 @@ Number of profiles a user is following.</note> <target>(Profile.displayName(profile: profile, pubkey: whos))'s Followers</target> <note>Navigation bar title for view that shows who is following a user.</note> </trans-unit> - <trans-unit id="(formattedSats) sat" xml:space="preserve"> - <source>(formattedSats) sat</source> - <target>(formattedSats) sat</target> - <note>Amount of 1 sat.</note> - </trans-unit> - <trans-unit id="(formattedSats) sats" xml:space="preserve"> - <source>(formattedSats) sats</source> - <target>(formattedSats) sats</target> - <note>Amount of sats.</note> - </trans-unit> <trans-unit id="(who) following" xml:space="preserve"> <source>(who) following</source> <target>(who) following</target> @@ -868,6 +858,11 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>satoshi</target> <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note> </trans-unit> + <trans-unit id="sats_count" translate="no" xml:space="preserve"> + <source>sats_count</source> + <target>sats_count</target> + <note>Amount of sats. (Key in .stringsdict)</note> + </trans-unit> <trans-unit id="tips_count" translate="no" xml:space="preserve"> <source>tips_count</source> <target>tips_count</target> @@ -896,8 +891,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no </header> <body> <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/one:dict/:string" xml:space="preserve"> - <source>1 other note</source> - <target>1 other note</target> + <source>%d other note</source> + <target>%d other note</target> <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> </trans-unit> <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/other:dict/:string" xml:space="preserve"> @@ -905,11 +900,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>%d other notes</target> <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> </trans-unit> - <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/zero:dict/:string" xml:space="preserve"> - <source>0 other notes</source> - <target>0 other notes</target> - <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> - </trans-unit> <trans-unit id="/collapsed_event_view_other_notes:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>··· %#@NOTES@ ···</source> <target>··· %#@NOTES@ ···</target> @@ -925,11 +915,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>Followers</target> <note>Part of a larger sentence to describe how many people are following a user.</note> </trans-unit> - <trans-unit id="/followers_count:dict/FOLLOWERS:dict/zero:dict/:string" xml:space="preserve"> - <source>Followers</source> - <target>Followers</target> - <note>Part of a larger sentence to describe how many people are following a user.</note> - </trans-unit> <trans-unit id="/followers_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@FOLLOWERS@</source> <target>%#@FOLLOWERS@</target> @@ -950,11 +935,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>Reactions</target> <note>Part of a larger sentence to describe how many reactions there are on a post.</note> </trans-unit> - <trans-unit id="/reactions_count:dict/REACTIONS:dict/zero:dict/:string" xml:space="preserve"> - <source>Reactions</source> - <target>Reactions</target> - <note>Part of a larger sentence to describe how many reactions there are on a post.</note> - </trans-unit> <trans-unit id="/relays_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@RELAYS@</source> <target>%#@RELAYS@</target> @@ -970,19 +950,14 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>Relays</target> <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> </trans-unit> - <trans-unit id="/relays_count:dict/RELAYS:dict/zero:dict/:string" xml:space="preserve"> - <source>Relays</source> - <target>Relays</target> - <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> - </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>Replying to %@%#@OTHERS@</source> <target>Replying to %@%#@OTHERS@</target> <note>Label to indicate that the user is replying to 1 user and others.</note> </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve"> - <source> & 1 other</source> - <target> & 1 other</target> + <source> & %d other</source> + <target> & %d other</target> <note>Label to indicate that the user is replying to 1 user and others.</note> </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve"> @@ -1001,8 +976,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no <note>Label to indicate that the user is replying to 2 users and others.</note> </trans-unit> <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve"> - <source> & 1 other</source> - <target> & 1 other</target> + <source> & %d other</source> + <target> & %d other</target> <note>Label to indicate that the user is replying to 2 users and others.</note> </trans-unit> <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve"> @@ -1030,10 +1005,20 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>Reposts</target> <note>Part of a larger sentence to describe how many reposts there are.</note> </trans-unit> - <trans-unit id="/reposts_count:dict/REPOSTS:dict/zero:dict/:string" xml:space="preserve"> - <source>Reposts</source> - <target>Reposts</target> - <note>Part of a larger sentence to describe how many reposts there are.</note> + <trans-unit id="/sats_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> + <source>%1$#@SATS@</source> + <target>%1$#@SATS@</target> + <note>Amount of sats.</note> + </trans-unit> + <trans-unit id="/sats_count:dict/SATS:dict/one:dict/:string" xml:space="preserve"> + <source>%2$@ sat</source> + <target>%2$@ sat</target> + <note>Amount of sats.</note> + </trans-unit> + <trans-unit id="/sats_count:dict/SATS:dict/other:dict/:string" xml:space="preserve"> + <source>%2$@ sats</source> + <target>%2$@ sats</target> + <note>Amount of sats.</note> </trans-unit> <trans-unit id="/tips_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@TIPS@</source> @@ -1050,11 +1035,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>Tips</target> <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> </trans-unit> - <trans-unit id="/tips_count:dict/TIPS:dict/zero:dict/:string" xml:space="preserve"> - <source>Tips</source> - <target>Tips</target> - <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> - </trans-unit> </body> </file> </xliff> diff --git a/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings Binary files differ. diff --git a/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict b/damus Localizations/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict @@ -12,10 +12,8 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>0 other notes</string> <key>one</key> - <string>1 other note</string> + <string>%d other note</string> <key>other</key> <string>%d other notes</string> </dict> @@ -30,8 +28,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Followers</string> <key>one</key> <string>Follower</string> <key>other</key> @@ -48,8 +44,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reactions</string> <key>one</key> <string>Reaction</string> <key>other</key> @@ -66,8 +60,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Relays</string> <key>one</key> <string>Relay</string> <key>other</key> @@ -87,7 +79,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -105,7 +97,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -120,14 +112,28 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reposts</string> <key>one</key> <string>Repost</string> <key>other</key> <string>Reposts</string> </dict> </dict> + <key>sats_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat</string> + <key>other</key> + <string>%2$@ sats</string> + </dict> + </dict> <key>tips_count</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -138,8 +144,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Tips</string> <key>one</key> <string>Tip</string> <key>other</key> diff --git a/damus Localizations/es-419.xcloc/Localized Contents/es-419.xliff b/damus Localizations/es-419.xcloc/Localized Contents/es-419.xliff @@ -71,14 +71,6 @@ Number of profiles a user is following.</note> <source>(Profile.displayName(profile: profile, pubkey: whos))'s Followers</source> <note>Navigation bar title for view that shows who is following a user.</note> </trans-unit> - <trans-unit id="(formattedSats) sat" xml:space="preserve"> - <source>(formattedSats) sat</source> - <note>Amount of 1 sat.</note> - </trans-unit> - <trans-unit id="(formattedSats) sats" xml:space="preserve"> - <source>(formattedSats) sats</source> - <note>Amount of sats.</note> - </trans-unit> <trans-unit id="(who) following" xml:space="preserve"> <source>(who) following</source> <note>Navigation bar title for view that shows who a user is following.</note> @@ -700,6 +692,10 @@ Part of a larger sentence to describe how many profiles a user is following.</no <source>satoshi</source> <note>Example username of Bitcoin creator(s), Satoshi Nakamoto.</note> </trans-unit> + <trans-unit id="sats_count" translate="no" xml:space="preserve"> + <source>sats_count</source> + <note>Amount of sats. (Key in .stringsdict)</note> + </trans-unit> <trans-unit id="tips_count" translate="no" xml:space="preserve"> <source>tips_count</source> <note>Part of a larger sentence to describe how many tip payments there are on a post. (Key in .stringsdict)</note> @@ -724,8 +720,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no </header> <body> <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/one:dict/:string" xml:space="preserve"> - <source>1 other note</source> - <target>1 other note</target> + <source>%d other note</source> + <target>%d other note</target> <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> </trans-unit> <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/other:dict/:string" xml:space="preserve"> @@ -733,11 +729,6 @@ Part of a larger sentence to describe how many profiles a user is following.</no <target>%d other notes</target> <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> </trans-unit> - <trans-unit id="/collapsed_event_view_other_notes:dict/NOTES:dict/zero:dict/:string" xml:space="preserve"> - <source>0 other notes</source> - <target>0 other notes</target> - <note>Text to indicate that the thread was collapsed and that there are other notes to view if tapped.</note> - </trans-unit> <trans-unit id="/collapsed_event_view_other_notes:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>··· %#@NOTES@ ···</source> <target>··· %#@NOTES@ ···</target> @@ -745,50 +736,47 @@ Part of a larger sentence to describe how many profiles a user is following.</no </trans-unit> <trans-unit id="/followers_count:dict/FOLLOWERS:dict/one:dict/:string" xml:space="preserve"> <source>Follower</source> + <target>Follower</target> <note>Part of a larger sentence to describe how many people are following a user.</note> </trans-unit> <trans-unit id="/followers_count:dict/FOLLOWERS:dict/other:dict/:string" xml:space="preserve"> <source>Followers</source> - <note>Part of a larger sentence to describe how many people are following a user.</note> - </trans-unit> - <trans-unit id="/followers_count:dict/FOLLOWERS:dict/zero:dict/:string" xml:space="preserve"> - <source>Followers</source> + <target>Followers</target> <note>Part of a larger sentence to describe how many people are following a user.</note> </trans-unit> <trans-unit id="/followers_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@FOLLOWERS@</source> + <target>%#@FOLLOWERS@</target> <note>Part of a larger sentence to describe how many people are following a user.</note> </trans-unit> <trans-unit id="/reactions_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@REACTIONS@</source> + <target>%#@REACTIONS@</target> <note>Part of a larger sentence to describe how many reactions there are on a post.</note> </trans-unit> <trans-unit id="/reactions_count:dict/REACTIONS:dict/one:dict/:string" xml:space="preserve"> <source>Reaction</source> + <target>Reaction</target> <note>Part of a larger sentence to describe how many reactions there are on a post.</note> </trans-unit> <trans-unit id="/reactions_count:dict/REACTIONS:dict/other:dict/:string" xml:space="preserve"> <source>Reactions</source> - <note>Part of a larger sentence to describe how many reactions there are on a post.</note> - </trans-unit> - <trans-unit id="/reactions_count:dict/REACTIONS:dict/zero:dict/:string" xml:space="preserve"> - <source>Reactions</source> + <target>Reactions</target> <note>Part of a larger sentence to describe how many reactions there are on a post.</note> </trans-unit> <trans-unit id="/relays_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@RELAYS@</source> + <target>%#@RELAYS@</target> <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> </trans-unit> <trans-unit id="/relays_count:dict/RELAYS:dict/one:dict/:string" xml:space="preserve"> <source>Relay</source> + <target>Relay</target> <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> </trans-unit> <trans-unit id="/relays_count:dict/RELAYS:dict/other:dict/:string" xml:space="preserve"> <source>Relays</source> - <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> - </trans-unit> - <trans-unit id="/relays_count:dict/RELAYS:dict/zero:dict/:string" xml:space="preserve"> - <source>Relays</source> + <target>Relays</target> <note>Part of a larger sentence to describe how many relay servers a user is connected.</note> </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> @@ -797,8 +785,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no <note>Label to indicate that the user is replying to 1 user and others.</note> </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve"> - <source> & 1 other</source> - <target> & 1 other</target> + <source> & %d other</source> + <target> & %d other</target> <note>Label to indicate that the user is replying to 1 user and others.</note> </trans-unit> <trans-unit id="/replying_to_one_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve"> @@ -817,8 +805,8 @@ Part of a larger sentence to describe how many profiles a user is following.</no <note>Label to indicate that the user is replying to 2 users and others.</note> </trans-unit> <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/one:dict/:string" xml:space="preserve"> - <source> & 1 other</source> - <target> & 1 other</target> + <source> & %d other</source> + <target> & %d other</target> <note>Label to indicate that the user is replying to 2 users and others.</note> </trans-unit> <trans-unit id="/replying_to_two_and_others:dict/OTHERS:dict/other:dict/:string" xml:space="preserve"> @@ -833,34 +821,47 @@ Part of a larger sentence to describe how many profiles a user is following.</no </trans-unit> <trans-unit id="/reposts_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@REPOSTS@</source> + <target>%#@REPOSTS@</target> <note>Part of a larger sentence to describe how many reposts there are.</note> </trans-unit> <trans-unit id="/reposts_count:dict/REPOSTS:dict/one:dict/:string" xml:space="preserve"> <source>Repost</source> + <target>Repost</target> <note>Part of a larger sentence to describe how many reposts there are.</note> </trans-unit> <trans-unit id="/reposts_count:dict/REPOSTS:dict/other:dict/:string" xml:space="preserve"> <source>Reposts</source> + <target>Reposts</target> <note>Part of a larger sentence to describe how many reposts there are.</note> </trans-unit> - <trans-unit id="/reposts_count:dict/REPOSTS:dict/zero:dict/:string" xml:space="preserve"> - <source>Reposts</source> - <note>Part of a larger sentence to describe how many reposts there are.</note> + <trans-unit id="/sats_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> + <source>%1$#@SATS@</source> + <target>%1$#@SATS@</target> + <note>Amount of sats.</note> + </trans-unit> + <trans-unit id="/sats_count:dict/SATS:dict/one:dict/:string" xml:space="preserve"> + <source>%2$@ sat</source> + <target>%2$@ sat</target> + <note>Amount of sats.</note> + </trans-unit> + <trans-unit id="/sats_count:dict/SATS:dict/other:dict/:string" xml:space="preserve"> + <source>%2$@ sats</source> + <target>%2$@ sats</target> + <note>Amount of sats.</note> </trans-unit> <trans-unit id="/tips_count:dict/NSStringLocalizedFormatKey:dict/:string" xml:space="preserve"> <source>%#@TIPS@</source> + <target>%#@TIPS@</target> <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> </trans-unit> <trans-unit id="/tips_count:dict/TIPS:dict/one:dict/:string" xml:space="preserve"> <source>Tip</source> + <target>Tip</target> <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> </trans-unit> <trans-unit id="/tips_count:dict/TIPS:dict/other:dict/:string" xml:space="preserve"> <source>Tips</source> - <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> - </trans-unit> - <trans-unit id="/tips_count:dict/TIPS:dict/zero:dict/:string" xml:space="preserve"> - <source>Tips</source> + <target>Tips</target> <note>Part of a larger sentence to describe how many tip payments there are on a post.</note> </trans-unit> </body> diff --git a/damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings Binary files differ. diff --git a/damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict b/damus Localizations/es-419.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict @@ -12,10 +12,8 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>0 other notes</string> <key>one</key> - <string>1 other note</string> + <string>%d other note</string> <key>other</key> <string>%d other notes</string> </dict> @@ -30,8 +28,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Followers</string> <key>one</key> <string>Follower</string> <key>other</key> @@ -48,8 +44,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reactions</string> <key>one</key> <string>Reaction</string> <key>other</key> @@ -66,8 +60,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Relays</string> <key>one</key> <string>Relay</string> <key>other</key> @@ -87,7 +79,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -105,7 +97,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -120,14 +112,28 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reposts</string> <key>one</key> <string>Repost</string> <key>other</key> <string>Reposts</string> </dict> </dict> + <key>sats_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat</string> + <key>other</key> + <string>%2$@ sats</string> + </dict> + </dict> <key>tips_count</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -138,8 +144,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Tips</string> <key>one</key> <string>Tip</string> <key>other</key> diff --git a/damus/ContentView.swift b/damus/ContentView.swift @@ -172,13 +172,20 @@ struct ContentView: View { .navigationBarTitle(selected_timeline == .home ? NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline) .toolbar { ToolbarItem(placement: .principal) { - if selected_timeline == .home { + switch selected_timeline { + case .home: Image("damus-home") .resizable() .frame(width:30,height:30) .shadow(color: Color("DamusPurple"), radius: 2) - } else { - Text("Global") + case .dms: + Text("DM", comment: "Toolbar label for DM view, which is the English abbreviation for Direct Message.") + case .notifications: + Text("Notifications", comment: "Toolbar label for Notifications view.") + case .search: + Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.") + case .none: + Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.") } } diff --git a/damus/Models/Mentions.swift b/damus/Models/Mentions.swift @@ -198,11 +198,7 @@ enum Amount: Equatable { let sats = NSNumber(value: (Double(amt) / 1000.0)) let formattedSats = numberFormatter.string(from: sats) ?? sats.stringValue - if formattedSats == numberFormatter.string(from: 1) { - return NSLocalizedString("\(formattedSats) sat", comment: "Amount of 1 sat.") - } - - return NSLocalizedString("\(formattedSats) sats", comment: "Amount of sats.") + return String(format: NSLocalizedString("sats_count", comment: "Amount of sats."), sats.decimalValue as NSDecimalNumber, formattedSats) } } } diff --git a/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.lproj/Localizable.stringsdict @@ -12,10 +12,8 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>0 other notes</string> <key>one</key> - <string>1 other note</string> + <string>%d other note</string> <key>other</key> <string>%d other notes</string> </dict> @@ -30,8 +28,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Followers</string> <key>one</key> <string>Follower</string> <key>other</key> @@ -48,8 +44,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reactions</string> <key>one</key> <string>Reaction</string> <key>other</key> @@ -66,8 +60,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Relays</string> <key>one</key> <string>Relay</string> <key>other</key> @@ -87,7 +79,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -105,7 +97,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -120,14 +112,28 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Reposts</string> <key>one</key> <string>Repost</string> <key>other</key> <string>Reposts</string> </dict> </dict> + <key>sats_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat</string> + <key>other</key> + <string>%2$@ sats</string> + </dict> + </dict> <key>tips_count</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -138,8 +144,6 @@ <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>Tips</string> <key>one</key> <string>Tip</string> <key>other</key> diff --git a/damus/es-419.lproj/Localizable.stringsdict b/damus/es-419.lproj/Localizable.stringsdict @@ -2,6 +2,70 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>collapsed_event_view_other_notes</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>··· %#@NOTES@ ···</string> + <key>NOTES</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>%d other note</string> + <key>other</key> + <string>%d other notes</string> + </dict> + </dict> + <key>followers_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@FOLLOWERS@</string> + <key>FOLLOWERS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Follower</string> + <key>other</key> + <string>Followers</string> + </dict> + </dict> + <key>reactions_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@REACTIONS@</string> + <key>REACTIONS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Reaction</string> + <key>other</key> + <string>Reactions</string> + </dict> + </dict> + <key>relays_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@RELAYS@</string> + <key>RELAYS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Relay</string> + <key>other</key> + <string>Relays</string> + </dict> + </dict> <key>replying_to_one_and_others</key> <dict> <key>NSStringLocalizedFormatKey</key> @@ -15,7 +79,7 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> @@ -33,27 +97,57 @@ <key>zero</key> <string></string> <key>one</key> - <string> & 1 other</string> + <string> & %d other</string> <key>other</key> <string> & %d others</string> </dict> </dict> - <key>collapsed_event_view_other_notes</key> + <key>reposts_count</key> <dict> <key>NSStringLocalizedFormatKey</key> - <string>··· %#@NOTES@ ···</string> - <key>NOTES</key> + <string>%#@REPOSTS@</string> + <key>REPOSTS</key> <dict> <key>NSStringFormatSpecTypeKey</key> <string>NSStringPluralRuleType</string> <key>NSStringFormatValueTypeKey</key> <string>d</string> - <key>zero</key> - <string>0 other notes</string> <key>one</key> - <string>1 other note</string> + <string>Repost</string> <key>other</key> - <string>%d other notes</string> + <string>Reposts</string> + </dict> + </dict> + <key>sats_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%1$#@SATS@</string> + <key>SATS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>@</string> + <key>one</key> + <string>%2$@ sat</string> + <key>other</key> + <string>%2$@ sats</string> + </dict> + </dict> + <key>tips_count</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@TIPS@</string> + <key>TIPS</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>one</key> + <string>Tip</string> + <key>other</key> + <string>Tips</string> </dict> </dict> </dict>