From 9c39f92e1f99a8dbdfec493507a505e9f3ec6af8 Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Fri, 6 Apr 2018 15:07:47 -0500
Subject: [PATCH 1/9] Update logic with UIExtensions

---
 Example/Example.xcodeproj/project.pbxproj     |  10 +-
 .../xcshareddata/xcschemes/Example.xcscheme   |   4 +-
 Example/Example/Base.lproj/Main.storyboard    |  15 +-
 .../LaunchImage.launchimage/Contents.json     |  25 +-
 Localize.xcodeproj/project.pbxproj            |  10 +-
 .../xcshareddata/xcschemes/Localize.xcscheme  |   4 +-
 .../xcschemes/LocalizeTests.xcscheme          |   4 +-
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 Source/Localize.swift                         |  26 +-
 Source/LocalizeCommonProtocol.swift           |  10 +-
 Source/LocalizeExtensions.swift               | 335 +++++-------------
 Source/LocalizeJson.swift                     |  36 +-
 Source/LocalizeStrings.swift                  |   2 +-
 13 files changed, 162 insertions(+), 327 deletions(-)
 create mode 100644 Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index f35ad6f..d47e239 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -153,7 +153,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "Kekiiwaa ";
 				TargetAttributes = {
 					9F8D414C1E29359A00D7CE9A = {
@@ -267,6 +267,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -274,6 +275,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -324,6 +326,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -331,6 +334,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -367,7 +371,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 69RRCEKXZC;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -386,7 +390,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 69RRCEKXZC;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Example/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
index 9c9ef90..548b2cb 100644
--- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
+++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index 9716529..d9c016f 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="3md-ly-arL">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="3md-ly-arL">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,7 +23,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Some text here" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BBe-T0-9G7">
-                                <rect key="frame" x="16" y="80" width="343" height="21"/>
+                                <rect key="frame" x="16" y="80" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -32,7 +32,7 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Search" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HTc-mN-LYL">
-                                <rect key="frame" x="16" y="117" width="343" height="30"/>
+                                <rect key="frame" x="16" y="116.5" width="343" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
@@ -46,6 +46,9 @@
                                     <constraint firstAttribute="height" constant="45" id="eO6-Rr-kSy"/>
                                 </constraints>
                                 <state key="normal" title="Continue"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="Continue"/>
+                                </userDefinedRuntimeAttributes>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t6w-Gh-I1B">
                                 <rect key="frame" x="16" y="545" width="343" height="45"/>
@@ -61,7 +64,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Language" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eRz-bg-Iry">
-                                <rect key="frame" x="16" y="163" width="343" height="21"/>
+                                <rect key="frame" x="16" y="162.5" width="343" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -107,7 +110,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="3md-ly-arL" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="gtX-QQ-nV6">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
diff --git a/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
index 5a29666..a0ad363 100644
--- a/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/Example/Example/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,43 +3,30 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
-      "idiom" : "iphone",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/Localize.xcodeproj/project.pbxproj b/Localize.xcodeproj/project.pbxproj
index b3b07d0..1462c52 100644
--- a/Localize.xcodeproj/project.pbxproj
+++ b/Localize.xcodeproj/project.pbxproj
@@ -230,7 +230,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Kekiiwaa;
 				TargetAttributes = {
 					69F1B5731D955990000A2B87 = {
@@ -366,6 +366,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -373,6 +374,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -427,6 +429,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -434,6 +437,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -525,7 +529,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kekiiwaa.localize-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -541,7 +545,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.kekiiwaa.localize-test";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
index 00f83ae..1a85168 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
index 33e266e..41a8596 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Localize.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Source/Localize.swift b/Source/Localize.swift
index 2b9dd42..f833fdd 100644
--- a/Source/Localize.swift
+++ b/Source/Localize.swift
@@ -48,7 +48,7 @@ public class Localize: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, tableName: tableName)
+        return provider.localize(key: key, tableName: tableName)
     }
     
     /// Localize a string using your JSON File
@@ -58,7 +58,7 @@ public class Localize: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, replace:String, tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, replace: replace, tableName:tableName)
+        return provider.localize(key: key, replace: replace, tableName:tableName)
     }
     
     /// Localize a string using your JSON File
@@ -68,7 +68,7 @@ public class Localize: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, values:[Any], tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, values: values, tableName:tableName)
+        return provider.localize(key: key, values: values, tableName:tableName)
     }
     
     /// Localize string with dictionary values
@@ -79,7 +79,7 @@ public class Localize: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, dictionary:[String:String], tableName:String? = nil) -> String {
-        return self.provider.localize(key: key, dictionary: dictionary, tableName:tableName)
+        return provider.localize(key: key, dictionary: dictionary, tableName:tableName)
     }
 
     
