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

Fix right-to-left localization issues

Browse Source 
Changelog-Fixed: Fixed right-to-left localization issues

Signed-off-by: Terry Yiu <git@tyiu.xyz>
This commit is contained in:
Terry Yiu
2024-12-09 20:42:45 -05:00
committed by Daniel D’Aquino
parent 902e8c3950
commit a1b1ce949b
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
damus/Util/LocalizationUtil.swift
View File

@@ -7,16 +7,12 @@
import Foundation import Foundation
func bundleForLocale(locale: Locale?) -> Bundle { func bundleForLocale(locale: Locale) -> Bundle {
if locale == nil { let path = Bundle.main.path(forResource: locale.identifier, ofType: "lproj")
return Bundle.main
}
let path = Bundle.main.path(forResource: locale!.identifier, ofType: "lproj")
return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main return path != nil ? (Bundle(path: path!) ?? Bundle.main) : Bundle.main
} }
func localizedStringFormat(key: String, locale: Locale?) -> String { func localizedStringFormat(key: String, locale: Locale) -> String {
let bundle = bundleForLocale(locale: locale) let bundle = bundleForLocale(locale: locale)
let fallback = bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: key, value: nil, table: nil) let fallback = bundleForLocale(locale: Locale(identifier: "en-US")).localizedString(forKey: key, value: nil, table: nil)
return bundle.localizedString(forKey: key, value: fallback, table: nil) return bundle.localizedString(forKey: key, value: fallback, table: nil)

5
damus/Views/Notifications/EventGroupView.swift
View File

@@ -143,7 +143,7 @@ func event_group_unique_pubkeys(profiles: Profiles, group: EventGroupType) -> [P
"zapped_your_profile_2" - returned when 2 zaps occurred to the current user's profile "zapped_your_profile_2" - returned when 2 zaps occurred to the current user's profile
"zapped_your_profile_3" - returned when 3 or more zaps occurred to the current user's profile "zapped_your_profile_3" - returned when 3 or more zaps occurred to the current user's profile
*/ */
func reacting_to_text(profiles: Profiles, our_pubkey: Pubkey, group: EventGroupType, ev: NostrEvent?, pubkeys: [Pubkey], locale: Locale? = nil) -> String { func reacting_to_text(profiles: Profiles, our_pubkey: Pubkey, group: EventGroupType, ev: NostrEvent?, pubkeys: [Pubkey], locale: Locale = Locale.current) -> String {
if group.events.count == 0 { if group.events.count == 0 {
return "??" return "??"
} }
@@ -188,7 +188,8 @@ struct EventGroupView: View {
let group: EventGroupType let group: EventGroupType
func GroupDescription(_ pubkeys: [Pubkey]) -> some View { func GroupDescription(_ pubkeys: [Pubkey]) -> some View {
Text(verbatim: "\(reacting_to_text(profiles: state.profiles, our_pubkey: state.pubkey, group: group, ev: event, pubkeys: pubkeys))") let text = reacting_to_text(profiles: state.profiles, our_pubkey: state.pubkey, group: group, ev: event, pubkeys: pubkeys)
return Text(text)
} }
func ZapIcon(_ zapgrp: ZapGroup) -> some View { func ZapIcon(_ zapgrp: ZapGroup) -> some View {