damus

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

commit 892a1420f3e6b62e4b17bd4e586668324eb6bed3
parent ee4cbf73637f3bfd3becdf12ad23f0aac3a5090d
Author: Terry Yiu <git@tyiu.xyz>
Date:   Tue, 10 Dec 2024 20:10:57 -0500

Fix suggested users category titles to be localizable

Changelog-Fixed: Fixed suggested users category titles to be localizable

Signed-off-by: Terry Yiu <git@tyiu.xyz>

Diffstat:
Mdamus/Views/Onboarding/OnboardingSuggestionsView.swift | 5++++-
Mdamus/Views/Onboarding/SuggestedUsersViewModel.swift | 4++--
Mdamus/Views/Onboarding/suggested_users.json | 16++++++++--------
Mdamus/en-US.lproj/Localizable.strings | 0
4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/damus/Views/Onboarding/OnboardingSuggestionsView.swift b/damus/Views/Onboarding/OnboardingSuggestionsView.swift @@ -114,7 +114,10 @@ struct SuggestedUsersSectionHeader: View { let model: SuggestedUsersViewModel var body: some View { HStack { - Text(group.title.uppercased()) + let locale = Locale.current + let format = localizedStringFormat(key: group.category, locale: locale) + let categoryName = String(format: format, locale: locale) + Text(categoryName) Spacer() Button(NSLocalizedString("Follow All", comment: "Button to follow all users in this section")) { model.follow(pubkeys: group.users) diff --git a/damus/Views/Onboarding/SuggestedUsersViewModel.swift b/damus/Views/Onboarding/SuggestedUsersViewModel.swift @@ -10,11 +10,11 @@ import Combine struct SuggestedUserGroup: Identifiable, Codable { let id = UUID() - let title: String + let category: String let users: [Pubkey] enum CodingKeys: String, CodingKey { - case title, users + case category, users } } diff --git a/damus/Views/Onboarding/suggested_users.json b/damus/Views/Onboarding/suggested_users.json @@ -1,6 +1,6 @@ [ { - "title": "nostr", + "category": "suggested_users_nostr", "users": [ "ba2f394833658475e91680b898f9be0f1d850166c6a839dbe084d0266ad6e20a", "82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2", @@ -9,7 +9,7 @@ ] }, { - "title": "permaculture & livestock & gardening", + "category": "suggested_users_permaculture_livestock_gardening", "users": [ "4b1804c90d59dff195ee0e8f692b98a7c762bf1793b3e126c546d730dcb04477", "2c24e1af571fb4ccfeca3981649c1b09c695cd83b129709eb3b41c7ad2854899", @@ -17,21 +17,21 @@ ] }, { - "title": "music", + "category": "suggested_users_music", "users": [ "23708a76e7090cb108d33e8801fd36262c475e5499b23eb87eee4a31f4f0144e", "ca9d68eb25620fc755e1b8c76b5f155f4c7e96d99c532c109a8b36d208bdce55" ] }, { - "title": "books", + "category": "suggested_users_books", "users": [ "2652f3af10de63bc10a2628871a3fce62e08655e4fcf90a58be16f246bb65da3", "b83a28b7e4e5d20bd960c5faeb6625f95529166b8bdb045d42634a2f35919450" ] }, { - "title": "art & photography", + "category": "suggested_users_art_photography", "users": [ "f96c3d76497074c4c83a7b3823380e77dc73d5a9494fd2e053e4a1453e17824b", "11b2d93b26d7e56fb57f0afce0d33bfa7fb35b913e4c0aeb7706464befb9ca97", @@ -49,7 +49,7 @@ ] }, { - "title": "ai art", + "category": "suggested_users_ai_art", "users": [ "431fa2f340f0adf8963d6d7c6e2c20d913278c691fe609fd3857db13d8f39feb", "9936a53def39d712f886ac7e2ed509ce223b534834dd29d95caba9f6bc01ef35", @@ -59,7 +59,7 @@ ] }, { - "title": "parenting", + "category": "suggested_users_parenting", "users": [ "c7c8f645fd45b09055fb6c26d148737ad7ed12ddecde0d4c877b88f8d4196865", "fa984bd7dbb282f07e16e7ae87b26a2a7b9b90b7246a44771f0cf5ae58018f52", @@ -69,7 +69,7 @@ ] }, { - "title": "food", + "category": "suggested_users_food", "users": [ "cbb2f023b6aa09626d51d2f4ea99fa9138ea80ec7d5ffdce9feef8dcd6352031" ] diff --git a/damus/en-US.lproj/Localizable.strings b/damus/en-US.lproj/Localizable.strings Binary files differ.