diff --git a/Localize-Swift.podspec b/Localize-Swift.podspec index 7ab386e..d387f3d 100644 --- a/Localize-Swift.podspec +++ b/Localize-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Localize-Swift" - s.version = "3.2.0" + s.version = "3.2.0.1" s.summary = "Swift-friendly localization and i18n syntax with in-app language switching." s.description = <<-DESC A simple framework that improves localization and i18n in Swift apps with cleaner syntax and in-app language switching. diff --git a/Localize_Swift/Info.plist b/Localize_Swift/Info.plist index 487d2bb..0a3efd6 100644 --- a/Localize_Swift/Info.plist +++ b/Localize_Swift/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.2.0 + 3.2.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Localize_SwiftTests/Info.plist b/Localize_SwiftTests/Info.plist index eaeab44..88ec2ab 100644 --- a/Localize_SwiftTests/Info.plist +++ b/Localize_SwiftTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.2.0 + 3.2.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Sources/String+LocalizedBundleTableName.swift b/Sources/String+LocalizedBundleTableName.swift index a718087..6f48cbe 100644 --- a/Sources/String+LocalizedBundleTableName.swift +++ b/Sources/String+LocalizedBundleTableName.swift @@ -24,10 +24,18 @@ public extension String { func localized(using tableName: String?, in bundle: Bundle?) -> String { let bundle: Bundle = bundle ?? .main if let path = bundle.path(forResource: Localize.currentLanguage(), ofType: "lproj"), - let bundle = Bundle(path: path) { - return bundle.localizedString(forKey: self, value: nil, table: tableName) - } - else if let path = bundle.path(forResource: LCLBaseBundle, ofType: "lproj"), + + let currentLanguageBundle = Bundle(path: path) { + let localizedString = currentLanguageBundle.localizedString(forKey: self, value: nil, table: tableName) + + if localizedString == self, + let basePath = bundle.path(forResource: LCLBaseBundle, ofType: "lproj"), + let bundle = Bundle(path: basePath) { + return bundle.localizedString(forKey: self, value: nil, table: tableName) + } else { + return localizedString + } + } else if let path = bundle.path(forResource: LCLBaseBundle, ofType: "lproj"), let bundle = Bundle(path: path) { return bundle.localizedString(forKey: self, value: nil, table: tableName) }