Release 5.5.0

Decybel07 · Jun 20, 2019 · aa3bc4e · aa3bc4e
1 parent db74f08
commit aa3bc4e
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,10 +12,10 @@ env:
 
   matrix:
     # iOS
-    - DESTINATION="OS=9.1,name=iPad Air"                      PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="YES"
-    - DESTINATION="OS=10.0,name=iPad Pro (12.9-inch)"         PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=9.1,name=iPad Air"                      PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=11.1,name=iPad Pro (12.9-inch)"         PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
 
-    - DESTINATION="OS=10.3,name=iPhone 7"                     PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=10.3.1,name=iPhone 7"                   PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
     - DESTINATION="OS=11.4,name=iPhone 8 Plus"                PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="NO"
     - DESTINATION="OS=12.2,name=iPhone X"                     PLATFORM="$IOS"       RUN_TESTS="YES"   BUILD_FRAMEWORK="YES" BUILD_EXAMPLE="YES"
 
@@ -48,7 +48,7 @@ script:
   # Build Framework
   - if [ $BUILD_FRAMEWORK == "YES" ]; then
       xcodebuild -project "L10n_swift.xcodeproj" -scheme "$FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
-      xcodebuild -project "L10n_swift.xcodeproj" -scheme "$FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build| xcpretty;
+      xcodebuild -project "L10n_swift.xcodeproj" -scheme "$FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
 
   # Run Tests
@@ -60,7 +60,7 @@ script:
   # Build Example
   - if [ $BUILD_EXAMPLE == "YES" ]; then
       xcodebuild -project "Example/Example.xcodeproj" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
-      xcodebuild -project "Example/Example.xcodeproj" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build| xcpretty;
+      xcodebuild -project "Example/Example.xcodeproj" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
     fi
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 # Change Log
 ---
 
+## [5.5.0](https://github.com/Decybel07/L10n-swift/tree/5.5.0) (2019-06-20)
+* Issue [#16](https://github.com/Decybel07/L10n-swift/issues/16) support for multiple arguments in plural function.
+
 ## [5.4.1](https://github.com/Decybel07/L10n-swift/tree/5.4.1) (2018-09-08)
 * `Local` includes system settings for the region
 

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
 		2DAB8C4A1F48943A00C22A0C /* SimpleTranslatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DAB8C3E1F48943A00C22A0C /* SimpleTranslatorViewController.swift */; };
 		2DB100D81F671E8A004ECBC5 /* RightToLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DB100D71F671E8A004ECBC5 /* RightToLeftViewController.swift */; };
 		2DC85EE322BB4CFF0052F15D /* L10n_swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DC85ED322BB4CB50052F15D /* L10n_swift.framework */; };
+		2DC85EE522BBEAC80052F15D /* L10n_swift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2DC85ED322BB4CB50052F15D /* L10n_swift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		2DCF92F520AE08EB00FB1ECC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2DCF92F420AE08EB00FB1ECC /* LaunchScreen.storyboard */; };
 		2DCF930F20AE090900FB1ECC /* Localizable.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2DCF92F720AE090900FB1ECC /* Localizable.plist */; };
 		2DCF931020AE090900FB1ECC /* Localizable.json in Resources */ = {isa = PBXBuildFile; fileRef = 2DCF92F920AE090900FB1ECC /* Localizable.json */; };
@@ -79,8 +80,29 @@
 			remoteGlobalIDString = 2DE4B13A1F2C95490067EE98;
 			remoteInfo = "L10n_swift iOS";
 		};
+		2DC85EE622BBEAC80052F15D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2DC85EC822BB4CB50052F15D /* L10n_swift.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2DE4B13A1F2C95490067EE98;
+			remoteInfo = "L10n_swift iOS";
+		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		2DC85EE822BBEAC80052F15D /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				2DC85EE522BBEAC80052F15D /* L10n_swift.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		2D1714871F2E757B00AADEB5 /* Example iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2DAB8C1F1F48943A00C22A0C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -244,11 +266,13 @@
 				2D1714831F2E757B00AADEB5 /* Sources */,
 				2D1714841F2E757B00AADEB5 /* Frameworks */,
 				2D1714851F2E757B00AADEB5 /* Resources */,
+				2DC85EE822BBEAC80052F15D /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				2DC85EE122BB4CF00052F15D /* PBXTargetDependency */,
+				2DC85EE722BBEAC80052F15D /* PBXTargetDependency */,
 			);
 			name = "Example iOS";
 			productName = iOS;
@@ -267,16 +291,15 @@
 					2D1714861F2E757B00AADEB5 = {
 						CreatedOnToolsVersion = 8.3.3;
 						LastSwiftMigration = 0900;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 2D1714801F2E74EF00AADEB5 /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				es,
 				ja,
@@ -390,6 +413,11 @@
 			name = "L10n_swift iOS";
 			targetProxy = 2DC85EE022BB4CF00052F15D /* PBXContainerItemProxy */;
 		};
+		2DC85EE722BBEAC80052F15D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "L10n_swift iOS";
+			targetProxy = 2DC85EE622BBEAC80052F15D /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -515,6 +543,7 @@
 		2D1714981F2E757B00AADEB5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -535,7 +564,9 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@@ -574,6 +605,7 @@
 		2D1714991F2E757B00AADEB5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -594,7 +626,9 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";

diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/Images/language480.mov b/Images/language480.mov
diff --git a/Images/language720.mov b/Images/language720.mov
diff --git a/Images/plurals480.mov b/Images/plurals480.mov
diff --git a/Images/plurals720.mov b/Images/plurals720.mov
diff --git a/Images/translator480.mov b/Images/translator480.mov
diff --git a/Images/translator720.mov b/Images/translator720.mov
diff --git 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.4.1'
+  spec.version          = '5.5.0'
   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
@@ -13,7 +13,7 @@ Pod::Spec.new do |spec|
       * Support for formats: `*.plist`, `*.json`, `*.stringsdict`, `*.strings`.
       * Support for grouping localization keys.
       * Support for plural forms in any language with multiple arguments.
-      * Use .l10n() to localized any string, date numbers.
+      * Use .l10n() to localized any string, date and numbers.
       * Use more than one languages at the same time.
                        DESC
 
@@ -23,7 +23,7 @@ Pod::Spec.new do |spec|
   spec.source           = { :git => "https://github.com/Decybel07/L10n-swift.git", :tag => spec.version }
 
   spec.frameworks = 'Foundation'
-  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
+  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
 
   spec.ios.deployment_target = '9.0'
   spec.watchos.deployment_target = '2.0'

diff --git a/L10n_swift.xcodeproj/project.pbxproj b/L10n_swift.xcodeproj/project.pbxproj
@@ -777,7 +777,6 @@
 					};
 					2DE4B1431F2C95490067EE98 = {
 						CreatedOnToolsVersion = 8.3.3;
-						DevelopmentTeam = J9YB6F3PT7;
 						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
@@ -793,7 +792,6 @@
 					};
 					2DE4B16C1F2C957A0067EE98 = {
 						CreatedOnToolsVersion = 8.3.3;
-						DevelopmentTeam = J9YB6F3PT7;
 						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
@@ -804,7 +802,6 @@
 					};
 					2DE4B1881F2C95A70067EE98 = {
 						CreatedOnToolsVersion = 8.3.3;
-						DevelopmentTeam = J9YB6F3PT7;
 						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
@@ -1396,10 +1393,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1423,6 +1422,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOSTests";
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1453,10 +1453,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1473,6 +1475,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "CodingLifestyle.L10n-iOSTests";
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
@@ -1761,7 +1764,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1817,7 +1820,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1996,7 +1999,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -2054,7 +2057,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = J9YB6F3PT7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ L10n-swift is a simple framework that improves localization in swift app, provid
 - [x] Support for user-defined `Localizable` file names.
 - [x] Support for formats: [`*.plist`](https://github.com/Decybel07/L10n-swift/wiki/*.plist), [`*.json`](https://github.com/Decybel07/L10n-swift/wiki/*.json), [`*.stringsdict`](https://github.com/Decybel07/L10n-swift/wiki/*.stringsdict), [`*.strings`](https://github.com/Decybel07/L10n-swift/wiki/*.strings).
 - [x] Support for grouping localization keys.
-- [x] Support for [**plural**](https://github.com/Decybel07/L10n-swift/wiki/Plural) forms in any language.
-- [x] Use `.l10n()` to localized any string, date, int and double.
+- [x] Support for [**plural**](https://github.com/Decybel07/L10n-swift/wiki/Plural) forms in any language with multiple arguments.
+- [x] Use `.l10n()` to localized any string, date and numbers
 - [x] Use more than one languages at the same time.
 - [x] About 25 times faster than a native solution.
 
@@ -70,13 +70,13 @@ pod try L10n-swift
 ### [CocoaPods](http://cocoapods.org)
 
  ```ruby
- pod 'L10n-swift', '~> 5.4'
+ pod 'L10n-swift', '~> 5.5'
  ```
 
 ### [Carthage](https://github.com/Carthage/Carthage)
 
 ```ogdl
-github "Decybel07/L10n-swift", ~> 5.4
+github "Decybel07/L10n-swift", ~> 5.5
 ```
 
 ### [Swift Package Manager](https://swift.org/package-manager/)
@@ -101,7 +101,7 @@ github "Decybel07/L10n-swift", ~> 5.4
 
 ### Get localized number
 
- Add `.l10()` following any `Int`,  `Double` or `NSNumber` object you want localized. Using the number format for the current language:
+ Add `.l10()` following number you want localized. Using the number format for the current language:
  ```swift
  12.l10n()
  24.l10n(minIntegerDigits: 4)
@@ -126,9 +126,9 @@ github "Decybel07/L10n-swift", ~> 5.4
 
 ### Get plural
 
-Add `.l10(arg: CVarArg)` following any `String` object you want translated with plurals:
+Add `.l10nPlural(CVarArg...)` following any `String` object you want translated with plurals:
  ```swift
- "numberOfApples".l10n(arg: 2)
+ "numberOfApples".l10nPlural(2)
  ```
  More about plurals, you can read on [**wiki**](https://github.com/Decybel07/L10n-swift/wiki/Plural)