diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index a190ae5..4523900 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ B0C6AD042AD6E65700E64698 /* ReleaseDateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0C6AD032AD6E65700E64698 /* ReleaseDateView.swift */; }; B0C6AD0B2AD9178E00E64698 /* IdenticalBuildView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0C6AD0A2AD9178E00E64698 /* IdenticalBuildView.swift */; }; B0C6AD0D2AD91D7900E64698 /* IconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0C6AD0C2AD91D7900E64698 /* IconView.swift */; }; - C02500722B5B7F7300E826A1 /* String+.swift in Sources */ = {isa = PBXBuildFile; fileRef = C02500712B5B7F7300E826A1 /* String+.swift */; }; CA11E7BA2598476C00D2EE1C /* XcodeCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA11E7B92598476C00D2EE1C /* XcodeCommands.swift */; }; CA2518EC25A7FF2B00F08414 /* AppStateUpdateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2518EB25A7FF2B00F08414 /* AppStateUpdateTests.swift */; }; CA25192A25A9644800F08414 /* XcodeInstallState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA25192925A9644800F08414 /* XcodeInstallState.swift */; }; @@ -210,7 +209,6 @@ B0C6AD032AD6E65700E64698 /* ReleaseDateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReleaseDateView.swift; sourceTree = ""; }; B0C6AD0A2AD9178E00E64698 /* IdenticalBuildView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdenticalBuildView.swift; sourceTree = ""; }; B0C6AD0C2AD91D7900E64698 /* IconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconView.swift; sourceTree = ""; }; - C02500712B5B7F7300E826A1 /* String+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+.swift"; sourceTree = ""; }; CA11E7B92598476C00D2EE1C /* XcodeCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeCommands.swift; sourceTree = ""; }; CA2518EB25A7FF2B00F08414 /* AppStateUpdateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateUpdateTests.swift; sourceTree = ""; }; CA25192925A9644800F08414 /* XcodeInstallState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeInstallState.swift; sourceTree = ""; }; @@ -382,7 +380,6 @@ 536CFDD3263C9A8000026CE0 /* XcodesSheet.swift */, 53CBAB2B263DCC9100410495 /* XcodesAlert.swift */, E84B7D0C2B296A8900DBDA2B /* NavigationSplitViewWrapper.swift */, - C02500712B5B7F7300E826A1 /* String+.swift */, ); path = Common; sourceTree = ""; @@ -889,7 +886,6 @@ CA9FF8662595130600E47BAF /* View+IsHidden.swift in Sources */, CAE4248C259A68B800B8B246 /* Optional+IsNotNil.swift in Sources */, B0C6AD0D2AD91D7900E64698 /* IconView.swift in Sources */, - C02500722B5B7F7300E826A1 /* String+.swift in Sources */, CA9FF9362595B44700E47BAF /* HelperClient.swift in Sources */, B0C6AD042AD6E65700E64698 /* ReleaseDateView.swift in Sources */, CAA8587C25A2B37900ACF8C0 /* IsTesting.swift in Sources */, diff --git a/Xcodes/Frontend/Common/String+.swift b/Xcodes/Frontend/Common/String+.swift deleted file mode 100644 index cab5f89..0000000 --- a/Xcodes/Frontend/Common/String+.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// String+.swift -// Xcodes -// -// Created by Jinyu Meng on 2024/01/20. -// Copyright © 2024 Robots and Pencils. All rights reserved. -// - -import Foundation - -extension String { - // Declare String as String explicitly. Prevent it from being recognized as a LocalizedStringKey. - var hideInLocalizations: String { - return String(self) - } -} diff --git a/Xcodes/Frontend/InfoPane/CornerRadiusModifier.swift b/Xcodes/Frontend/InfoPane/CornerRadiusModifier.swift index 8b71b37..2d7332f 100644 --- a/Xcodes/Frontend/InfoPane/CornerRadiusModifier.swift +++ b/Xcodes/Frontend/InfoPane/CornerRadiusModifier.swift @@ -29,7 +29,7 @@ extension View { struct Previews_CornerRadius_Previews: PreviewProvider { static var previews: some View { HStack { - Text("XCODES RULES!".hideInLocalizations) + Text(verbatim: "XCODES RULES!") }.xcodesBackground() } } diff --git a/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift b/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift index 78de8f6..7d2d11a 100644 --- a/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift +++ b/Xcodes/Frontend/InfoPane/IdenticalBuildView.swift @@ -29,7 +29,7 @@ struct IdenticalBuildsView: View { .font(.headline) ForEach(builds, id: \.description) { version in - Text("• \(version.appleDescription)".hideInLocalizations) + Text(verbatim: "• \(version.appleDescription)") .font(.subheadline) } } diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index eef31b5..2d01e1a 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -80,12 +80,14 @@ struct AdvancedPreferencePane: View { GroupBox(label: Text("Active/Select")) { VStack(alignment: .leading) { - Picker("OnSelect".hideInLocalizations, selection: $appState.onSelectActionType) { + Picker(selection: $appState.onSelectActionType) { Text(SelectedActionType.none.description) .tag(SelectedActionType.none) Text(SelectedActionType.rename.description) .tag(SelectedActionType.rename) + } label: { + Text(verbatim: "OnSelect") } .labelsHidden() .pickerStyle(.inline) diff --git a/Xcodes/Frontend/SignIn/SignInCredentialsView.swift b/Xcodes/Frontend/SignIn/SignInCredentialsView.swift index 8dabd39..0aecd28 100644 --- a/Xcodes/Frontend/SignIn/SignInCredentialsView.swift +++ b/Xcodes/Frontend/SignIn/SignInCredentialsView.swift @@ -13,7 +13,9 @@ struct SignInCredentialsView: View { HStack { Text("AppleID") .frame(minWidth: 100, alignment: .trailing) - TextField("example@icloud.com".hideInLocalizations, text: $username) + TextField(text: $username) { + Text(verbatim: "example@icloud.com") + } } HStack { Text("Password") diff --git a/Xcodes/Frontend/View+IsHidden.swift b/Xcodes/Frontend/View+IsHidden.swift index 20f66c9..887605f 100644 --- a/Xcodes/Frontend/View+IsHidden.swift +++ b/Xcodes/Frontend/View+IsHidden.swift @@ -14,10 +14,10 @@ extension View { struct View_IsHidden_Previews: PreviewProvider { static var previews: some View { Group { - Text("Not Hidden".hideInLocalizations) + Text(verbatim: "Not Hidden") .isHidden(false) - Text("Hidden".hideInLocalizations) + Text(verbatim: "Hidden") .isHidden(true) } } diff --git a/Xcodes/Resources/Localizable.xcstrings b/Xcodes/Resources/Localizable.xcstrings index cacb359..b8a1b0c 100644 --- a/Xcodes/Resources/Localizable.xcstrings +++ b/Xcodes/Resources/Localizable.xcstrings @@ -3073,6 +3073,12 @@ "state" : "translated", "value" : "Apple Silikon" } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } } } },