From 83909c8fc96944914dedcff46f03434b97647767 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:50:28 -0500 Subject: [PATCH] Change use of DM to be consistent and add missing localization comments --- .../Localized Contents/en-US.xliff | 32 +++++++++++------- .../damus/en-US.lproj/Localizable.strings | Bin 22684 -> 22700 bytes damus/ContentView.swift | 2 +- damus/Views/DMChatView.swift | 2 +- damus/Views/DirectMessagesView.swift | 8 ++--- damus/Views/ParicipantsView.swift | 6 ++-- 6 files changed, 28 insertions(+), 22 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 index c5e8c28f..7d2167f2 100644 --- a/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus Localizations/en-US.xcloc/Localized Contents/en-US.xliff @@ -131,6 +131,11 @@ Number of profiles a user is following. Add Relay Label for section for adding a relay server. + + Add all + Add all + Button label to re-add all original participants as profiles to reply to in a note + Any Any @@ -280,20 +285,16 @@ Number of profiles a user is following. Creator(s) of Bitcoin. Absolute legend. Example description about Bitcoin creator(s), Satoshi Nakamoto. - - DM - DM - Navigation title for DM view, which is the English abbreviation for Direct Message. - DM Type DM Type - DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. + DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. DM is the English abbreviation for Direct Message. DMs DMs - No comment provided by engineer. + 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. Damus @@ -335,16 +336,16 @@ Number of profiles a user is following. Edit Button to edit user's profile. + + Edit participants + Edit participants + Text indicating that the view is used for editing which participants are replied to in a note. + Encrypted Encrypted Heading indicating that this application keeps private messaging end-to-end encrypted. - - Encrypted DMs - Encrypted DMs - Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message. - Enter your account key to login: Enter your account key to login: @@ -569,6 +570,11 @@ Part of a larger sentence to describe how many profiles a user is following.Relays Sidebar menu label for Relay servers view + + Remove all + Remove all + Button label to remove all participants from a note reply. + Reply to self Reply to self @@ -598,7 +604,7 @@ Part of a larger sentence to describe how many profiles a user is following. Requests Requests - No comment provided by engineer. + Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message. Reset 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 index 549459eb9271fb184ad8d0dfa8e883b9d0f0c43b..557c9a909968d83b2c294e5d90c990ebcf838633 100644 GIT binary patch delta 108 zcmbQUk#WsN#tmZflb^}oV|HQiog6KnKly?})MN*F7WrZZ1%@()Oomj3at0kByPP2d z$Swk61qO)PL{=^!TVe7>M#;$!3`8btDGE&XQ*7b~$}$u)C;{bcfmmrXyV6uM0ERys AF8}}l delta 169 zcmZ3pk#WvO#tmZflO4RYCLd5>5m#U+W5{GkWhiIRVNd{)89-h#L&oIq^7*_ diff --git a/damus/ContentView.swift b/damus/ContentView.swift index a0f896e4..b0a1857f 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -181,7 +181,7 @@ struct ContentView: View { .frame(width:30,height:30) .shadow(color: Color("DamusPurple"), radius: 2) case .dms: - Text("DM", comment: "Toolbar label for DM view, which is the English abbreviation for Direct Message.") + Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.") .bold() case .notifications: Text("Notifications", comment: "Toolbar label for Notifications view.") diff --git a/damus/Views/DMChatView.swift b/damus/Views/DMChatView.swift index 905b1801..0c2f6ba6 100644 --- a/damus/Views/DMChatView.swift +++ b/damus/Views/DMChatView.swift @@ -149,7 +149,7 @@ struct DMChatView: View { .opacity(((dms.events.count == 0) ? 1.0 : 0.0)) .foregroundColor(.gray) } - .navigationTitle(NSLocalizedString("DM", comment: "Navigation title for DM view, which is the English abbreviation for Direct Message.")) + .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for DMs view, where DM is the English abbreviation for Direct Message.")) .toolbar { Header } } } diff --git a/damus/Views/DirectMessagesView.swift b/damus/Views/DirectMessagesView.swift index 0cb8122b..ff518e27 100644 --- a/damus/Views/DirectMessagesView.swift +++ b/damus/Views/DirectMessagesView.swift @@ -63,11 +63,11 @@ struct DirectMessagesView: View { var body: some View { VStack { - Picker(NSLocalizedString("DM Type", comment: "DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet."), selection: $dm_type) { - Text("DMs") + Picker(NSLocalizedString("DM Type", comment: "DM selector for seeing either DMs or message requests, which are messages that have not been responded to yet. DM is the English abbreviation for Direct Message."), selection: $dm_type) { + Text("DMs", comment: "Picker option for DM selector for seeing only DMs that have been responded to. DM is the English abbreviation for Direct Message.") .tag(DMType.friend) - Text("Requests") + Text("Requests", comment: "Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message.") .tag(DMType.rando) } @@ -84,7 +84,7 @@ struct DirectMessagesView: View { } .padding(.horizontal) .padding(.top) - .navigationTitle(NSLocalizedString("Encrypted DMs", comment: "Navigation title for view of encrypted DMs, where DM is an English abbreviation for Direct Message.")) + .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for view of DMs, where DM is an English abbreviation for Direct Message.")) } } diff --git a/damus/Views/ParicipantsView.swift b/damus/Views/ParicipantsView.swift index 909ca073..720a3e84 100644 --- a/damus/Views/ParicipantsView.swift +++ b/damus/Views/ParicipantsView.swift @@ -16,21 +16,21 @@ struct ParticipantsView: View { var body: some View { VStack { - Text("Edit participants") + Text("Edit participants", comment: "Text indicating that the view is used for editing which participants are replied to in a note.") HStack { Spacer() Button { // Remove all "p" refs, keep "e" refs references = originalReferences.eRefs } label: { - Text("Remove all") + Text("Remove all", comment: "Button label to remove all participants from a note reply.") } .buttonStyle(.borderedProminent) Spacer() Button { references = originalReferences } label: { - Text("Add all") + Text("Add all", comment: "Button label to re-add all original participants as profiles to reply to in a note") } .buttonStyle(.borderedProminent) Spacer()