commit 03ded7d39f343eb9df1432469331e57cd483734e
parent 53edc7eb0b32af322ec28f8fe0d2d4c9de1421da
Author: William Casarin <jb55@jb55.com>
Date: Sat, 26 Oct 2024 11:35:33 -0700
Merge Translations #2603
Terry Yiu (1):
Fix localization issues and export strings
Transifex (5):
Translate Localizable.strings in th
Translate Localizable.strings in ja
Translate Localizable.strings in ja
Translate Localizable.strings in nl
Translate Localizable.strings in hu_HU
Diffstat:
14 files changed, 37 insertions(+), 73 deletions(-)
diff --git 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 = "<group>"; };
50C3E0892AA8E3F7006A4BC0 /* AVPlayer+Additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVPlayer+Additions.swift"; sourceTree = "<group>"; };
50DA11252A16A23F00236234 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; };
- 5C0567572C8FBC560073F23A /* NDBSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NDBSearchView.swift; sourceTree = "<group>"; };
5C0567542C8B60C20073F23A /* OffsetExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OffsetExtension.swift; sourceTree = "<group>"; };
+ 5C0567572C8FBC560073F23A /* NDBSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NDBSearchView.swift; sourceTree = "<group>"; };
5C0707D02A1ECB38004E7B51 /* DamusLogoGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamusLogoGradient.swift; sourceTree = "<group>"; };
5C14C29A2BBBA29C00079FD2 /* RelaySoftwareDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelaySoftwareDetail.swift; sourceTree = "<group>"; };
5C14C29C2BBBA40B00079FD2 /* RelayAdminDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayAdminDetail.swift; sourceTree = "<group>"; };
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -340,6 +340,11 @@ Section header for text and appearance settings</note>
<target>Are you sure you want to delete all of your bookmarks?</target>
<note>Alert for deleting all of the bookmarks.</note>
</trans-unit>
+ <trans-unit id="Are you sure you want to upload the selected media?" xml:space="preserve">
+ <source>Are you sure you want to upload the selected media?</source>
+ <target>Are you sure you want to upload the selected media?</target>
+ <note>Alert message asking if the user wants to upload media.</note>
+ </trans-unit>
<trans-unit id="Are you sure you want to upload this image?" xml:space="preserve">
<source>Are you sure you want to upload this image?</source>
<target>Are you sure you want to upload this image?</target>
@@ -411,10 +416,10 @@ Context menu option for broadcasting the user's note to all of the user's connec
<target>Broadcast music playing on Apple Music</target>
<note>Toggle to enable or disable broadcasting what music is being played on Apple Music in their profile status.</note>
</trans-unit>
- <trans-unit id="By continuing you agree to our " xml:space="preserve">
- <source>By continuing you agree to our </source>
- <target>By continuing you agree to our </target>
- <note>No comment provided by engineer.</note>
+ <trans-unit id="By continuing, you agree to our EULA" xml:space="preserve">
+ <source>By continuing, you agree to our EULA</source>
+ <target>By continuing, you agree to our EULA</target>
+ <note>Disclaimer to user that they are agreeing to the End User License Agreement if they create an account or sign in.</note>
</trans-unit>
<trans-unit id="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/)" xml:space="preserve">
<source>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/)</source>
@@ -779,8 +784,7 @@ The duration in which to mute the given item.</note>
<trans-unit id="EULA" xml:space="preserve">
<source>EULA</source>
<target>EULA</target>
- <note>End User License Agreement
-Navigation title of view that shows the EULA, an acronym for End User License Agreement.</note>
+ <note>Navigation title of view that shows the EULA, an acronym for End User License Agreement.</note>
</trans-unit>
<trans-unit id="Earn Money" xml:space="preserve">
<source>Earn Money</source>
@@ -1237,7 +1241,8 @@ Button to navigate to login view.</note>
<source>Logout</source>
<target>Logout</target>
<note>Alert for logging out the user.
-Button for logging out the user.</note>
+Button for logging out the user.
+Sidebar menu label to sign out of the account.</note>
</trans-unit>
<trans-unit id="Looking for %@..." xml:space="preserve">
<source>Looking for %@...</source>
@@ -2062,11 +2067,6 @@ Section header for search/universe settings</note>
<target>Service</target>
<note>Prompt selection of translation service provider.</note>
</trans-unit>
- <trans-unit id="Set Status" xml:space="preserve">
- <source>Set Status</source>
- <target>Set Status</target>
- <note>Sidebar menu label to set user status</note>
- </trans-unit>
<trans-unit id="Settings" xml:space="preserve">
<source>Settings</source>
<target>Settings</target>
@@ -2472,6 +2472,11 @@ Example URL to LibreTranslate server</note>
<target>Unmute conversation</target>
<note>Context menu option for unmuting a conversation.</note>
</trans-unit>
+ <trans-unit id="Untitled" xml:space="preserve">
+ <source>Untitled</source>
+ <target>Untitled</target>
+ <note>Title of longform event if it is untitled.</note>
+ </trans-unit>
<trans-unit id="Update" xml:space="preserve">
<source>Update</source>
<target>Update</target>
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
Binary files differ.
diff --git a/damus/hu-HU.lproj/Localizable.strings b/damus/hu-HU.lproj/Localizable.strings
Binary files differ.
diff --git a/damus/ja.lproj/Localizable.strings b/damus/ja.lproj/Localizable.strings
Binary files differ.
diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings
Binary files differ.