@@ -90,52 +90,52 @@ public class Localize: NSObject {
     ///
     /// - returns: current used language
     public func language() -> String {
-        return self.provider.language()
+        return provider.language()
     }
     
     /// Update default language, this stores a language key which can be retrieved the next time
     public func update(language: String) -> Void {
-        self.provider.update(language: language)
+        provider.update(language: language)
     }
     
     /// Update base file name, searched in path.
     public func update(fileName:String) {
-        self.provider.update(fileName: fileName)
+        provider.update(fileName: fileName)
     }
     
     /// Update the bundle used to load files from.
     public func update(bundle: Bundle) {
-        self.provider.update(bundle: bundle)
+        provider.update(bundle: bundle)
     }
 
     /// Update default language
     public func update(defaultLanguage: String) {
-        self.provider.update(defaultLanguage: defaultLanguage)
+        provider.update(defaultLanguage: defaultLanguage)
     }
     
     /// This remove the language key storaged.
     public func resetLanguage() -> Void {
-        self.provider.resetLanguage()
+        provider.resetLanguage()
     }
     
     /// Show all aviable languajes whit criteria name
     ///
     /// - returns: list with storaged languages code
     public func availableLanguages() -> [String] {
-        return self.provider.availableLanguages()
+        return provider.availableLanguages()
     }
     
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
     public func displayNameForLanguage(_ language: String) -> String {
-        return self.provider.displayNameForLanguage(language)
+        return provider.displayNameForLanguage(language)
     }
     
     /// Enable testing mode
     /// Please not use in your code, is only for test schema.
     public func testingMode() {
-        self.provider.testingMode()
+        provider.testingMode()
     }
     
     // MARK: Config providers
diff --git a/Source/LocalizeCommonProtocol.swift b/Source/LocalizeCommonProtocol.swift
index bad0fc6..5bfbbc9 100644
--- a/Source/LocalizeCommonProtocol.swift
+++ b/Source/LocalizeCommonProtocol.swift
@@ -52,7 +52,7 @@ class LocalizeCommonProtocol: NSObject {
     ///
     /// - returns: a string url where is your file
     internal func bundle() -> Bundle {
-        if self.testing {
+        if testing {
             return Bundle(for: type(of: self))
         }
         return usedBundle
@@ -86,7 +86,7 @@ class LocalizeCommonProtocol: NSObject {
     ///
     /// - return: String form language code in current user language
     public func displayNameForLanguage(_ language: String) -> String {
-        let locale : NSLocale = NSLocale(localeIdentifier: self.currentLanguage)
+        let locale : NSLocale = NSLocale(localeIdentifier: currentLanguage)
         if let name = locale.displayName(forKey: NSLocale.Key.identifier, value: language) {
             return name.capitalized
         }
@@ -139,7 +139,7 @@ class LocalizeCommonProtocol: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, replace:String, tableName:String? = nil) -> String {
-        let string = self.localize(key: key, tableName:tableName)
+        let string = localize(key: key, tableName:tableName)
 
         return string.replacingOccurrences(of: "%", with: replace)
     }
@@ -151,7 +151,7 @@ class LocalizeCommonProtocol: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, values replace:[Any], tableName:String? = nil) -> String {
-        var string = self.localize(key: key, tableName:tableName)
+        var string = localize(key: key, tableName:tableName)
         if string == key {
             return key
         }
@@ -177,7 +177,7 @@ class LocalizeCommonProtocol: NSObject {
     ///
     /// - returns: localized key or same text
     public func localize(key:String, dictionary replace:[String:String], tableName:String? = nil) -> String {
-        var string = self.localize(key: key, tableName:tableName)
+        var string = localize(key: key, tableName:tableName)
         for (key, value) in replace {
             string = string.replacingOccurrences(of: ":\(key)", with: value)
         }
diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index 1b86418..0c885fd 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -10,17 +10,38 @@ import UIKit
 private var localizeKey1: UInt8 = 0
 private var localizeKey2: UInt8 = 1
 
+extension NSCoding {
+    fileprivate func localizedValue(forObject object: Any, key: UnsafeMutablePointer<UInt8>) -> String? {
+        return objc_getAssociatedObject(object, key) as? String
+    }
+    
+    fileprivate func setLocalizedValue(_ value: String?, forObject object: Any, key: UnsafeMutablePointer<UInt8>) {
+        guard let value = value else {
+            return
+        }
+        
+        objc_setAssociatedObject(self, key, value, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
+    }
+}
+
+extension NotificationCenter {
+    fileprivate static func localize(observer: Any, selector: Selector) {
+        NotificationCenter.default.addObserver(
+            observer,
+            selector: selector,
+            name: NSNotification.Name(LocalizeChangeNotification),
+            object: nil
+        )
+    }
+}
+
 /// Extension for UI element is the easier way to localize your keys.
 extension UIBarButtonItem {
     
     /// Localizable tag storeged property
-    @IBInspectable public var localizeKey: String! {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+    @IBInspectable public var localizeKey: String? {
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -28,37 +49,23 @@ extension UIBarButtonItem {
     /// Set title for UIBarButtonItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        if self.localizeKey != nil {
-            self.title = self.localizeKey?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeKey == nil && self.title != title {
-                self.localizeKey = title
-            }
-        }
+        title = localizeKey?.localize() ?? title?.localize() ?? title
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UIButton {
     
     /// Localizable tag storeged property
-    @IBInspectable public var localizeKey: String! {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+    @IBInspectable public var localizeKey: String? {
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -66,31 +73,18 @@ extension UIButton {
     /// Set title for UIButton in each state
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        if self.localizeKey != nil {
-            for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
-                if let title = title(for: state) , !title.isEmpty {
-                    self.setTitle(self.localizeKey?.localize(), for: state)
-                }
-            }
-            return
-        }
         for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
-            if let title = title(for: state), !title.isEmpty {
-                let localized = title.localize()
-                self.setTitle(localized, for: state)
-                if self.localizeKey == nil && localized != title {
-                    self.localizeKey = title
-                }
-            }
+            var title = self.title(for: state)
+            title = localizeKey?.localize() ?? title?.localize() ?? title
+            setTitle(title, for: state)
         }
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -98,12 +92,8 @@ extension UILabel {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -111,24 +101,14 @@ extension UILabel {
     /// Set title for UILabel
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        if self.localizeKey != nil {
-            self.text = self.localizeKey?.localize()
-            return
-        }
-        if let text = text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeKey == nil && self.text != text {
-                self.localizeKey = text
-            }
-        }
+        text = localizeKey?.localize() ?? text?.localize() ?? text
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -136,22 +116,14 @@ extension UINavigationItem {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeTitle: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey2) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -159,44 +131,15 @@ extension UINavigationItem {
     /// Set title and prompt for UINavigationItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        self.localizeTitleFN()
-        self.localizePromptFN()
-    }
-    
-    /// Here we change text with key replacement for title
-    func localizeTitleFN() {
-        if self.localizeTitle != nil {
-            self.title = self.localizeTitle?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeTitle == nil && self.title != title {
-                self.localizeTitle = title
-            }
-        }
+        title = localizeTitle?.localize() ?? title?.localize() ?? title
+        prompt = localizePrompt?.localize() ?? prompt?.localize() ?? prompt
     }
-    
-    /// Here we change text with key replacement for prompt
-    func localizePromptFN() {
-        if self.localizePrompt != nil {
-            self.prompt = self.localizePrompt?.localize()
-            return
-        }
-        if let prompt = self.prompt, !prompt.isEmpty {
-            self.prompt = prompt.localize()
-            if self.localizePrompt == nil && self.prompt != prompt {
-                self.localizePrompt = prompt
-            }
-        }
-    }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -204,22 +147,14 @@ extension UISearchBar {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey2) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -227,44 +162,15 @@ extension UISearchBar {
     /// Set title and prompt for UISearchBar
     open override  func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        self.localizePlaceholderFN()
-        self.localizePromptFN()
-    }
-    
-    /// Here we change text with key replacement for placeholder
-    func localizePlaceholderFN() {
-        if self.localizePlaceholder != nil {
-            self.placeholder = self.localizePlaceholder?.localize()
-            return
-        }
-        if let placeholder = self.placeholder, !placeholder.isEmpty {
-            self.placeholder = placeholder.localize()
-            if self.localizePlaceholder == nil && self.placeholder != placeholder {
-                self.localizePlaceholder = placeholder
-            }
-        }
-    }
-    
-    /// Here we change text with key replacement for prompt
-    func localizePromptFN() {
-        if self.localizePrompt != nil {
-            self.prompt = self.localizePrompt?.localize()
-            return
-        }
-        if let prompt = self.prompt, !prompt.isEmpty {
-            self.prompt = prompt.localize()
-            if self.localizePrompt == nil && self.prompt != prompt {
-                self.localizePrompt = prompt
-            }
-        }
+        placeholder = localizePlaceholder?.localize() ?? placeholder?.localize() ?? placeholder
+        prompt = localizePrompt?.localize() ?? prompt?.localize() ?? prompt
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -272,12 +178,8 @@ extension UISegmentedControl {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -285,19 +187,17 @@ extension UISegmentedControl {
     /// Set title for UISegmentedControl in each state
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        for index in 0...(self.numberOfSegments - 1) {
-            if let title = self.titleForSegment(at: index), !title.isEmpty {
-                self.setTitle(title.localize(), forSegmentAt: index)
-            }
+        for index in 0...(numberOfSegments - 1) {
+            var title = titleForSegment(at: index)
+            title = localizeKey?.localize() ?? title?.localize() ?? title
         }
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -305,12 +205,8 @@ extension UITabBarItem {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -318,24 +214,14 @@ extension UITabBarItem {
     /// Set title for UITabBarItem
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        if self.localizeKey != nil {
-            self.title = self.localizeKey?.localize()
-            return
-        }
-        if let title = self.title, !title.isEmpty {
-            self.title = title.localize()
-            if self.localizeKey == nil && self.title != title {
-                self.localizeKey = title
-            }
-        }
+        title = localizeKey?.localize() ?? title?.localize() ?? title
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -343,22 +229,14 @@ extension UITextField {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeText: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey2) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey2, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey2) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -366,44 +244,15 @@ extension UITextField {
     /// Set title and placeholder for UITextField
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        self.localizePlaceholderFN()
-        self.localizeTextFN()
-    }
-    
-    /// Here we change text with key replacement for placeholder
-    func localizePlaceholderFN() {
-        if self.localizePlaceholder != nil {
-            self.placeholder = self.localizePlaceholder?.localize()
-            return
-        }
-        if let placeholder = self.placeholder, !placeholder.isEmpty {
-            self.placeholder = placeholder.localize()
-            if self.localizePlaceholder == nil && self.placeholder != placeholder {
-                self.localizePlaceholder = placeholder
-            }
-        }
-    }
-    
-    /// Here we change text with key replacement for text
-    func localizeTextFN() {
-        if self.localizeText != nil {
-            self.text = self.localizeText?.localize()
-            return
-        }
-        if let text = self.text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeText == nil && self.text != text {
-                self.localizeText = text
-            }
-        }
+        placeholder = localizePlaceholder?.localize() ?? placeholder?.localize() ?? placeholder
+        text = localizeText?.localize() ?? text?.localize() ?? text
     }
-    
 }
 
 /// Extension for UI element is the easier way to localize your keys.
@@ -411,12 +260,8 @@ extension UITextView {
     
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get {
-            return objc_getAssociatedObject(self, &localizeKey1) as? String
-        }
-        set(newValue) {
-            objc_setAssociatedObject(self, &localizeKey1, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
-        }
+        get { return localizedValue(forObject: self, key: &localizeKey1) }
+        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -424,22 +269,12 @@ extension UITextView {
     /// Set title for UITextView
     open override func awakeFromNib() {
         super.awakeFromNib()
-        self.localize()
-        NotificationCenter.default.addObserver(self, selector: #selector(localize), name: NSNotification.Name(LocalizeChangeNotification), object: nil)
+        localize()
+        NotificationCenter.localize(observer: self, selector: #selector(localize))
     }
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        if self.localizeKey != nil {
-            self.text = self.localizeKey?.localize()
-            return
-        }
-        if let text = self.text, !text.isEmpty {
-            self.text = text.localize()
-            if self.localizeKey == nil && self.text != text {
-                self.localizeKey = text
-            }
-        }
+        text = localizeKey?.localize() ?? text?.localize() ?? text
     }
-    
 }
diff --git a/Source/LocalizeJson.swift b/Source/LocalizeJson.swift
index 2e70a75..9c29c48 100644
--- a/Source/LocalizeJson.swift
+++ b/Source/LocalizeJson.swift
@@ -21,19 +21,19 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     /// If JSON not is defined, this try use a default
     /// As long as the default language is the same as the current one.
     private func readJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? self.fileName
-        var lang = self.currentLanguage
-        var json = self.readJSON(named: "\(tableName)-\(lang)")
+        let tableName = tableName ?? fileName
+        var lang = currentLanguage
+        var json = readJSON(named: "\(tableName)-\(lang)")
         
         if json != nil {
             return json
         }
         
         lang = lang.components(separatedBy: "-")[0]
-        json = self.readJSON(named: "\(tableName)-\(lang)")
+        json = readJSON(named: "\(tableName)-\(lang)")
         
-        if json == nil && lang != self.defaultLanguage {
-            json = self.readDefaultJSON()
+        if json == nil && lang != defaultLanguage {
+            json = readDefaultJSON()
         }
         
         return json
@@ -43,15 +43,15 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     ///
     /// - returns: json or nil value.
     private func readDefaultJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? self.fileName
-        return self.readJSON(named: "\(tableName)-\(self.defaultLanguage)")
+        let tableName = tableName ?? fileName
+        return readJSON(named: "\(tableName)-\(defaultLanguage)")
     }
     
     /// This method has path where file is
     /// If can't find a path return a nil value
     /// If can't serialize data return a nil value
     private func readJSON(named name:String) -> NSDictionary? {
-        guard let path = self.bundle().path(forResource: name, ofType: "json") else {
+        guard let path = bundle().path(forResource: name, ofType: "json") else {
             return nil
         }
         guard let data = try? Data(contentsOf: URL(fileURLWithPath: path)) else {
@@ -70,12 +70,12 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     /// Try search key in your dictionary using single level
     /// If it doesn't find the key it will use the multilevel
     /// If the key not exis in your JSON return nil value
-    private func localizeFile(key:String, json:NSDictionary) -> String? {
+    private func localizeFile(key: String, json: NSDictionary) -> String? {
         if let string = json[key] {
             return string as? String
         }
         
-        if let string = self.localizeLevel(key: key, json: json) {
+        if let string = localizeLevel(key: key, json: json) {
             return string
         }
         
@@ -105,21 +105,21 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public override func localize(key:String, tableName:String? = nil) -> String {
-        guard let json = self.readJSON(tableName: tableName) else {
+    public override func localize(key: String, tableName: String? = nil) -> String {
+        guard let json = readJSON(tableName: tableName) else {
             return key
         }
         
-        let string = self.localizeFile(key: key, json: json)
+        let string = localizeFile(key: key, json: json)
         if string != nil {
             return string!
         }
         
-        guard let defaultJSON = self.readDefaultJSON(tableName: tableName) else {
+        guard let defaultJSON = readDefaultJSON(tableName: tableName) else {
             return key
         }
         
-        let defaultString = self.localizeFile(key: key, json: defaultJSON)
+        let defaultString = localizeFile(key: key, json: defaultJSON)
         if defaultString != nil {
             return defaultString!
         }
@@ -138,8 +138,8 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
         var languages : [String] = []
 
         for localeId in NSLocale.availableLocaleIdentifiers {
-            let name = "\(self.fileName)-\(localeId)"
-            let path = self.bundle().path(forResource: name, ofType: "json")
+            let name = "\(fileName)-\(localeId)"
+            let path = bundle().path(forResource: name, ofType: "json")
             if path != nil {
                 languages.append(localeId)
             }
diff --git a/Source/LocalizeStrings.swift b/Source/LocalizeStrings.swift
index ed4e97d..ae39dd8 100644
--- a/Source/LocalizeStrings.swift
+++ b/Source/LocalizeStrings.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-class LocalizeStrings:LocalizeCommonProtocol, LocalizeProtocol {
+class LocalizeStrings: LocalizeCommonProtocol, LocalizeProtocol {
     
     /// Create default lang name
     override init() {

From 830e388178eb4b297b1ad7e8b405b82c51475b9e Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Fri, 6 Apr 2018 17:15:19 -0500
Subject: [PATCH 2/9] Refactor some methos to covert in properties

---
 Example/Example/AppDelegate.swift    |   4 +-
 Example/Example/ViewController.swift |   2 +-
 Source/Localize.swift                |  29 +++---
 Source/LocalizeCommonProtocol.swift  |  44 +++------
 Source/LocalizeJson.swift            | 139 ++++++++++++++-------------
 Source/LocalizeProtocol.swift        |  33 +++----
 Source/LocalizeStatic.swift          |  28 +++---
 Source/LocalizeString.swift          |  17 +++-
 Source/LocalizeStrings.swift         |  35 +++----
 Tests/BaseTest.swift                 |   4 +-
 Tests/BaseTestInSpanish.swift        |   4 +-
 Tests/StringBaseTest.swift           |   4 +-
 Tests/StringBaseTestInSpanish.swift  |   4 +-
 13 files changed, 165 insertions(+), 182 deletions(-)

diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
index c3c0cef..070b1f0 100644
--- a/Example/Example/AppDelegate.swift
+++ b/Example/Example/AppDelegate.swift
@@ -27,9 +27,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // If you want remove storaged languaje use
         localize.resetLanguage()
         // The used language
-        print(localize.language())
+        print(localize.currentLanguage)
         // List of aviable languajes
-        print(localize.availableLanguages())
+        print(localize.availableLanguages)
             
         // Or you can use static methods for all
             
diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift
index 0ce6771..babfa0f 100644
--- a/Example/Example/ViewController.swift
+++ b/Example/Example/ViewController.swift
@@ -22,7 +22,7 @@ class ViewController: UIViewController {
 
     @IBAction func updateLanguage(_ sender: Any) {
         let actionSheet = UIAlertController(title: nil, message: "app.update.language".localize(), preferredStyle: UIAlertControllerStyle.actionSheet)
-        for language in Localize.availableLanguages() {
+        for language in Localize.availableLanguages {
             let displayName = Localize.displayNameForLanguage(language)
             let languageAction = UIAlertAction(title: displayName, style: .default, handler: {
                 (alert: UIAlertAction!) -> Void in
diff --git a/Source/Localize.swift b/Source/Localize.swift
index f833fdd..69ddd2a 100644
--- a/Source/Localize.swift
+++ b/Source/Localize.swift
@@ -34,6 +34,20 @@ public class Localize: NSObject {
     /// Provider to localize your app.
     private var provider: LocalizeProtocol = LocalizeStrings()
     
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public var availableLanguages: [String] {
+        return provider.availableLanguages
+    }
+    
+    /// Return storaged language or default language in device
+    ///
+    /// - returns: current used language
+    public var currentLanguage: String {
+        return provider.currentLanguage
+    }
+    
     /// This override prevent user access to different instances for this class.
     /// Always use shared instance.
     private override init() {
@@ -85,14 +99,6 @@ public class Localize: NSObject {
     
     // MARK: Config methods
     
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public func language() -> String {
-        return provider.language()
-    }
-    
     /// Update default language, this stores a language key which can be retrieved the next time
     public func update(language: String) -> Void {
         provider.update(language: language)
@@ -118,13 +124,6 @@ public class Localize: NSObject {
         provider.resetLanguage()
     }
     
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        return provider.availableLanguages()
-    }
-    
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
diff --git a/Source/LocalizeCommonProtocol.swift b/Source/LocalizeCommonProtocol.swift
index 5bfbbc9..79744fe 100644
--- a/Source/LocalizeCommonProtocol.swift
+++ b/Source/LocalizeCommonProtocol.swift
@@ -15,7 +15,7 @@ class LocalizeCommonProtocol: NSObject {
 
     /// Bundle used to load files from.
     /// Defaults to the main bundle.
-    public var usedBundle: Bundle = Bundle.main
+    private var usedBundle: Bundle = Bundle.main
 
     /// Use this for testing mode, search resources in different bundles.
     var testing: Bool = false
@@ -27,22 +27,11 @@ class LocalizeCommonProtocol: NSObject {
     /// Storaged language or default language in device
     public var currentLanguage: String {
         get {
-            return self.language()
-        }
-    }
-    
-    // MARK: Internal methods.
-    
-    // Interator for String Enumerators
-    internal func iterateEnum<T: Hashable>(_: T.Type) -> AnyIterator<T> {
-        var i = 0
-        return AnyIterator {
-            let next = withUnsafePointer(to: &i) {
-                $0.withMemoryRebound(to: T.self, capacity: 1) { $0.pointee }
+            let defaults = UserDefaults.standard
+            if let lang = defaults.string(forKey: LocalizeStorageKey) {
+                return lang
             }
-            if next.hashValue != i { return nil }
-            i += 1
-            return next
+            return Locale.preferredLanguages[0]
         }
     }
     
@@ -51,13 +40,15 @@ class LocalizeCommonProtocol: NSObject {
     /// in other case use a main bundle.
     ///
     /// - returns: a string url where is your file
-    internal func bundle() -> Bundle {
+    internal var bundle: Bundle {
         if testing {
             return Bundle(for: type(of: self))
         }
         return usedBundle
     }
     
+    // MARK: Internal methods.
+    
     
     // MARK: Public methods
     
@@ -99,19 +90,8 @@ class LocalizeCommonProtocol: NSObject {
         self.testing = true
     }
     
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public func language() -> String {
-        let defaults = UserDefaults.standard
-        if let lang = defaults.string(forKey: LocalizeStorageKey) {
-            return lang
-        }
-        return Locale.preferredLanguages[0]
-    }
-    
     /// Update base file name, searched in path.
-    public func update(fileName:String) {
+    public func update(fileName: String) {
         self.fileName = fileName
     }
     
@@ -138,7 +118,7 @@ class LocalizeCommonProtocol: NSObject {
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, replace:String, tableName:String? = nil) -> String {
+    public func localize(key: String, replace: String, tableName: String? = nil) -> String {
         let string = localize(key: key, tableName:tableName)
 
         return string.replacingOccurrences(of: "%", with: replace)
@@ -150,7 +130,7 @@ class LocalizeCommonProtocol: NSObject {
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, values replace:[Any], tableName:String? = nil) -> String {
+    public func localize(key: String, values replace:[Any], tableName: String? = nil) -> String {
         var string = localize(key: key, tableName:tableName)
         if string == key {
             return key
@@ -176,7 +156,7 @@ class LocalizeCommonProtocol: NSObject {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public func localize(key:String, dictionary replace:[String:String], tableName:String? = nil) -> String {
+    public func localize(key: String, dictionary replace: [String: String], tableName: String? = nil) -> String {
         var string = localize(key: key, tableName:tableName)
         for (key, value) in replace {
             string = string.replacingOccurrences(of: ":\(key)", with: value)
diff --git a/Source/LocalizeJson.swift b/Source/LocalizeJson.swift
index 9c29c48..d3ec33a 100644
--- a/Source/LocalizeJson.swift
+++ b/Source/LocalizeJson.swift
@@ -7,51 +7,14 @@
 
 import UIKit
 
-class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
+fileprivate typealias JSON = NSDictionary
 
-    /// Create default lang name
-    override init() {
-        super.init()
-        self.fileName = "lang"
-    }
-    
-    // MARK: Read JSON methods
-    
-    /// This metod contains a logic to read return JSON data
-    /// If JSON not is defined, this try use a default
-    /// As long as the default language is the same as the current one.
-    private func readJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? fileName
-        var lang = currentLanguage
-        var json = readJSON(named: "\(tableName)-\(lang)")
-        
-        if json != nil {
-            return json
-        }
-        
-        lang = lang.components(separatedBy: "-")[0]
-        json = readJSON(named: "\(tableName)-\(lang)")
-        
-        if json == nil && lang != defaultLanguage {
-            json = readDefaultJSON()
-        }
-        
-        return json
-    }
-    
-    /// Read a JSON with default language value.
-    ///
-    /// - returns: json or nil value.
-    private func readDefaultJSON(tableName:String? = nil) -> NSDictionary? {
-        let tableName = tableName ?? fileName
-        return readJSON(named: "\(tableName)-\(defaultLanguage)")
-    }
-    
+fileprivate extension JSON {
     /// This method has path where file is
     /// If can't find a path return a nil value
     /// If can't serialize data return a nil value
-    private func readJSON(named name:String) -> NSDictionary? {
-        guard let path = bundle().path(forResource: name, ofType: "json") else {
+    static func read(bundle: Bundle, named name: String) -> JSON? {
+        guard let path = bundle.path(forResource: name, ofType: "json") else {
             return nil
         }
         guard let data = try? Data(contentsOf: URL(fileURLWithPath: path)) else {
@@ -70,12 +33,12 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     /// Try search key in your dictionary using single level
     /// If it doesn't find the key it will use the multilevel
     /// If the key not exis in your JSON return nil value
-    private func localizeFile(key: String, json: NSDictionary) -> String? {
-        if let string = json[key] {
+    func valueFor(key: String) -> String? {
+        if let string = self[key] {
             return string as? String
         }
         
-        if let string = localizeLevel(key: key, json: json) {
+        if let string = valueForKeyInLevels(key: key) {
             return string
         }
         
@@ -85,9 +48,9 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
     /// Try search key in your dictionary using multiples levels
     /// It is necessary that the result be a string
     /// Otherwise it returns nil value
-    private func localizeLevel(key: String, json:AnyObject?) -> String? {
+    private func valueForKeyInLevels(key: String) -> String? {
         let values = key.components(separatedBy: ".")
-        var jsonCopy = json
+        var jsonCopy: AnyObject? = self as AnyObject
         for key in values {
             if let result = jsonCopy?[key] {
                 jsonCopy = result as AnyObject?
@@ -95,8 +58,67 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
                 return nil
             }
         }
+        
         return jsonCopy as? String
     }
+}
+
+class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
+
+    /// Create default lang name
+    override init() {
+        super.init()
+        self.fileName = "lang"
+    }
+    
+    /// Show all aviable languages with criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public var availableLanguages: [String] {
+        var languages : [String] = []
+        
+        for localeId in NSLocale.availableLocaleIdentifiers {
+            let name = "\(fileName)-\(localeId)"
+            let path = bundle.path(forResource: name, ofType: "json")
+            if path != nil {
+                languages.append(localeId)
+            }
+        }
+        
+        return languages
+    }
+    
+    // MARK: Read JSON methods
+    
+    /// This metod contains a logic to read return JSON data
+    /// If JSON not is defined, this try use a default
+    /// As long as the default language is the same as the current one.
+    private func readJSON(tableName: String? = nil) -> JSON? {
+        let tableName = tableName ?? fileName
+        var lang = currentLanguage
+        var json = JSON.read(bundle: bundle, named: "\(tableName)-\(lang)")
+        
+        if json != nil {
+            return json
+        }
+        
+        lang = lang.components(separatedBy: "-")[0]
+        json = JSON.read(bundle: bundle, named: "\(tableName)-\(lang)")
+        
+        if json == nil && lang != defaultLanguage {
+            json = readDefaultJSON()
+        }
+        
+        return json
+    }
+    
+    /// Read a JSON with default language value.
+    ///
+    /// - returns: json or nil value.
+    private func readDefaultJSON(tableName: String? = nil) -> JSON? {
+        let tableName = tableName ?? fileName
+        return JSON.read(bundle: bundle, named: "\(tableName)-\(defaultLanguage)")
+    }
     
     // MARK: Public methods
     
@@ -110,7 +132,7 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
             return key
         }
         
-        let string = localizeFile(key: key, json: json)
+        let string = json.valueFor(key: key)
         if string != nil {
             return string!
         }
@@ -119,32 +141,11 @@ class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
             return key
         }
         
-        let defaultString = localizeFile(key: key, json: defaultJSON)
+        let defaultString = defaultJSON.valueFor(key: key)
         if defaultString != nil {
             return defaultString!
         }
         
         return key
     }
-    
-    
-    // MARK: Config methods
-    
-    
-    /// Show all aviable languages with criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        var languages : [String] = []
-
-        for localeId in NSLocale.availableLocaleIdentifiers {
-            let name = "\(fileName)-\(localeId)"
-            let path = bundle().path(forResource: name, ofType: "json")
-            if path != nil {
-                languages.append(localeId)
-            }
-        }
-        return languages
-    }
-
 }
diff --git a/Source/LocalizeProtocol.swift b/Source/LocalizeProtocol.swift
index 059507f..8381e95 100644
--- a/Source/LocalizeProtocol.swift
+++ b/Source/LocalizeProtocol.swift
@@ -16,8 +16,18 @@ protocol LocalizeProtocol {
     /// Try read key in default language
     var defaultLanguage: String {get set}
     
+    /// Storaged language or default language in device
+    ///
+    /// - returns: storaged language
+    var currentLanguage: String {get}
     
-    /// MARK: Localize Methos
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    var availableLanguages: [String] {get}
+    
+    
+    // MARK: Localize Methos
     
     
     /// Localize a string using your JSON File
@@ -25,7 +35,7 @@ protocol LocalizeProtocol {
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    func localize(key:String, tableName:String?) -> String
+    func localize(key: String, tableName: String?) -> String
     
     /// Localize a string using your JSON File
     /// That replace all % character in your string with replace value.
@@ -33,7 +43,7 @@ protocol LocalizeProtocol {
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    func localize(key:String, replace:String, tableName:String?) -> String
+    func localize(key: String, replace: String, tableName: String?) -> String
     
     /// Localize a string using your JSON File
     /// That replace each % character in your string with each replace value.
@@ -41,7 +51,7 @@ protocol LocalizeProtocol {
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    func localize(key:String, values replace:[Any], tableName:String?) -> String
+    func localize(key: String, values replace: [Any], tableName: String?) -> String
     
     /// Localize string with dictionary values
     /// Get properties in your key with rule :property
@@ -50,22 +60,16 @@ protocol LocalizeProtocol {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    func localize(key:String, dictionary replace:[String:String], tableName:String?) -> String
+    func localize(key: String, dictionary replace: [String: String], tableName: String?) -> String
     
     
     // MARK: Config methods
     
-    
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    func language() -> String
-    
     /// Update default language, this stores a language key which can be retrieved the next time
     func update(language: String) -> Void
     
     /// Update base file name, searched in path.
-    func update(fileName:String)
+    func update(fileName: String)
     
     /// Update the bundle used to load files from.
     func update(bundle: Bundle)
@@ -76,11 +80,6 @@ protocol LocalizeProtocol {
     /// This remove the language key storaged.
     func resetLanguage() -> Void
     
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    func availableLanguages() -> [String]
-    
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
diff --git a/Source/LocalizeStatic.swift b/Source/LocalizeStatic.swift
index 6fd330d..9e99eaf 100644
--- a/Source/LocalizeStatic.swift
+++ b/Source/LocalizeStatic.swift
@@ -9,6 +9,20 @@ import UIKit
 
 extension Localize {
     
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public static var availableLanguages: [String] {
+        return Localize.shared.availableLanguages
+    }
+    
+    /// Return storaged language or default language in device
+    ///
+    /// - returns: current used language
+    public static var currentLanguage: String {
+        return Localize.shared.currentLanguage
+    }
+    
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// That prevent replace untagged values
@@ -49,13 +63,6 @@ extension Localize {
         return Localize.shared.localize(key: key, dictionary: replace, tableName: tableName)
     }
     
-    /// Return storaged language or default language in device
-    ///
-    /// - returns: current used language
-    public static func language() -> String {
-        return Localize.shared.language()
-    }
-    
     /// Update default language, this stores a language key which can be retrieved the next time
     public static func update(language: String) {
         return Localize.shared.update(language: language)
@@ -81,13 +88,6 @@ extension Localize {
         return Localize.shared.resetLanguage()
     }
     
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public static func availableLanguages() -> [String] {
-        return Localize.shared.availableLanguages()
-    }
-    
     /// Display name for current user language.
     ///
     /// - return: String form language code in current user language
diff --git a/Source/LocalizeString.swift b/Source/LocalizeString.swift
index 04d6d53..e4c2614 100644
--- a/Source/LocalizeString.swift
+++ b/Source/LocalizeString.swift
@@ -11,6 +11,15 @@ import UIKit
 /// in your JSON File.
 public extension String {
     
+    /// Localize a string using your JSON File
+    /// If the key is not found return the same key
+    /// that prevent replace untagged values
+    ///
+    /// - returns: localized key or same text
+    public var localized: String {
+        return Localize.localize(key: self)
+    }
+    
     /// Localize a string using your JSON File
     /// If the key is not found return the same key
     /// that prevent replace untagged values
@@ -25,7 +34,7 @@ public extension String {
     /// that prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public func localize(tableName:String) -> String {
+    public func localize(tableName: String) -> String {
         return Localize.localize(key: self, tableName: tableName)
     }
     
@@ -35,7 +44,7 @@ public extension String {
     /// - parameter String: The replacement value
     ///
     /// - returns: localized key or same text
-    public func localize(value:String, tableName:String? = nil) -> String {
+    public func localize(value: String, tableName: String? = nil) -> String {
         return Localize.localize(key: self, replace: value, tableName: tableName)
     }
     
@@ -45,7 +54,7 @@ public extension String {
     /// - parameter Strings: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(values:String..., tableName:String? = nil) -> String {
+    public func localize(values: String..., tableName: String? = nil) -> String {
         return Localize.localize(key: self, values: values, tableName: tableName)
     }
     
@@ -56,7 +65,7 @@ public extension String {
     /// - parameter [String:String]: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public func localize(dictionary values:[String:String], tableName:String? = nil) -> String {
+    public func localize(dictionary values: [String: String], tableName: String? = nil) -> String {
         return Localize.localize(key: self, dictionary: values, tableName: tableName)
     }
     
diff --git a/Source/LocalizeStrings.swift b/Source/LocalizeStrings.swift
index ae39dd8..c6def09 100644
--- a/Source/LocalizeStrings.swift
+++ b/Source/LocalizeStrings.swift
@@ -15,6 +15,17 @@ class LocalizeStrings: LocalizeCommonProtocol, LocalizeProtocol {
         self.fileName = "Strings"
     }
     
+    /// Show all aviable languajes whit criteria name
+    ///
+    /// - returns: list with storaged languages code
+    public var availableLanguages: [String] {
+        var availableLanguages = bundle.localizations
+        if let indexOfBase = availableLanguages.index(of: "Base") {
+            availableLanguages.remove(at: indexOfBase)
+        }
+        return availableLanguages
+    }
+    
     // MARK: Public methods
     
     
@@ -23,35 +34,19 @@ class LocalizeStrings: LocalizeCommonProtocol, LocalizeProtocol {
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public override func localize(key:String, tableName:String? = nil) -> String {
-        let tableName = tableName ?? self.fileName
-        if let path = self.bundle().path(forResource: self.currentLanguage, ofType: "lproj") {
+    public override func localize(key: String, tableName: String? = nil) -> String {
+        let tableName = tableName ?? fileName
+        if let path = bundle.path(forResource: currentLanguage, ofType: "lproj") {
             let bundle = Bundle(path: path)!
             let localized = bundle.localizedString(forKey: key, value: nil, table: tableName)
             if localized != key {
                 return localized
             }
         }
-        if let path = self.bundle().path(forResource: self.defaultLanguage, ofType: "lproj") {
+        if let path = bundle.path(forResource: defaultLanguage, ofType: "lproj") {
             let bundle = Bundle(path: path)!
             return bundle.localizedString(forKey: key, value: nil, table: tableName)
         }
         return key
     }
-    
-    
-    // MARK: Config methods
-    
-    
-    /// Show all aviable languajes whit criteria name
-    ///
-    /// - returns: list with storaged languages code
-    public func availableLanguages() -> [String] {
-        var availableLanguages = self.bundle().localizations
-        if let indexOfBase = availableLanguages.index(of: "Base") {
-            availableLanguages.remove(at: indexOfBase)
-        }
-        return availableLanguages
-    }
-    
 }
diff --git a/Tests/BaseTest.swift b/Tests/BaseTest.swift
index 0372363..433cec5 100644
--- a/Tests/BaseTest.swift
+++ b/Tests/BaseTest.swift
@@ -53,12 +53,12 @@ class BaseTest: XCTestCase {
     }
     
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
+        let languages = Localize.availableLanguages
         XCTAssertTrue(languages == ["en", "es"])
     }
     
     func testCurrentLanguage() {
-        let language = Localize.language()
+        let language = Localize.currentLanguage
         XCTAssertTrue(language == "en")
     }
     
diff --git a/Tests/BaseTestInSpanish.swift b/Tests/BaseTestInSpanish.swift
index 1c2e5b1..3d9d56c 100644
--- a/Tests/BaseTestInSpanish.swift
+++ b/Tests/BaseTestInSpanish.swift
@@ -53,12 +53,12 @@ class BaseTestInSpanish: XCTestCase {
     }
     
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
+        let languages = Localize.availableLanguages
         XCTAssertTrue(languages == ["en", "es"])
     }
     
     func testCurrentLanguage() {
-        let language = Localize.language()
+        let language = Localize.currentLanguage
         XCTAssertTrue(language == "es")
     }
     
diff --git a/Tests/StringBaseTest.swift b/Tests/StringBaseTest.swift
index eecd8c7..e40ff8e 100644
--- a/Tests/StringBaseTest.swift
+++ b/Tests/StringBaseTest.swift
@@ -43,12 +43,12 @@ class StringBaseTest: XCTestCase {
     }
     
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
+        let languages = Localize.availableLanguages
         XCTAssertTrue(languages == ["en", "es"])
     }
     
     func testCurrentLanguage() {
-        let language = Localize.language()
+        let language = Localize.currentLanguage
         XCTAssertTrue(language == "en")
     }
     
diff --git a/Tests/StringBaseTestInSpanish.swift b/Tests/StringBaseTestInSpanish.swift
index 4cd6afc..f6aa418 100644
--- a/Tests/StringBaseTestInSpanish.swift
+++ b/Tests/StringBaseTestInSpanish.swift
@@ -53,12 +53,12 @@ class StringBaseTestInSpanish: XCTestCase {
     }
     
     func testListOfAvailableLanguages() {
-        let languages = Localize.availableLanguages()
+        let languages = Localize.availableLanguages
         XCTAssertTrue(languages == ["en", "es"])
     }
     
     func testCurrentLanguage() {
-        let language = Localize.language()
+        let language = Localize.currentLanguage
         XCTAssertTrue(language == "es")
     }
     

From 8929ebb2f82306009bc8713acc8f198bd6e8e963 Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Fri, 6 Apr 2018 17:37:05 -0500
Subject: [PATCH 3/9] Rename methods

---
 Source/Localize.swift                     | 10 ++--------
 Source/LocalizeCommonProtocol.swift       | 10 +++++-----
 Source/LocalizeJson.swift                 |  4 ++--
 Source/LocalizeProtocol.swift             |  2 +-
 Source/LocalizeStatic.swift               |  4 ++--
 Source/LocalizeStrings.swift              |  2 +-
 Tests/BaseTest.swift                      |  2 +-
 Tests/BaseTestInSpanish.swift             |  2 +-
 Tests/JsonChanginFileName.swift           |  2 +-
 Tests/OtherLangTest.swift                 |  2 +-
 Tests/ReadingOtherFiles.swift             |  6 +++---
 Tests/StringBaseTest.swift                |  2 +-
 Tests/StringBaseTestInSpanish.swift       |  2 +-
 Tests/StringsChanginDefaultFileName.swift |  2 +-
 14 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/Source/Localize.swift b/Source/Localize.swift
index 69ddd2a..4ab416b 100644
--- a/Source/Localize.swift
+++ b/Source/Localize.swift
@@ -48,12 +48,6 @@ public class Localize: NSObject {
         return provider.currentLanguage
     }
     
-    /// This override prevent user access to different instances for this class.
-    /// Always use shared instance.
-    private override init() {
-        super.init()
-    }
-    
     // MARK: Public methods
     
     /// Localize a string using your JSON File
@@ -133,8 +127,8 @@ public class Localize: NSObject {
     
     /// Enable testing mode
     /// Please not use in your code, is only for test schema.
-    public func testingMode() {
-        provider.testingMode()
+    public func enableTestingMode() {
+        provider.enableTestingMode()
     }
     
     // MARK: Config providers
diff --git a/Source/LocalizeCommonProtocol.swift b/Source/LocalizeCommonProtocol.swift
index 79744fe..a6cd377 100644
--- a/Source/LocalizeCommonProtocol.swift
+++ b/Source/LocalizeCommonProtocol.swift
@@ -15,10 +15,10 @@ class LocalizeCommonProtocol: NSObject {
 
     /// Bundle used to load files from.
     /// Defaults to the main bundle.
-    private var usedBundle: Bundle = Bundle.main
+    private var usedBundle = Bundle.main
 
     /// Use this for testing mode, search resources in different bundles.
-    var testing: Bool = false
+    public var testing: Bool = false
     
     /// Default language, if this can't find a key in your current language
     /// Try read key in default language
@@ -86,8 +86,8 @@ class LocalizeCommonProtocol: NSObject {
     
     /// Enable testing mode
     /// Please not use in your code, is only for test schema.
-    public func testingMode() {
-        self.testing = true
+    public func enableTestingMode() {
+        testing = true
     }
     
     /// Update base file name, searched in path.
@@ -130,7 +130,7 @@ class LocalizeCommonProtocol: NSObject {
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public func localize(key: String, values replace:[Any], tableName: String? = nil) -> String {
+    public func localize(key: String, values replace: [Any], tableName: String? = nil) -> String {
         var string = localize(key: key, tableName:tableName)
         if string == key {
             return key
diff --git a/Source/LocalizeJson.swift b/Source/LocalizeJson.swift
index d3ec33a..065424b 100644
--- a/Source/LocalizeJson.swift
+++ b/Source/LocalizeJson.swift
@@ -63,12 +63,12 @@ fileprivate extension JSON {
     }
 }
 
-class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {
+class LocalizeJson: LocalizeCommonProtocol, LocalizeProtocol {    
 
     /// Create default lang name
     override init() {
         super.init()
-        self.fileName = "lang"
+        fileName = "lang"
     }
     
     /// Show all aviable languages with criteria name
diff --git a/Source/LocalizeProtocol.swift b/Source/LocalizeProtocol.swift
index 8381e95..059f5cd 100644
--- a/Source/LocalizeProtocol.swift
+++ b/Source/LocalizeProtocol.swift
@@ -87,6 +87,6 @@ protocol LocalizeProtocol {
     
     /// Enable testing mode
     /// Please not use in your code, is only for test schema.
-    func testingMode()
+    func enableTestingMode()
     
 }
diff --git a/Source/LocalizeStatic.swift b/Source/LocalizeStatic.swift
index 9e99eaf..adcd699 100644
--- a/Source/LocalizeStatic.swift
+++ b/Source/LocalizeStatic.swift
@@ -97,8 +97,8 @@ extension Localize {
     
     /// Enable testing mode
     /// Please not use in your code, is only for test schema.
-    public static func testingMode() {
-        Localize.shared.testingMode()
+    public static func enableTestingMode() {
+        Localize.shared.enableTestingMode()
     }
     
     // MARK: Config providers
diff --git a/Source/LocalizeStrings.swift b/Source/LocalizeStrings.swift
index c6def09..ade26e8 100644
--- a/Source/LocalizeStrings.swift
+++ b/Source/LocalizeStrings.swift
@@ -12,7 +12,7 @@ class LocalizeStrings: LocalizeCommonProtocol, LocalizeProtocol {
     /// Create default lang name
     override init() {
         super.init()
-        self.fileName = "Strings"
+        fileName = "Strings"
     }
     
     /// Show all aviable languajes whit criteria name
diff --git a/Tests/BaseTest.swift b/Tests/BaseTest.swift
index 433cec5..0259278 100644
--- a/Tests/BaseTest.swift
+++ b/Tests/BaseTest.swift
@@ -13,7 +13,7 @@ class BaseTest: XCTestCase {
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "en")
     }
     
diff --git a/Tests/BaseTestInSpanish.swift b/Tests/BaseTestInSpanish.swift
index 3d9d56c..a87e265 100644
--- a/Tests/BaseTestInSpanish.swift
+++ b/Tests/BaseTestInSpanish.swift
@@ -13,7 +13,7 @@ class BaseTestInSpanish: XCTestCase {
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "es")
     }
     
diff --git a/Tests/JsonChanginFileName.swift b/Tests/JsonChanginFileName.swift
index ad5beec..6d7b932 100644
--- a/Tests/JsonChanginFileName.swift
+++ b/Tests/JsonChanginFileName.swift
@@ -15,7 +15,7 @@ class JsonChanginFileName: XCTestCase {
         Localize.update(provider: .json)
         Localize.update(language: "es")
         Localize.update(fileName: "lang")
-        Localize.testingMode()
+        Localize.enableTestingMode()
     }
     
     func testKeyInOtherLanguage() {
diff --git a/Tests/OtherLangTest.swift b/Tests/OtherLangTest.swift
index 814ed3c..6fc0150 100644
--- a/Tests/OtherLangTest.swift
+++ b/Tests/OtherLangTest.swift
@@ -13,7 +13,7 @@ class OtherLangTest: XCTestCase {
     override func setUp() {
         super.setUp()
         Localize.update(provider: .json)
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "it")
     }
     
diff --git a/Tests/ReadingOtherFiles.swift b/Tests/ReadingOtherFiles.swift
index baa3ec1..521507c 100644
--- a/Tests/ReadingOtherFiles.swift
+++ b/Tests/ReadingOtherFiles.swift
@@ -16,7 +16,7 @@ class ReadingOtherFiles: XCTestCase {
     }
     
     func testOtherEnglish() {
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "en")
         Localize.update(fileName: "other")
         let result = "hello".localize()
@@ -24,7 +24,7 @@ class ReadingOtherFiles: XCTestCase {
     }
     
     func testSomeItalian() {
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "it")
         Localize.update(fileName: "some")
         let result = "hello".localize()
@@ -32,7 +32,7 @@ class ReadingOtherFiles: XCTestCase {
     }
     
     func testFileGerman() {
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "de")
         Localize.update(fileName: "file")
         let result = "hello".localize()
diff --git a/Tests/StringBaseTest.swift b/Tests/StringBaseTest.swift
index e40ff8e..8f30842 100644
--- a/Tests/StringBaseTest.swift
+++ b/Tests/StringBaseTest.swift
@@ -13,7 +13,7 @@ class StringBaseTest: XCTestCase {
     override func setUp() {
         super.setUp()
         Localize.update(provider: .strings)
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "en")
     }
     
diff --git a/Tests/StringBaseTestInSpanish.swift b/Tests/StringBaseTestInSpanish.swift
index f6aa418..b1231ce 100644
--- a/Tests/StringBaseTestInSpanish.swift
+++ b/Tests/StringBaseTestInSpanish.swift
@@ -13,7 +13,7 @@ class StringBaseTestInSpanish: XCTestCase {
     override func setUp() {
         super.setUp()
         Localize.update(provider: .strings)
-        Localize.testingMode()
+        Localize.enableTestingMode()
         Localize.update(language: "es")
     }
     
diff --git a/Tests/StringsChanginDefaultFileName.swift b/Tests/StringsChanginDefaultFileName.swift
index 9508e9c..629a940 100644
--- a/Tests/StringsChanginDefaultFileName.swift
+++ b/Tests/StringsChanginDefaultFileName.swift
@@ -15,7 +15,7 @@ class StringsChanginDefaultFileName: XCTestCase {
         Localize.update(provider: .strings)
         Localize.update(language: "en")
         Localize.update(fileName: "Other")
-        Localize.testingMode()
+        Localize.enableTestingMode()
     }
     
     func testKeyInOtherLanguage() {

From 198b7e7b9d32bab049d96971802c32c7c6a933aa Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Tue, 10 Apr 2018 21:51:21 -0500
Subject: [PATCH 4/9] Update UILocalize components

---
 Example/Example/Base.lproj/Main.storyboard |  57 ++++++++++++
 Localize.xcodeproj/project.pbxproj         |  12 ++-
 Source/LocalizeExtensions.swift            | 100 ++++++++++-----------
 Source/LocalizeUI.swift                    |  25 ++++++
 4 files changed, 137 insertions(+), 57 deletions(-)
 create mode 100644 Source/LocalizeUI.swift

diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index d9c016f..918b166 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -49,6 +49,9 @@
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="Continue"/>
                                 </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <segue destination="QHj-YI-Ix7" kind="show" id="HBm-eo-j6C"/>
+                                </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t6w-Gh-I1B">
                                 <rect key="frame" x="16" y="545" width="343" height="45"/>
@@ -104,6 +107,60 @@
             </objects>
             <point key="canvasLocation" x="842" y="-546"/>
         </scene>
+        <!--View Controller-->
+        <scene sceneID="NVm-i4-pSf">
+            <objects>
+                <viewController id="QHj-YI-Ix7" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="hJI-XG-4ql"/>
+                        <viewControllerLayoutGuide type="bottom" id="bLK-bW-LRg"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="uK2-dp-OwS">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="app.label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qqs-QI-Vck">
+                                <rect key="frame" x="32" y="96" width="311" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="app.label" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="0HU-Y9-uB5">
+                                <rect key="frame" x="32" y="148.5" width="311" height="128"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="128" id="oec-cu-UBT"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="Qqs-QI-Vck" firstAttribute="leading" secondItem="uK2-dp-OwS" secondAttribute="leading" constant="32" id="L6v-ZM-qM4"/>
+                            <constraint firstItem="Qqs-QI-Vck" firstAttribute="top" secondItem="hJI-XG-4ql" secondAttribute="bottom" constant="32" id="ShY-j7-TaI"/>
+                            <constraint firstItem="0HU-Y9-uB5" firstAttribute="leading" secondItem="uK2-dp-OwS" secondAttribute="leading" constant="32" id="Vpg-0k-pFy"/>
+                            <constraint firstAttribute="trailing" secondItem="Qqs-QI-Vck" secondAttribute="trailing" constant="32" id="anC-QM-DfQ"/>
+                            <constraint firstAttribute="trailing" secondItem="0HU-Y9-uB5" secondAttribute="trailing" constant="32" id="gxa-Ep-xwE"/>
+                            <constraint firstItem="0HU-Y9-uB5" firstAttribute="top" secondItem="Qqs-QI-Vck" secondAttribute="bottom" constant="32" id="ofP-yD-LYg"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="KpE-oJ-hOB">
+                        <nil key="title"/>
+                        <segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="jG6-iV-0U4">
+                            <rect key="frame" x="127" y="7.5" width="121" height="29"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <segments>
+                                <segment title="First"/>
+                                <segment title="Second"/>
+                            </segments>
+                        </segmentedControl>
+                    </navigationItem>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Gkz-PL-c8H" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1700" y="-546"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="xk1-7E-ym5">
             <objects>
diff --git a/Localize.xcodeproj/project.pbxproj b/Localize.xcodeproj/project.pbxproj
index 1462c52..f7115a1 100644
--- a/Localize.xcodeproj/project.pbxproj
+++ b/Localize.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2B717465207D9AFE0070DC5F /* LocalizeUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B717464207D9AFE0070DC5F /* LocalizeUI.swift */; };
 		9F1677FA1E51DE270022F3F8 /* Strings.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9F1677FC1E51DE270022F3F8 /* Strings.strings */; };
 		9F1678011E51F33E0022F3F8 /* StringBaseTestInSpanish.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F1678001E51F33E0022F3F8 /* StringBaseTestInSpanish.swift */; };
 		9F19DFC71E4D2B1D00F953E6 /* StringBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F19DFC61E4D2B1D00F953E6 /* StringBaseTest.swift */; };
@@ -46,6 +47,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		2B717464207D9AFE0070DC5F /* LocalizeUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizeUI.swift; sourceTree = "<group>"; };
 		69F1B5741D955990000A2B87 /* Localize.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Localize.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9F1677FB1E51DE270022F3F8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Strings.strings; sourceTree = "<group>"; };
 		9F1677FD1E51DE320022F3F8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Strings.strings; sourceTree = "<group>"; };
@@ -120,13 +122,14 @@
 			isa = PBXGroup;
 			children = (
 				9F93453C1E29192300C400F7 /* Localize.swift */,
-				9F761AD61E305B9B00904B4B /* LocalizeStatic.swift */,
-				9F93453D1E29192300C400F7 /* LocalizeString.swift */,
-				9F93453A1E29192300C400F7 /* LocalizeExtensions.swift */,
-				9F2FC5641E4275A300C15610 /* LocalizeProtocol.swift */,
 				9F262D901E525565002DD75A /* LocalizeCommonProtocol.swift */,
+				9F93453A1E29192300C400F7 /* LocalizeExtensions.swift */,
 				9F2FC5661E42793B00C15610 /* LocalizeJson.swift */,
+				9F2FC5641E4275A300C15610 /* LocalizeProtocol.swift */,
+				9F761AD61E305B9B00904B4B /* LocalizeStatic.swift */,
+				9F93453D1E29192300C400F7 /* LocalizeString.swift */,
 				9F2FC5681E427AFD00C15610 /* LocalizeStrings.swift */,
+				2B717464207D9AFE0070DC5F /* LocalizeUI.swift */,
 				9F9345461E291A1800C400F7 /* Suporting Files */,
 			);
 			path = Source;
@@ -302,6 +305,7 @@
 				9F9345421E29192300C400F7 /* LocalizeString.swift in Sources */,
 				9F761AD71E305B9B00904B4B /* LocalizeStatic.swift in Sources */,
 				9F2FC5651E4275A300C15610 /* LocalizeProtocol.swift in Sources */,
+				2B717465207D9AFE0070DC5F /* LocalizeUI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index 0c885fd..14b4791 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -11,20 +11,20 @@ private var localizeKey1: UInt8 = 0
 private var localizeKey2: UInt8 = 1
 
 extension NSCoding {
-    fileprivate func localizedValue(forObject object: Any, key: UnsafeMutablePointer<UInt8>) -> String? {
-        return objc_getAssociatedObject(object, key) as? String
+    fileprivate func localizedValue(key: UnsafeMutablePointer<UInt8>) -> String? {
+        return objc_getAssociatedObject(self, key) as? String
     }
     
-    fileprivate func setLocalizedValue(_ value: String?, forObject object: Any, key: UnsafeMutablePointer<UInt8>) {
-        guard let value = value else {
-            return
-        }
-        
-        objc_setAssociatedObject(self, key, value, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN)
+    fileprivate func setLocalizedValue(_ value: String?, key: UnsafeMutablePointer<UInt8>) {
+        guard let value = value else { return }
+        let policy = objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN
+        objc_setAssociatedObject(self, key, value, policy)
     }
 }
 
+/// Extension for NotificationCenter to call easy the localize notification observer.
 extension NotificationCenter {
+    /// Custom function to add observers.
     fileprivate static func localize(observer: Any, selector: Selector) {
         NotificationCenter.default.addObserver(
             observer,
@@ -37,11 +37,10 @@ extension NotificationCenter {
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UIBarButtonItem {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -55,17 +54,16 @@ extension UIBarButtonItem {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        title = localizeKey?.localize() ?? title?.localize() ?? title
+        LocalizeUI.localize(key: &localizeKey, value: &title)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UIButton {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -81,7 +79,7 @@ extension UIButton {
     @objc public func localize() {
         for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
             var title = self.title(for: state)
-            title = localizeKey?.localize() ?? title?.localize() ?? title
+            title = LocalizeUI.localize(key: &localizeKey, value: &title)
             setTitle(title, for: state)
         }
     }
@@ -89,11 +87,10 @@ extension UIButton {
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UILabel {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -107,23 +104,22 @@ extension UILabel {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        text = localizeKey?.localize() ?? text?.localize() ?? text
+        LocalizeUI.localize(key: &localizeKey, value: &text)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UINavigationItem {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeTitle: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey2) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
+        get { return localizedValue(key: &localizeKey2) }
+        set { setLocalizedValue(newValue, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -137,24 +133,23 @@ extension UINavigationItem {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        title = localizeTitle?.localize() ?? title?.localize() ?? title
-        prompt = localizePrompt?.localize() ?? prompt?.localize() ?? prompt
+        LocalizeUI.localize(key: &localizeTitle, value: &title)
+        LocalizeUI.localize(key: &localizePrompt, value: &prompt)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UISearchBar {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePrompt: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey2) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
+        get { return localizedValue(key: &localizeKey2) }
+        set { setLocalizedValue(newValue, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -168,18 +163,17 @@ extension UISearchBar {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        placeholder = localizePlaceholder?.localize() ?? placeholder?.localize() ?? placeholder
-        prompt = localizePrompt?.localize() ?? prompt?.localize() ?? prompt
+        LocalizeUI.localize(key: &localizePlaceholder, value: &placeholder)
+        LocalizeUI.localize(key: &localizePrompt, value: &prompt)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UISegmentedControl {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -195,18 +189,18 @@ extension UISegmentedControl {
     @objc public func localize() {
         for index in 0...(numberOfSegments - 1) {
             var title = titleForSegment(at: index)
-            title = localizeKey?.localize() ?? title?.localize() ?? title
+            title = LocalizeUI.localize(key: &localizeKey, value: &title)
+            setTitle(title, forSegmentAt: index)
         }
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITabBarItem {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -220,23 +214,22 @@ extension UITabBarItem {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        title = localizeKey?.localize() ?? title?.localize() ?? title
+        LocalizeUI.localize(key: &localizeKey, value: &title)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITextField {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeText: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Localizable tag storeged property
     @IBInspectable public var localizePlaceholder: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey2) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey2) }
+        get { return localizedValue(key: &localizeKey2) }
+        set { setLocalizedValue(newValue, key: &localizeKey2) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -250,18 +243,17 @@ extension UITextField {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        placeholder = localizePlaceholder?.localize() ?? placeholder?.localize() ?? placeholder
-        text = localizeText?.localize() ?? text?.localize() ?? text
+        LocalizeUI.localize(key: &localizeText, value: &text)
+        LocalizeUI.localize(key: &localizePlaceholder, value: &placeholder)
     }
 }
 
 /// Extension for UI element is the easier way to localize your keys.
 extension UITextView {
-    
     /// Localizable tag storeged property
     @IBInspectable public var localizeKey: String? {
-        get { return localizedValue(forObject: self, key: &localizeKey1) }
-        set { setLocalizedValue(newValue, forObject: self, key: &localizeKey1) }
+        get { return localizedValue(key: &localizeKey1) }
+        set { setLocalizedValue(newValue, key: &localizeKey1) }
     }
     
     /// Override awakeFromNib when is going visible, try search a key in JSON File
@@ -275,6 +267,8 @@ extension UITextView {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        text = localizeKey?.localize() ?? text?.localize() ?? text
+        var localize = text
+        localize = LocalizeUI.localize(key: &localizeKey, value: &localize)
+        text = localize
     }
 }
diff --git a/Source/LocalizeUI.swift b/Source/LocalizeUI.swift
new file mode 100644
index 0000000..2d79dee
--- /dev/null
+++ b/Source/LocalizeUI.swift
@@ -0,0 +1,25 @@
+//
+//  LocalizeUI.swift
+//  Localize
+//
+//  Created by Andres Silva Gomez on 4/10/18.
+//  Copyright © 2018 Kekiiwaa. All rights reserved.
+//
+
+import UIKit
+
+class LocalizeUI: NSObject {
+    @discardableResult
+    static func localize(key: inout String?, value: inout String?) -> String {
+        if let localized = key?.localize() {
+            value = localized
+            return localized
+        }
+        if let localized = value?.localize() {
+            key = value
+            value = localized
+            return localized
+        }
+        return value ?? ""
+    }
+}

From 24607cdda8c45a5af32883597f4273df8d7243bd Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Tue, 10 Apr 2018 22:46:18 -0500
Subject: [PATCH 5/9] Localize segment control

---
 Example/Example/Base.lproj/Main.storyboard         |  6 +++---
 Example/Example/lang-en-DE.json                    |  4 +++-
 Example/Example/lang-en.json                       |  4 +++-
 Example/Example/lang-es.json                       |  4 +++-
 Example/Example/lang-fr.json                       |  4 +++-
 .../xcshareddata/IDEWorkspaceChecks.plist          |  8 ++++++++
 .../xcshareddata/xcschemes/Localize.xcscheme       | 14 ++++++++++++++
 .../xcshareddata/xcschemes/LocalizeTests.xcscheme  |  6 +++++-
 Source/LocalizeExtensions.swift                    |  3 ++-
 Source/LocalizeStatic.swift                        | 10 +++++-----
 Source/LocalizeUI.swift                            |  9 +++++++--
 11 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index 918b166..10ba065 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -148,11 +148,11 @@
                     <navigationItem key="navigationItem" id="KpE-oJ-hOB">
                         <nil key="title"/>
                         <segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="jG6-iV-0U4">
-                            <rect key="frame" x="127" y="7.5" width="121" height="29"/>
+                            <rect key="frame" x="127" y="7" width="121" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <segments>
-                                <segment title="First"/>
-                                <segment title="Second"/>
+                                <segment title="one"/>
+                                <segment title="two"/>
                             </segments>
                         </segmentedControl>
                     </navigationItem>
diff --git a/Example/Example/lang-en-DE.json b/Example/Example/lang-en-DE.json
index 4396389..64549c7 100644
--- a/Example/Example/lang-en-DE.json
+++ b/Example/Example/lang-en-DE.json
@@ -24,5 +24,7 @@
         "update" : {
             "language" : "Update language"
         }
-    }
+    },
+    "one": "First",
+    "two": "Second"
 }
diff --git a/Example/Example/lang-en.json b/Example/Example/lang-en.json
index 6c7934b..17afcd9 100644
--- a/Example/Example/lang-en.json
+++ b/Example/Example/lang-en.json
@@ -24,5 +24,7 @@
         "update" : {
             "language" : "Update language"
         }
-    }
+    },
+    "one": "First",
+    "two": "Second"
 }
diff --git a/Example/Example/lang-es.json b/Example/Example/lang-es.json
index f8177bf..d8ef56c 100644
--- a/Example/Example/lang-es.json
+++ b/Example/Example/lang-es.json
@@ -24,5 +24,7 @@
         "update" : {
             "language" : "Actualizar idioma"
         }
-    }
+    },
+    "one": "Primero",
+    "two": "Segundo"
 }
diff --git a/Example/Example/lang-fr.json b/Example/Example/lang-fr.json
index e49e9ab..3d723f4 100644
--- a/Example/Example/lang-fr.json
+++ b/Example/Example/lang-fr.json
@@ -24,5 +24,7 @@
         "update" : {
             "language" : "Langue de mise à jour"
         }
-    }
+    },
+    "one": "Premier",
+    "two": "Deuxième"
 }
diff --git a/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Localize.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
index 1a85168..76da0c6 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/Localize.xcscheme
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Localize.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9F9345521E291D4E00C400F7"
+               BuildableName = "LocalizeTests.xctest"
+               BlueprintName = "LocalizeTests"
+               ReferencedContainer = "container:Localize.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
diff --git a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
index 41a8596..df89a91 100644
--- a/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
+++ b/Localize.xcodeproj/xcshareddata/xcschemes/LocalizeTests.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0930"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -37,6 +37,10 @@
                BlueprintName = "LocalizeTests"
                ReferencedContainer = "container:Localize.xcodeproj">
             </BuildableReference>
+            <LocationScenarioReference
+               identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+               referenceType = "1">
+            </LocationScenarioReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index 14b4791..9cd4656 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -188,8 +188,9 @@ extension UISegmentedControl {
     /// Here we change text with key replacement
     @objc public func localize() {
         for index in 0...(numberOfSegments - 1) {
+            var key = LocalizeUI.keyFor(index: index, localizeKey: localizeKey)
             var title = titleForSegment(at: index)
-            title = LocalizeUI.localize(key: &localizeKey, value: &title)
+            title = LocalizeUI.localize(key: &key, value: &title, updateKey: false)
             setTitle(title, forSegmentAt: index)
         }
     }
diff --git a/Source/LocalizeStatic.swift b/Source/LocalizeStatic.swift
index adcd699..cf0ca5a 100644
--- a/Source/LocalizeStatic.swift
+++ b/Source/LocalizeStatic.swift
@@ -28,7 +28,7 @@ extension Localize {
     /// That prevent replace untagged values
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, tableName:String? = nil) -> String {
+    public static func localize(key: String, tableName: String? = nil) -> String {
         return Localize.shared.localize(key: key, tableName: tableName)
     }
     
@@ -38,7 +38,7 @@ extension Localize {
     /// - parameter value: The replacement value
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, replace:String, tableName:String? = nil) -> String {
+    public static func localize(key: String, replace: String, tableName: String? = nil) -> String {
         return Localize.shared.localize(key: key, replace: replace, tableName: tableName)
     }
     
@@ -48,7 +48,7 @@ extension Localize {
     /// - parameter value: The replacement values
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, values replace:[Any], tableName:String? = nil) -> String {
+    public static func localize(key: String, values replace: [Any], tableName: String? = nil) -> String {
         return Localize.shared.localize(key: key, values: replace, tableName: tableName)
     }
     
@@ -59,7 +59,7 @@ extension Localize {
     /// - parameter value: The replacement dictionary
     ///
     /// - returns: localized key or same text
-    public static func localize(key:String, dictionary replace:[String:String], tableName:String? = nil) -> String {
+    public static func localize(key: String, dictionary replace: [String:String], tableName: String? = nil) -> String {
         return Localize.shared.localize(key: key, dictionary: replace, tableName: tableName)
     }
     
@@ -69,7 +69,7 @@ extension Localize {
     }
     
     /// Update base file name, searched in path.
-    public static func update(fileName:String) {
+    public static func update(fileName: String) {
         return Localize.shared.update(fileName: fileName)
     }
     
diff --git a/Source/LocalizeUI.swift b/Source/LocalizeUI.swift
index 2d79dee..20db7df 100644
--- a/Source/LocalizeUI.swift
+++ b/Source/LocalizeUI.swift
@@ -10,16 +10,21 @@ import UIKit
 
 class LocalizeUI: NSObject {
     @discardableResult
-    static func localize(key: inout String?, value: inout String?) -> String {
+    static func localize(key: inout String?, value: inout String?, updateKey: Bool = true) -> String {
         if let localized = key?.localize() {
             value = localized
             return localized
         }
         if let localized = value?.localize() {
-            key = value
+            if updateKey { key = value }
             value = localized
             return localized
         }
         return value ?? ""
     }
+    
+    static func keyFor(index: Int, localizeKey: String?) -> String? {
+        let keys = localizeKey?.components(separatedBy: ", ")
+        return keys?.count ?? 0 > index ? keys?[index] : nil
+    }
 }

From a72b2066634050db76c86c001ee1beccc4cbe557 Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Tue, 10 Apr 2018 23:06:11 -0500
Subject: [PATCH 6/9] Localize segment controls with base key

---
 Example/Example/Base.lproj/Main.storyboard |  3 +++
 Example/Example/lang-en-DE.json            |  6 +++++-
 Example/Example/lang-en.json               |  6 +++++-
 Example/Example/lang-es.json               |  6 +++++-
 Example/Example/lang-fr.json               |  6 +++++-
 Source/LocalizeUI.swift                    | 18 ++++++++++++++++--
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index 10ba065..237860e 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -154,6 +154,9 @@
                                 <segment title="one"/>
                                 <segment title="two"/>
                             </segments>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="navigation.segment: "/>
+                            </userDefinedRuntimeAttributes>
                         </segmentedControl>
                     </navigationItem>
                 </viewController>
diff --git a/Example/Example/lang-en-DE.json b/Example/Example/lang-en-DE.json
index 64549c7..60746fd 100644
--- a/Example/Example/lang-en-DE.json
+++ b/Example/Example/lang-en-DE.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize English DE"
+        "title" : "Localize English DE",
+        "segment": {
+            "one": "First",
+            "two": "Second"
+        }
     },
     "app" : {
         "label" : "In English, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
diff --git a/Example/Example/lang-en.json b/Example/Example/lang-en.json
index 17afcd9..dd242ba 100644
--- a/Example/Example/lang-en.json
+++ b/Example/Example/lang-en.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize English"
+        "title" : "Localize English",
+        "segment": {
+            "one": "First",
+            "two": "Second"
+        }
     },
     "app" : {
         "label" : "In English, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
diff --git a/Example/Example/lang-es.json b/Example/Example/lang-es.json
index d8ef56c..60bac92 100644
--- a/Example/Example/lang-es.json
+++ b/Example/Example/lang-es.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize Español"
+        "title" : "Localize Español",
+        "segment": {
+            "one": "Primero",
+            "two": "Segundo"
+        }
     },
     "app" : {
         "label" : "En Español, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
diff --git a/Example/Example/lang-fr.json b/Example/Example/lang-fr.json
index 3d723f4..795c1d2 100644
--- a/Example/Example/lang-fr.json
+++ b/Example/Example/lang-fr.json
@@ -15,7 +15,11 @@
     },
     "the.same.lavel" : "This is a localize in the same lavel",
     "navigation" : {
-        "title" : "Localize Français"
+        "title" : "Localize Français",
+        "segment": {
+            "one": "Premier",
+            "two": "Deuxième"
+        }
     },
     "app" : {
         "label" : "En Français, Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.",
diff --git a/Source/LocalizeUI.swift b/Source/LocalizeUI.swift
index 20db7df..f067287 100644
--- a/Source/LocalizeUI.swift
+++ b/Source/LocalizeUI.swift
@@ -24,7 +24,21 @@ class LocalizeUI: NSObject {
     }
     
     static func keyFor(index: Int, localizeKey: String?) -> String? {
-        let keys = localizeKey?.components(separatedBy: ", ")
-        return keys?.count ?? 0 > index ? keys?[index] : nil
+        var localizeKey = localizeKey?.replacingOccurrences(of: " ", with: "")
+        let root = localizeKey?.components(separatedBy: ":")
+        var rootKey: String? = nil
+        
+        if root?.count == 2 {
+            rootKey = root?.first
+            localizeKey = root?.last
+        }
+        
+        let keys = localizeKey?.components(separatedBy: ",")
+        let key = keys?.count ?? 0 > index ? keys?[index] : nil
+        
+        if key == nil || key?.isEmpty ?? true { return nil }
+        if rootKey == nil { return key }
+        
+        return "\(rootKey ?? "").\(key ?? "")"
     }
 }

From 6e2d020b835bb9618fbe9cf207528c72382865f3 Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Tue, 10 Apr 2018 23:24:54 -0500
Subject: [PATCH 7/9] Update doc

---
 Source/LocalizeExtensions.swift |  3 +++
 Source/LocalizeUI.swift         | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index 9cd4656..d5a814c 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -10,11 +10,14 @@ import UIKit
 private var localizeKey1: UInt8 = 0
 private var localizeKey2: UInt8 = 1
 
+/// Extension for NSCoding, easy way to storage IBInspectable properties.
 extension NSCoding {
+    /// Get associated property by IBInspectable var.
     fileprivate func localizedValue(key: UnsafeMutablePointer<UInt8>) -> String? {
         return objc_getAssociatedObject(self, key) as? String
     }
     
+    /// Set associated property by IBInspectable var.
     fileprivate func setLocalizedValue(_ value: String?, key: UnsafeMutablePointer<UInt8>) {
         guard let value = value else { return }
         let policy = objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN
diff --git a/Source/LocalizeUI.swift b/Source/LocalizeUI.swift
index f067287..647d9fe 100644
--- a/Source/LocalizeUI.swift
+++ b/Source/LocalizeUI.swift
@@ -9,6 +9,11 @@
 import UIKit
 
 class LocalizeUI: NSObject {
+    /// Localize UI component using key and value or result
+    /// It decide wich is the way to localize, user IB Properties
+    /// or values in the ui component.
+    ///
+    /// - returns: localized string and also edit it inside.
     @discardableResult
     static func localize(key: inout String?, value: inout String?, updateKey: Bool = true) -> String {
         if let localized = key?.localize() {
@@ -23,6 +28,11 @@ class LocalizeUI: NSObject {
         return value ?? ""
     }
     
+    /// Get key for segment controls based on string like to
+    /// navigation.segment: one, two or one, two
+    /// it returns the right access key to localize segment at index
+    ///
+    /// - returns: key to localize
     static func keyFor(index: Int, localizeKey: String?) -> String? {
         var localizeKey = localizeKey?.replacingOccurrences(of: " ", with: "")
         let root = localizeKey?.components(separatedBy: ":")

From 1c0670ec4fab4f6a151fd90600fea7376f10d40e Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Thu, 12 Apr 2018 12:59:16 -0500
Subject: [PATCH 8/9] New tests for UIComponents

---
 Example/Example/Base.lproj/Main.storyboard |  11 +-
 Localize.xcodeproj/project.pbxproj         |  12 +
 Source/LocalizeExtensions.swift            |   4 +-
 Tests/UIViewComponents.swift               | 273 ++++++++++++++++++++
 Tests/UIViewComponentsES.swift             | 274 +++++++++++++++++++++
 Tests/UIViewComponentsWithString.swift     | 271 ++++++++++++++++++++
 Tests/en.lproj/Strings.strings             |   8 +
 Tests/lang-en.json                         |  10 +-
 Tests/lang-es.json                         |  10 +-
 9 files changed, 867 insertions(+), 6 deletions(-)
 create mode 100644 Tests/UIViewComponents.swift
 create mode 100644 Tests/UIViewComponentsES.swift
 create mode 100644 Tests/UIViewComponentsWithString.swift

diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard
index 237860e..1900d8c 100644
--- a/Example/Example/Base.lproj/Main.storyboard
+++ b/Example/Example/Base.lproj/Main.storyboard
@@ -151,13 +151,18 @@
                             <rect key="frame" x="127" y="7" width="121" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <segments>
-                                <segment title="one"/>
-                                <segment title="two"/>
+                                <segment title=""/>
+                                <segment title=""/>
                             </segments>
                             <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="navigation.segment: "/>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="navigation.segment: one, two, tree"/>
                             </userDefinedRuntimeAttributes>
                         </segmentedControl>
+                        <barButtonItem key="rightBarButtonItem" title="Item" id="Zu7-yN-4eL">
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="one"/>
+                            </userDefinedRuntimeAttributes>
+                        </barButtonItem>
                     </navigationItem>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Gkz-PL-c8H" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/Localize.xcodeproj/project.pbxproj b/Localize.xcodeproj/project.pbxproj
index f7115a1..9bba83c 100644
--- a/Localize.xcodeproj/project.pbxproj
+++ b/Localize.xcodeproj/project.pbxproj
@@ -8,6 +8,9 @@
 
 /* Begin PBXBuildFile section */
 		2B717465207D9AFE0070DC5F /* LocalizeUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B717464207D9AFE0070DC5F /* LocalizeUI.swift */; };
+		2B717469207DC6E00070DC5F /* UIViewComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B717468207DC6E00070DC5F /* UIViewComponents.swift */; };
+		2BAA7AA4207FC9F6008E4E3A /* UIViewComponentsES.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */; };
+		2BAA7AA6207FCA8B008E4E3A /* UIViewComponentsWithString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */; };
 		9F1677FA1E51DE270022F3F8 /* Strings.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9F1677FC1E51DE270022F3F8 /* Strings.strings */; };
 		9F1678011E51F33E0022F3F8 /* StringBaseTestInSpanish.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F1678001E51F33E0022F3F8 /* StringBaseTestInSpanish.swift */; };
 		9F19DFC71E4D2B1D00F953E6 /* StringBaseTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F19DFC61E4D2B1D00F953E6 /* StringBaseTest.swift */; };
@@ -48,6 +51,9 @@
 
 /* Begin PBXFileReference section */
 		2B717464207D9AFE0070DC5F /* LocalizeUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizeUI.swift; sourceTree = "<group>"; };
+		2B717468207DC6E00070DC5F /* UIViewComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponents.swift; sourceTree = "<group>"; };
+		2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponentsES.swift; sourceTree = "<group>"; };
+		2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewComponentsWithString.swift; sourceTree = "<group>"; };
 		69F1B5741D955990000A2B87 /* Localize.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Localize.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9F1677FB1E51DE270022F3F8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Strings.strings; sourceTree = "<group>"; };
 		9F1677FD1E51DE320022F3F8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Strings.strings; sourceTree = "<group>"; };
@@ -155,6 +161,9 @@
 				9F19DFC61E4D2B1D00F953E6 /* StringBaseTest.swift */,
 				9F1678001E51F33E0022F3F8 /* StringBaseTestInSpanish.swift */,
 				9FCD8EA41E52AD3E00B5909C /* StringsChanginDefaultFileName.swift */,
+				2B717468207DC6E00070DC5F /* UIViewComponents.swift */,
+				2BAA7AA3207FC9F6008E4E3A /* UIViewComponentsES.swift */,
+				2BAA7AA5207FCA8B008E4E3A /* UIViewComponentsWithString.swift */,
 				9F989F4A1E2B3B5600A19F67 /* Supporting Files */,
 			);
 			path = Tests;
@@ -313,11 +322,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2B717469207DC6E00070DC5F /* UIViewComponents.swift in Sources */,
 				9F1678011E51F33E0022F3F8 /* StringBaseTestInSpanish.swift in Sources */,
 				9F989F4C1E2B3B8200A19F67 /* BaseTest.swift in Sources */,
 				9FCD8EA51E52AD3E00B5909C /* StringsChanginDefaultFileName.swift in Sources */,
 				9F989F4D1E2B3B8300A19F67 /* OtherLangTest.swift in Sources */,
 				9FA3BC511E318C080054CA92 /* ReadingOtherFiles.swift in Sources */,
+				2BAA7AA6207FCA8B008E4E3A /* UIViewComponentsWithString.swift in Sources */,
+				2BAA7AA4207FC9F6008E4E3A /* UIViewComponentsES.swift in Sources */,
 				9F19DFC71E4D2B1D00F953E6 /* StringBaseTest.swift in Sources */,
 				9FA3BC491E3174980054CA92 /* BaseTestInSpanish.swift in Sources */,
 				9FCD8EA91E53327D00B5909C /* JsonChanginFileName.swift in Sources */,
diff --git a/Source/LocalizeExtensions.swift b/Source/LocalizeExtensions.swift
index d5a814c..cc56c21 100644
--- a/Source/LocalizeExtensions.swift
+++ b/Source/LocalizeExtensions.swift
@@ -57,7 +57,7 @@ extension UIBarButtonItem {
     
     /// Here we change text with key replacement
     @objc public func localize() {
-        LocalizeUI.localize(key: &localizeKey, value: &title)
+        title = LocalizeUI.localize(key: &localizeKey, value: &title)
     }
 }
 
@@ -80,6 +80,8 @@ extension UIButton {
     
     /// Here we change text with key replacement
     @objc public func localize() {
+        var title = titleLabel?.text
+        titleLabel?.text = LocalizeUI.localize(key: &localizeKey, value: &title)
         for state in [UIControlState.normal, .highlighted, .selected, .disabled] {
             var title = self.title(for: state)
             title = LocalizeUI.localize(key: &localizeKey, value: &title)
diff --git a/Tests/UIViewComponents.swift b/Tests/UIViewComponents.swift
new file mode 100644
index 0000000..dc26813
--- /dev/null
+++ b/Tests/UIViewComponents.swift
@@ -0,0 +1,273 @@
+//
+//  UITesting.swift
+//  LocalizeTests
+//
+//  Created by Andres Silva Gomez on 4/10/18.
+//  Copyright © 2018 Kekiiwaa. All rights reserved.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponents: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.enableTestingMode()
+        Localize.update(language: "en")
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+    
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+    
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == nil)
+    }
+    
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+    
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+    
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "")
+    }
+    
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+    
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+    
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localize()
+        
+        XCTAssertTrue(label.text == nil)
+    }
+    
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+    
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+    
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.localize()
+        
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+    
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+    
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+    
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+    
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+    
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+    
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "")
+    }
+    
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+    
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+    
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+    
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+    
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+    
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "")
+    }
+    
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
diff --git a/Tests/UIViewComponentsES.swift b/Tests/UIViewComponentsES.swift
new file mode 100644
index 0000000..30cd144
--- /dev/null
+++ b/Tests/UIViewComponentsES.swift
@@ -0,0 +1,274 @@
+//
+//  UIViewComponentsES.swift
+//  LocalizeTests
+//
+//  Created by Andres Silva Gomez on 4/12/18.
+//  Copyright © 2018 Kekiiwaa. All rights reserved.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponentsES: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        Localize.update(provider: .json)
+        Localize.enableTestingMode()
+        Localize.update(language: "es")
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == nil)
+    }
+    
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "")
+    }
+    
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localize()
+        
+        XCTAssertTrue(label.text == nil)
+    }
+    
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(item.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(item.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.localize()
+        
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+    
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(bar.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(bar.prompt == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+    
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "")
+    }
+    
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(textField.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "Esto es una internazionalizacion en el mismo nivel")
+        XCTAssertTrue(textField.placeholder == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+    
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "Esto es una internazionalizacion en el mismo nivel")
+    }
+    
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "")
+    }
+    
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+    
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+    
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "Primero")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Segundo")
+    }
+    
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
+
diff --git a/Tests/UIViewComponentsWithString.swift b/Tests/UIViewComponentsWithString.swift
new file mode 100644
index 0000000..a9efc38
--- /dev/null
+++ b/Tests/UIViewComponentsWithString.swift
@@ -0,0 +1,271 @@
+//
+//  UIViewComponentsWithString.swift
+//  LocalizeTests
+//
+//  Created by Andres Silva Gomez on 4/12/18.
+//  Copyright © 2018 Kekiiwaa. All rights reserved.
+//
+
+import XCTest
+import UIKit
+import Localize
+
+class UIViewComponentsWithString: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        Localize.enableTestingMode()
+        Localize.update(language: "en")
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    // MARK: - UIBarButtonItem
+    func testButtonItemWithLocalizeKey() {
+        let button = UIBarButtonItem(title: "", style: .plain, target: self, action: nil)
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+    
+    func testButtonItemWithTextKey() {
+        let button = UIBarButtonItem(title: "the.same.lavel", style: .plain, target: self, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == "This is a localized in the same level")
+    }
+    
+    func testButtonItemWithoutKeys() {
+        let button = UIBarButtonItem(barButtonSystemItem: .add, target: nil, action: nil)
+        button.localize()
+        
+        XCTAssertTrue(button.title == nil)
+    }
+    
+    // MARK: - UIButton
+    func testButtonWithLocalizeKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localizeKey = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+    
+    func testButtonWithTextKey() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.titleLabel?.text = "the.same.lavel"
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "This is a localized in the same level")
+    }
+    
+    func testButtonWithoutKeys() {
+        let button = UIButton(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        button.localize()
+        
+        XCTAssertTrue(button.titleLabel?.text == "")
+    }
+    
+    // MARK: - UILabel
+    func testLabelWithLocalizeKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localizeKey = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+    
+    func testLabelWithTextKey() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.text = "the.same.lavel"
+        label.localize()
+        
+        XCTAssertTrue(label.text == "This is a localized in the same level")
+    }
+    
+    func testLabelWithoutKeys() {
+        let label = UILabel(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        label.localize()
+        
+        XCTAssertTrue(label.text == nil)
+    }
+    
+    // MARK: - UINavigationItem
+    func testNavigationItemWithLocalizeKey() {
+        let item = UINavigationItem(title: "")
+        item.localizeTitle = "the.same.lavel"
+        item.localizePrompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+    
+    func testNavigationItemWithTextKey() {
+        let item = UINavigationItem(title: "the.same.lavel")
+        item.prompt = "the.same.lavel"
+        item.localize()
+        
+        XCTAssertTrue(item.title == "This is a localized in the same level")
+        XCTAssertTrue(item.prompt == "This is a localized in the same level")
+    }
+    
+    func testNavigationItemWithoutKeys() {
+        let item = UINavigationItem(title: "")
+        item.localize()
+        
+        XCTAssertTrue(item.title == "")
+        XCTAssertTrue(item.prompt == nil)
+    }
+    
+    // MARK: - UISearchBar
+    func testSearchBarWithLocalizeKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localizePlaceholder = "the.same.lavel"
+        bar.localizePrompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+    
+    func testSearchBarWithTextKey() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.placeholder = "the.same.lavel"
+        bar.prompt = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == "This is a localized in the same level")
+        XCTAssertTrue(bar.prompt == "This is a localized in the same level")
+    }
+    
+    func testSearchBarWithoutKeys() {
+        let bar = UISearchBar(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        bar.localize()
+        
+        XCTAssertTrue(bar.placeholder == nil)
+        XCTAssertTrue(bar.prompt == nil)
+    }
+    
+    // MARK: - UITabBarItem
+    func testTabBarItemWithLocalizeKey() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localizeKey = "the.same.lavel"
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+    
+    func testTabBarItemWithTextKey() {
+        let bar = UITabBarItem(title: "the.same.lavel", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "This is a localized in the same level")
+    }
+    
+    func testTabBarItemWithoutKeys() {
+        let bar = UITabBarItem(title: "", image: nil, tag: 0)
+        bar.localize()
+        
+        XCTAssertTrue(bar.title == "")
+    }
+    
+    // MARK: - UITextField
+    func testTextFieldWithLocalizeKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localizeText = "the.same.lavel"
+        textField.localizePlaceholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+    
+    func testTextFieldWithTextKey() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.text = "the.same.lavel"
+        textField.placeholder = "the.same.lavel"
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "This is a localized in the same level")
+        XCTAssertTrue(textField.placeholder == "This is a localized in the same level")
+    }
+    
+    func testTextFieldWithoutKeys() {
+        let textField = UITextField(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textField.localize()
+        
+        XCTAssertTrue(textField.text == "")
+        XCTAssertTrue(textField.placeholder == nil)
+    }
+    
+    // MARK: - UITextView
+    func testTextViewWithLocalizeKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localizeKey = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+    
+    func testTextViewWithTextKey() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.text = "the.same.lavel"
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "This is a localized in the same level")
+    }
+    
+    func testTextViewWithoutKeys() {
+        let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        textView.localize()
+        
+        XCTAssertTrue(textView.text == "")
+    }
+    
+    // MARK: - UISegmentedControl
+    func testSegmentedControlWithLocalizeKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithLocalizeKeyBased() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localizeKey = "segment.base: one, two"
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithTextKey() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "segment.base.one", at: 0, animated: false)
+        segment.insertSegment(withTitle: "segment.base.two", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "First")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "Second")
+    }
+    
+    func testSegmentedControlWithoutKeys() {
+        let segment = UISegmentedControl(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        segment.insertSegment(withTitle: "", at: 0, animated: false)
+        segment.insertSegment(withTitle: "", at: 1, animated: false)
+        segment.localize()
+        
+        XCTAssertTrue(segment.titleForSegment(at: 0) == "")
+        XCTAssertTrue(segment.titleForSegment(at: 1) == "")
+    }
+}
diff --git a/Tests/en.lproj/Strings.strings b/Tests/en.lproj/Strings.strings
index 1c8855f..df6ae54 100644
--- a/Tests/en.lproj/Strings.strings
+++ b/Tests/en.lproj/Strings.strings
@@ -18,3 +18,11 @@
 "the.same.lavel" = "This is a localized in the same level";
 
 "enlish" = "This key only exist in english file.";
+
+"segment.base.one" = "First";
+
+"segment.base.two" = "Second";
+
+"one" = "First";
+
+"two" = "Second";
diff --git a/Tests/lang-en.json b/Tests/lang-en.json
index 7b4653c..f4d69c9 100644
--- a/Tests/lang-en.json
+++ b/Tests/lang-en.json
@@ -13,5 +13,13 @@
         }
     },
     "the.same.lavel" : "This is a localized in the same level",
-    "enlish" : "This key only exist in english file."
+    "enlish" : "This key only exist in english file.",
+    "segment": {
+        "base": {
+            "one": "First",
+            "two": "Second"
+        }
+    },
+    "one": "First",
+    "two": "Second"
 }
diff --git a/Tests/lang-es.json b/Tests/lang-es.json
index bd2c99f..f1e9921 100644
--- a/Tests/lang-es.json
+++ b/Tests/lang-es.json
@@ -12,5 +12,13 @@
             }
         }
     },
-    "the.same.lavel" : "Esto es una internazionalizacion en el mismo nivel"
+    "the.same.lavel" : "Esto es una internazionalizacion en el mismo nivel",
+    "segment": {
+        "base": {
+            "one": "Primero",
+            "two": "Segundo"
+        }
+    },
+    "one": "Primero",
+    "two": "Segundo"
 }

From 9191b4cbae0e44717f9920b08560bd69d843c1f9 Mon Sep 17 00:00:00 2001
From: Andres Silva Gomez <andresilvagomez@gmail.com>
Date: Thu, 12 Apr 2018 13:46:40 -0500
Subject: [PATCH 9/9] 2.0.0 release

---
 .travis.yml      |  2 ++
 CHANGELOG.md     | 14 ++++++++++++++
 Localize.podspec | 10 +++++-----
 README.md        | 21 +++++++++++++++------
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 859abe3..b87aa3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,3 +42,5 @@ script:
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint;
     fi
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -t ce05bbd9-41a7-4d70-96c5-b31cad55e791
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79c8859..9598d78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 `Localize` adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0](https://github.com/kekiiwaa/Localize/releases/tag/2.0.0)
+Released on 2018-04-12.
+
+#### Added
+- Transfer ownership to [andresilvagomez](https://github.com/andresilvagomez/Localize)
+- Swift 4.1 Support.
+- Faster.
+- Localize.currentLanguage.
+- Localize.availableLanguages.
+- Segment controls localize key using "," and base.
+- UIView components tested.
+  - By [Andres Silva](https://github.com/andresilvagomez) in Pull Request
+  [#22](https://github.com/Kekiiwaa/Localize/pull/22).
+
 ---
 
 ## [1.5.2](https://github.com/kekiiwaa/Localize/releases/tag/1.5.2)
diff --git a/Localize.podspec b/Localize.podspec
index 4f1f4eb..c0bf362 100644
--- a/Localize.podspec
+++ b/Localize.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
   s.name = "Localize"
-  s.version = "1.5.2"
+  s.version = "2.0.0"
   s.license = 'MIT'
   s.summary = "Localize is a framework writed in swift to localize your projects easier improves i18n, including storyboards and strings."
-  s.homepage = "https://github.com/Kekiiwaa/Localize"
-  s.author = { "Kekiiwaa" => "andresilvagomez@gmail.com" }
-  s.source = { :git => "https://github.com/Kekiiwaa/Localize.git", :tag => "1.5.2" }
+  s.homepage = "https://github.com/andresilvagomez/Localize"
+  s.author = { "Andres Silva" => "andresilvagomez@gmail.com" }
+  s.source = { :git => "https://github.com/andresilvagomez/Localize.git", :tag => "2.0.0" }
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.source_files = "Source/*.swift"
 
 end
diff --git a/README.md b/README.md
index a2433fb..2138200 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods](https://img.shields.io/cocoapods/v/Localize.svg)](https://cocoapods.org/pods/Localize)
 [![Build Status](https://travis-ci.org/Kekiiwaa/Localize.svg?branch=master)](https://travis-ci.org/Kekiiwaa/Localize)
+[![Language](https://img.shields.io/badge/language-Swift%204.1-orange.svg)](https://swift.org)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Kekiiwaa/Localize/master/LICENSE)
 
 Localize is a framework writed in swift to localize your projects easier improves i18n, including storyboards and strings.
 
@@ -17,14 +19,15 @@ ___
 
 ## Features
 
-- [x] Keep the Localizable.strings file your app already uses
+- [x] Storyboard with IBInspectable
+- [x] Keep the File.strings files your app already uses
 - [x] Support Apple strings and JSON Files
 - [x] Change your app language without changing device language
 - [x] Localize your Storyboards without extra files or/and ids
 
 ## Requirements
 
-- iOS 8.0+
+- iOS 9.0+
 - Xcode 8.0+
 - Swift 3.0+
 
@@ -48,7 +51,7 @@ platform :ios, '8.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'Localize' , '~> 1.5.2'
+    pod 'Localize' , '~> 2.0.0'
 end
 ```
 
@@ -100,6 +103,8 @@ You don't need import anything in your code, Localize use extensions to localize
 ```swift
 
 textLabel.text = "hello.world".localize()
+// Or
+textLabel.text = "hello.world".localized
 
 ```
 
@@ -167,6 +172,10 @@ print( "hello.world".localize() )
 
 // Hello world!
 
+// Also you can use
+
+print( "hello.world".localized )
+
 ```
 
 ### Localize strings, replacing text
@@ -284,7 +293,7 @@ Implementing internal acction to change a language
 
 @IBAction func updateLanguage(_ sender: Any) {
     let actionSheet = UIAlertController(title: nil, message: "app.update.language".localize(), preferredStyle: UIAlertControllerStyle.actionSheet)
-    for language in Localize.availableLanguages() {
+    for language in Localize.availableLanguages {
         let displayName = Localize.displayNameForLanguage(language)
         let languageAction = UIAlertAction(title: displayName, style: .default, handler: {
             (alert: UIAlertAction!) -> Void in
@@ -323,9 +332,9 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
     // If you want remove storaged languaje use
     localize.resetLanguage()
     // The used language
-    print(localize.language())
+    print(localize.currentLanguage)
     // List of aviable languajes
-    print(localize.availableLanguages())
+    print(localize.availableLanguages)
 
     // Or you can use static methods for all          
     Localize.update(fileName: "lang")