passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get Mac strings from main bundle 

Alter bundle in SwiftGen configuration file.
This commit is contained in:
Davide De Rosa 2022-07-18 02:40:44 +02:00
parent 04faf57d4c
commit b26e334881
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout.xcodeproj/project.pbxproj
View File

@ -115,7 +115,6 @@
0E96D2F92871D874005EFBCF /* LightProfileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E96D2F82871D874005EFBCF /* LightProfileManager.swift */; };
0E96D2FC2871D94E005EFBCF /* DefaultLightProfileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E96D2FB2871D94E005EFBCF /* DefaultLightProfileManager.swift */; };
0E96D2FD2871D964005EFBCF /* LightProfileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E96D2F82871D874005EFBCF /* LightProfileManager.swift */; };
0E96D2FE2871F688005EFBCF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0E9E5AE227B44CF1008C95DA /* Localizable.strings */; };
0E96D2FF2871F68B005EFBCF /* SwiftGen+Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBC075F27EC587900208AD9 /* SwiftGen+Strings.swift */; };
0E96D3002871F6C8005EFBCF /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB17EA127D2263700D473B5 /* Constants.swift */; };
0E96D30228720067005EFBCF /* LightVPNManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E96D30128720067005EFBCF /* LightVPNManager.swift */; };
@ -1207,7 +1206,6 @@
files = (
0E96D30B28720ED9005EFBCF /* Assets.xcassets in Resources */,
0EA1D84728805EAE00F3CA48 /* Flags.xcassets in Resources */,
0E96D2FE2871F688005EFBCF /* Localizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

14
Passepartout/AppShared/Constants/SwiftGen+Strings.swift
View File

@ -1030,19 +1030,7 @@ internal enum L10n {
extension L10n {
private static func tr(_ table: String, _ key: String, _ args: CVarArg...) -> String {
let format = BundleToken.bundle.localizedString(forKey: key, value: nil, table: table)
let format = Bundle.main.localizedString(forKey: key, value: nil, table: table)
return String(format: format, locale: Locale.current, arguments: args)
}
}
// swiftlint:disable convenience_type
private final class BundleToken {
static let bundle: Bundle = {
#if SWIFT_PACKAGE
return Bundle.module
#else
return Bundle(for: BundleToken.self)
#endif
}()
}
// swiftlint:enable convenience_type

26
swiftgen.yml
View File

@ -1,15 +1,17 @@
strings:
inputs:
- Passepartout/AppShared/en.lproj/Localizable.strings
outputs:
- templateName: structured-swift4
output: Passepartout/AppShared/Constants/SwiftGen+Strings.swift
inputs:
- Passepartout/AppShared/en.lproj/Localizable.strings
outputs:
- templateName: structured-swift4
output: Passepartout/AppShared/Constants/SwiftGen+Strings.swift
params:
bundle: Bundle.main
xcassets:
inputs:
- Passepartout/App/Assets.xcassets
- Passepartout/App/Flags.xcassets
- Passepartout/App/Providers.xcassets
outputs:
- templateName: swift4
output: Passepartout/App/Constants/SwiftGen+Assets.swift
inputs:
- Passepartout/App/Assets.xcassets
- Passepartout/App/Flags.xcassets
- Passepartout/App/Providers.xcassets
outputs:
- templateName: swift4
output: Passepartout/App/Constants/SwiftGen+Assets.swift