From 3d62494cb54643c56d5c729b64d43d4c40b7ed20 Mon Sep 17 00:00:00 2001 From: Adrian Bobrowski Date: Mon, 20 Jul 2020 09:44:54 +0200 Subject: [PATCH] Prular bugfix with stringsdict --- CHANGELOG.md | 3 +++ L10n-swift.podspec | 2 +- L10n_swift.xcodeproj/project.pbxproj | 16 ++++++++-------- .../Provider/StringsdictResourceProvider.swift | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a1b677..42e822b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ # Change Log --- +## [5.7.1](https://github.com/Decybel07/L10n-swift/tree/5.7.1) (2020-07-20) +* Prular bugfix with `stringsdict` + ## [5.7.0](https://github.com/Decybel07/L10n-swift/tree/5.7.0) (2020-05-07) * Support for pseudo-languages: `NonLocalized`, `DoubleLength`, `Accented`, `Bounded`, `ForcedRightToLeft`. diff --git a/L10n-swift.podspec b/L10n-swift.podspec index 222b289..c9c4ed4 100644 --- a/L10n-swift.podspec +++ b/L10n-swift.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |spec| spec.name = 'L10n-swift' spec.module_name = 'L10n_swift' - spec.version = '5.7.0' + spec.version = '5.7.1' spec.summary = 'Localization of an application with ability to change language "on the fly" and support for plural forms in any language.' spec.description = <<-DESC diff --git a/L10n_swift.xcodeproj/project.pbxproj b/L10n_swift.xcodeproj/project.pbxproj index 268d73b..352f047 100644 --- a/L10n_swift.xcodeproj/project.pbxproj +++ b/L10n_swift.xcodeproj/project.pbxproj @@ -1441,7 +1441,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOS"; @@ -1504,7 +1504,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1684,7 +1684,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-watchOS"; @@ -1747,7 +1747,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-watchOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -1814,7 +1814,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-tvOS"; @@ -1876,7 +1876,7 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-tvOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; @@ -2051,7 +2051,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-macOS"; @@ -2114,7 +2114,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 5.6.1; + MARKETING_VERSION = 5.7.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-macOS"; PRODUCT_NAME = "$(PROJECT_NAME)"; diff --git a/Source/Core/Resource/Provider/StringsdictResourceProvider.swift b/Source/Core/Resource/Provider/StringsdictResourceProvider.swift index 6b7649c..0dee233 100644 --- a/Source/Core/Resource/Provider/StringsdictResourceProvider.swift +++ b/Source/Core/Resource/Provider/StringsdictResourceProvider.swift @@ -24,7 +24,7 @@ internal struct StringsdictResourceProvider: ResourceProvider { guard let format = dictionary[$0] as? [String: Any] else { return } - if let value = format["NSStringLocalizedFormatKey"] as? [String] { + if let value = format["NSStringLocalizedFormatKey"] as? String { dictionary["format"] = value } else if let value = format["NSStringVariableWidthRuleType"] as? [String: Any] { dictionary[$0] = value