diff --git a/damus.xcodeproj/project.pbxproj b/damus.xcodeproj/project.pbxproj index 26024815..8f0c9aca 100644 --- a/damus.xcodeproj/project.pbxproj +++ b/damus.xcodeproj/project.pbxproj @@ -394,12 +394,12 @@ 50B5685329F97CB400A23243 /* CredentialHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50B5685229F97CB400A23243 /* CredentialHandler.swift */; }; 50C3E08A2AA8E3F7006A4BC0 /* AVPlayer+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C3E0892AA8E3F7006A4BC0 /* AVPlayer+Additions.swift */; }; 50DA11262A16A23F00236234 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DA11252A16A23F00236234 /* Launch.storyboard */; }; - 5C0567582C8FBC560073F23A /* NDBSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567572C8FBC560073F23A /* NDBSearchView.swift */; }; - 5C0567592C8FBDE30073F23A /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2277EE92A089BD5006C3807 /* Router.swift */; }; - 5C05675A2C8FBDE70073F23A /* NDBSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567572C8FBC560073F23A /* NDBSearchView.swift */; }; 5C0567532C8B5F9C0073F23A /* PostingTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C8711DD2C460C06007879C2 /* PostingTimelineView.swift */; }; 5C0567552C8B60C20073F23A /* OffsetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567542C8B60C20073F23A /* OffsetExtension.swift */; }; 5C0567562C8B60E60073F23A /* OffsetExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567542C8B60C20073F23A /* OffsetExtension.swift */; }; + 5C0567582C8FBC560073F23A /* NDBSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567572C8FBC560073F23A /* NDBSearchView.swift */; }; + 5C0567592C8FBDE30073F23A /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2277EE92A089BD5006C3807 /* Router.swift */; }; + 5C05675A2C8FBDE70073F23A /* NDBSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0567572C8FBC560073F23A /* NDBSearchView.swift */; }; 5C0707D12A1ECB38004E7B51 /* DamusLogoGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */; }; 5C14C29B2BBBA29C00079FD2 /* RelaySoftwareDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29A2BBBA29C00079FD2 /* RelaySoftwareDetail.swift */; }; 5C14C29D2BBBA40B00079FD2 /* RelayAdminDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */; }; @@ -1838,8 +1838,8 @@ 50B5685229F97CB400A23243 /* CredentialHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialHandler.swift; sourceTree = ""; }; 50C3E0892AA8E3F7006A4BC0 /* AVPlayer+Additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVPlayer+Additions.swift"; sourceTree = ""; }; 50DA11252A16A23F00236234 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = ""; }; - 5C0567572C8FBC560073F23A /* NDBSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NDBSearchView.swift; sourceTree = ""; }; 5C0567542C8B60C20073F23A /* OffsetExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OffsetExtension.swift; sourceTree = ""; }; + 5C0567572C8FBC560073F23A /* NDBSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NDBSearchView.swift; sourceTree = ""; }; 5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusLogoGradient.swift; sourceTree = ""; }; 5C14C29A2BBBA29C00079FD2 /* RelaySoftwareDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelaySoftwareDetail.swift; sourceTree = ""; }; 5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayAdminDetail.swift; sourceTree = ""; }; diff --git a/damus/Views/Events/Highlight/HighlightEventRef.swift b/damus/Views/Events/Highlight/HighlightEventRef.swift index 059232b5..aa7b9d63 100644 --- a/damus/Views/Events/Highlight/HighlightEventRef.swift +++ b/damus/Views/Events/Highlight/HighlightEventRef.swift @@ -59,7 +59,7 @@ struct HighlightEventRef: View { } VStack(alignment: .leading, spacing: 5) { - Text(longform_event.title ?? "Untitled") + Text(longform_event.title ?? NSLocalizedString("Untitled", comment: "Title of longform event if it is untitled.")) .font(.system(size: 14, weight: .bold)) .lineLimit(1) diff --git a/damus/Views/Events/Longform/LongformPreview.swift b/damus/Views/Events/Longform/LongformPreview.swift index cff2f532..f2a76b16 100644 --- a/damus/Views/Events/Longform/LongformPreview.swift +++ b/damus/Views/Events/Longform/LongformPreview.swift @@ -130,7 +130,7 @@ struct LongformPreviewBody: View { } } - Text(event.title ?? "Untitled") + Text(event.title ?? NSLocalizedString("Untitled", comment: "Title of longform event if it is untitled.")) .font(header ? .title : .headline) .padding(.horizontal, 10) .padding(.top, 5) diff --git a/damus/Views/Events/Longform/LongformView.swift b/damus/Views/Events/Longform/LongformView.swift index 0b7e7203..7545c1c8 100644 --- a/damus/Views/Events/Longform/LongformView.swift +++ b/damus/Views/Events/Longform/LongformView.swift @@ -24,7 +24,7 @@ struct LongformView: View { var body: some View { EventShell(state: state, event: event.event, options: options) { - SelectableText(damus_state: state, event: event.event, attributedString: AttributedString(stringLiteral: event.title ?? "Untitled"), size: .title) + SelectableText(damus_state: state, event: event.event, attributedString: AttributedString(stringLiteral: event.title ?? NSLocalizedString("Untitled", comment: "Title of longform event if it is untitled.")), size: .title) NoteContentView(damus_state: state, event: event.event, blur_images: false, size: .selected, options: options) } diff --git a/damus/Views/ImageView.swift b/damus/Views/ImageView.swift deleted file mode 100644 index 8d5ad2cb..00000000 --- a/damus/Views/ImageView.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// ImageView.swift -// damus -// -// Created by user232838 on 1/5/23. -// - -import SwiftUI - -struct ImageView: View { - var body: some View { - Text(verbatim: /*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct ImageView_Previews: PreviewProvider { - static var previews: some View { - ImageView() - } -} diff --git a/damus/Views/Profile/ProfilePopup.swift b/damus/Views/Profile/ProfilePopup.swift deleted file mode 100644 index f3edfb2d..00000000 --- a/damus/Views/Profile/ProfilePopup.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// ProfilePopup.swift -// damus -// -// Created by William Casarin on 2023-08-21. -// - -import SwiftUI - -struct ProfilePopup: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct ProfilePopup_Previews: PreviewProvider { - static var previews: some View { - ProfilePopup() - } -} diff --git a/damus/Views/QRCodeView.swift b/damus/Views/QRCodeView.swift index e0c91700..3eaa6d8d 100644 --- a/damus/Views/QRCodeView.swift +++ b/damus/Views/QRCodeView.swift @@ -139,7 +139,7 @@ struct QRCodeView: View { .foregroundColor(.white) } if let name = profile?.name { - Text("@" + name) + Text(verbatim: "@" + name) .font(.body) .foregroundColor(.white) } diff --git a/damus/Views/SetupView.swift b/damus/Views/SetupView.swift index 4b5b239c..84ffd0fa 100644 --- a/damus/Views/SetupView.swift +++ b/damus/Views/SetupView.swift @@ -57,20 +57,19 @@ struct SetupView: View { } .buttonStyle(GradientButtonStyle()) .padding() - - HStack(spacing: 0) { - Text("By continuing you agree to our ") - .font(.subheadline) - .foregroundColor(DamusColors.neutral6) - Button(action: { - navigationCoordinator.push(route: Route.EULA) - }, label: { - Text("EULA", comment: "End User License Agreement") + Button(action: { + navigationCoordinator.push(route: Route.EULA) + }, label: { + HStack { + Text("By continuing, you agree to our EULA", comment: "Disclaimer to user that they are agreeing to the End User License Agreement if they create an account or sign in.") .font(.subheadline) - }) - .padding(.vertical, 5) - } + .foregroundColor(DamusColors.neutral6) + + Image(systemName: "arrow.forward") + } + }) + .padding(.vertical, 5) .padding(.bottom) } } diff --git a/damus/Views/SideMenuView.swift b/damus/Views/SideMenuView.swift index 581dc9b1..4257b896 100644 --- a/damus/Views/SideMenuView.swift +++ b/damus/Views/SideMenuView.swift @@ -152,7 +152,7 @@ struct SideMenuView: View { } if let name { if !name.isEmpty { - Text("@" + name) + Text(verbatim: "@" + name) .foregroundColor(DamusColors.mediumGrey) .font(.body) .lineLimit(1) diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index c845f08f..eb1752d8 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -340,6 +340,11 @@ Section header for text and appearance settings Are you sure you want to delete all of your bookmarks? Alert for deleting all of the bookmarks. + + Are you sure you want to upload the selected media? + Are you sure you want to upload the selected media? + Alert message asking if the user wants to upload media. + Are you sure you want to upload this image? Are you sure you want to upload this image? @@ -411,10 +416,10 @@ Context menu option for broadcasting the user's note to all of the user's connec Broadcast music playing on Apple Music Toggle to enable or disable broadcasting what music is being played on Apple Music in their profile status. - - By continuing you agree to our - By continuing you agree to our - No comment provided by engineer. + + By continuing, you agree to our EULA + By continuing, you agree to our EULA + Disclaimer to user that they are agreeing to the End User License Agreement if they create an account or sign in. By subscribing to Damus Purple, you are accepting our [privacy policy](https://damus.io/privacy-policy.txt) and Apple's Standard [EULA](https://www.apple.com/legal/internet-services/itunes/dev/stdeula/) @@ -779,8 +784,7 @@ The duration in which to mute the given item. EULA EULA - End User License Agreement -Navigation title of view that shows the EULA, an acronym for End User License Agreement. + Navigation title of view that shows the EULA, an acronym for End User License Agreement. Earn Money @@ -1237,7 +1241,8 @@ Button to navigate to login view. Logout Logout Alert for logging out the user. -Button for logging out the user. +Button for logging out the user. +Sidebar menu label to sign out of the account. Looking for %@... @@ -2062,11 +2067,6 @@ Section header for search/universe settings Service Prompt selection of translation service provider. - - Set Status - Set Status - Sidebar menu label to set user status - Settings Settings @@ -2472,6 +2472,11 @@ Example URL to LibreTranslate server Unmute conversation Context menu option for unmuting a conversation. + + Untitled + Untitled + Title of longform event if it is untitled. + Update Update diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index 859fed1c..8c000631 100644 Binary files a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings and b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings differ