Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbriatte committed May 31, 2019
2 parents 837fd6c + 54dfb68 commit 0516c80
Showing 17 changed files with 267 additions and 14 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.

---

## [1.3.0](https://github.com/Digipolitan/localization-toolkit/releases/tag/v1.3.0)

add IB tools for UIKit most popular subclasses

---

## [1.2.0](https://github.com/Digipolitan/localization-toolkit/releases/tag/v1.2.0)

swift 5 support
2 changes: 1 addition & 1 deletion LocalizationToolkit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "LocalizationToolkit"
s.version = "1.2.0"
s.version = "1.3.0"
s.summary = "Localization helper for swift project"
s.homepage = "https://github.com/Digipolitan/localization-toolkit"
s.authors = "Digipolitan"
18 changes: 17 additions & 1 deletion LocalizationToolkit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@
51FE295922A0973F00EED0EC /* apple.png in Resources */ = {isa = PBXBuildFile; fileRef = 51FE294F22A0971100EED0EC /* apple.png */; };
51FE295A22A0973F00EED0EC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51FE295122A0971100EED0EC /* Localizable.strings */; };
51FE295B22A0973F00EED0EC /* Others.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51FE294D22A0971100EED0EC /* Others.strings */; };
51FE295F22A13BA700EED0EC /* UITextView+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE295E22A13BA700EED0EC /* UITextView+Localization.swift */; };
51FE296022A13BAC00EED0EC /* UILabel+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE295C22A13B8C00EED0EC /* UILabel+Localization.swift */; };
51FE296222A13BCE00EED0EC /* UIButton+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296122A13BCE00EED0EC /* UIButton+Localization.swift */; };
51FE296422A13BEC00EED0EC /* UITextField+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51FE296322A13BEC00EED0EC /* UITextField+Localization.swift */; };
6D453CAF7BFADECB935BEE5A /* Pods_Frameworks_LocalizationToolkit_watchOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23417784C827FE443744EB11 /* Pods_Frameworks_LocalizationToolkit_watchOS.framework */; };
7469A9B0074A3573EF6597F4 /* Pods_Frameworks_LocalizationToolkit_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8D60D94568CD1874C353733 /* Pods_Frameworks_LocalizationToolkit_OSX.framework */; };
7EBFB0B6B653C7A3BD0B83DB /* Pods_Frameworks_LocalizationToolkit_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA790FDBFD220F0C7A2C5EF /* Pods_Frameworks_LocalizationToolkit_iOS.framework */; };
@@ -111,6 +115,10 @@
51FE294E22A0971100EED0EC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Others.strings; sourceTree = "<group>"; };
51FE295022A0971100EED0EC /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = en.lproj/apple.png; sourceTree = "<group>"; };
51FE295222A0971100EED0EC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
51FE295C22A13B8C00EED0EC /* UILabel+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Localization.swift"; sourceTree = "<group>"; };
51FE295E22A13BA700EED0EC /* UITextView+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+Localization.swift"; sourceTree = "<group>"; };
51FE296122A13BCE00EED0EC /* UIButton+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Localization.swift"; sourceTree = "<group>"; };
51FE296322A13BEC00EED0EC /* UITextField+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Localization.swift"; sourceTree = "<group>"; };
53A96A04A983C7A0BF8FE3E8 /* Pods-Frameworks-LocalizationToolkit-OSX.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Frameworks-LocalizationToolkit-OSX.release.xcconfig"; path = "Pods/Target Support Files/Pods-Frameworks-LocalizationToolkit-OSX/Pods-Frameworks-LocalizationToolkit-OSX.release.xcconfig"; sourceTree = "<group>"; };
569132CAD4E5D36B72006659 /* Pods-Tests-LocalizationToolkitTests-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests-LocalizationToolkitTests-tvOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests-LocalizationToolkitTests-tvOS/Pods-Tests-LocalizationToolkitTests-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
5DC1476DA9D7CC24D68A74FB /* Pods-Frameworks-LocalizationToolkit-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Frameworks-LocalizationToolkit-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Frameworks-LocalizationToolkit-iOS/Pods-Frameworks-LocalizationToolkit-iOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -274,6 +282,10 @@
A33B2C501FB99844009A94FA /* UINib+Localization.swift */,
A33B2C511FB99844009A94FA /* UIStoryboard+Localization.swift */,
A33B2C1D1FB993F9009A94FA /* UIImage+Localization.swift */,
51FE295C22A13B8C00EED0EC /* UILabel+Localization.swift */,
51FE295E22A13BA700EED0EC /* UITextView+Localization.swift */,
51FE296122A13BCE00EED0EC /* UIButton+Localization.swift */,
51FE296322A13BEC00EED0EC /* UITextField+Localization.swift */,
);
path = UIKit;
sourceTree = "<group>";
@@ -323,10 +335,10 @@
children = (
A370DEC41FB0A49C000FEDED /* LocalizationToolkit.h */,
A3892C0A1FB7CDE6009C2712 /* Localization.swift */,
A33B2C1F1FB993FA009A94FA /* AppKit */,
A33B2C1E1FB993F9009A94FA /* Bundle+Localization.swift */,
A33B2C241FB993FA009A94FA /* MultilingualString.swift */,
A33B2C231FB993FA009A94FA /* String+Localization.swift */,
A33B2C1F1FB993FA009A94FA /* AppKit */,
A33B2C1A1FB993F9009A94FA /* UIKit */,
);
path = LocalizationToolkit;
@@ -876,9 +888,13 @@
files = (
A33B2C521FB99844009A94FA /* UINib+Localization.swift in Sources */,
A33B2C311FB993FA009A94FA /* Bundle+Localization.swift in Sources */,
51FE295F22A13BA700EED0EC /* UITextView+Localization.swift in Sources */,
A33B2C541FB99844009A94FA /* UIStoryboard+Localization.swift in Sources */,
A33B2C411FB993FA009A94FA /* String+Localization.swift in Sources */,
51FE296022A13BAC00EED0EC /* UILabel+Localization.swift in Sources */,
51FE296222A13BCE00EED0EC /* UIButton+Localization.swift in Sources */,
A3892C0B1FB7CDE6009C2712 /* Localization.swift in Sources */,
51FE296422A13BEC00EED0EC /* UITextField+Localization.swift in Sources */,
A33B2C2D1FB993FA009A94FA /* UIImage+Localization.swift in Sources */,
A33B2C451FB993FA009A94FA /* MultilingualString.swift in Sources */,
);
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
4BC6868BA8832E8A083E9ECE /* Pods_Samples_LocalizationToolkitSample_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8971F06C0506E7C4223846C3 /* Pods_Samples_LocalizationToolkitSample_iOS.framework */; };
51FE297922A1449C00EED0EC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51FE297B22A1449C00EED0EC /* Localizable.strings */; };
A30D63F21E0D717E00A3CE45 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A30D63F11E0D717E00A3CE45 /* AppDelegate.swift */; };
A30D63F91E0D717E00A3CE45 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A30D63F81E0D717E00A3CE45 /* Assets.xcassets */; };
A30D63FC1E0D717E00A3CE45 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A30D63FA1E0D717E00A3CE45 /* LaunchScreen.storyboard */; };
@@ -36,6 +37,7 @@
437CB24F88DE489FD8141488 /* Pods-Samples-LocalizationToolkitSample-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Samples-LocalizationToolkitSample-iOS.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-Samples-LocalizationToolkitSample-iOS/Pods-Samples-LocalizationToolkitSample-iOS.release.xcconfig"; sourceTree = "<group>"; };
444C2E3A94BE72ECE95421F5 /* Pods-Samples-LocalizationToolkitSample-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Samples-LocalizationToolkitSample-iOS.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-Samples-LocalizationToolkitSample-iOS/Pods-Samples-LocalizationToolkitSample-iOS.debug.xcconfig"; sourceTree = "<group>"; };
465646586A414E17162D185D /* Pods-LocalizationToolkitSample-LocalizationToolkitSample-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LocalizationToolkitSample-LocalizationToolkitSample-iOS.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-LocalizationToolkitSample-LocalizationToolkitSample-iOS/Pods-LocalizationToolkitSample-LocalizationToolkitSample-iOS.debug.xcconfig"; sourceTree = "<group>"; };
51FE297A22A1449C00EED0EC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
846FE99F4361DD69C14E72CB /* Pods_LocalizationToolkitSample_LocalizationToolkitSample_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LocalizationToolkitSample_LocalizationToolkitSample_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8971F06C0506E7C4223846C3 /* Pods_Samples_LocalizationToolkitSample_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Samples_LocalizationToolkitSample_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A30D63EE1E0D717E00A3CE45 /* LocalizationToolkitSample-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "LocalizationToolkitSample-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -84,6 +86,7 @@
children = (
A30D63F11E0D717E00A3CE45 /* AppDelegate.swift */,
A30D640D1E0D73B300A3CE45 /* ViewController.swift */,
51FE297B22A1449C00EED0EC /* Localizable.strings */,
A30D640E1E0D73B300A3CE45 /* ViewController.xib */,
A30D63F81E0D717E00A3CE45 /* Assets.xcassets */,
A30D63FA1E0D717E00A3CE45 /* LaunchScreen.storyboard */,
@@ -177,6 +180,7 @@
buildActionMask = 2147483647;
files = (
A30D63FC1E0D717E00A3CE45 /* LaunchScreen.storyboard in Resources */,
51FE297922A1449C00EED0EC /* Localizable.strings in Resources */,
A30D64101E0D73B300A3CE45 /* ViewController.xib in Resources */,
A30D63F91E0D717E00A3CE45 /* Assets.xcassets in Resources */,
);
@@ -218,6 +222,14 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
51FE297B22A1449C00EED0EC /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
51FE297A22A1449C00EED0EC /* en */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
A30D63FA1E0D717E00A3CE45 /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -21,7 +21,22 @@
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vw0-yK-ted">
<rect key="frame" x="166.5" y="323" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizationIdentifier" value="title"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="vw0-yK-ted" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="2cM-gq-0JH"/>
<constraint firstItem="vw0-yK-ted" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="xjx-LL-nek"/>
</constraints>
</view>
</objects>
</document>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
Localizable.strings
LocalizationToolkitSample-iOS

Created by Benoit Briatte on 31/05/2019.
Copyright © 2019 Digipolitan. All rights reserved.
*/

"title" = "Hello";
Original file line number Diff line number Diff line change
@@ -33,6 +33,20 @@
"role" : "appLauncher",
"subtype" : "38mm"
},
{
"size" : "44x44",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "40mm"
},
{
"size" : "50x50",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "44mm"
},
{
"size" : "86x86",
"idiom" : "watch",
@@ -46,10 +60,22 @@
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
},
{
"size" : "108x108",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "44mm"
},
{
"idiom" : "watch-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14490.70" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
<device id="watch38" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="11055"/>
<deployment identifier="watchOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14490.21"/>
</dependencies>
<scenes>
<!--Interface Controller-->
<scene sceneID="aou-V4-d1y">
<objects>
<controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider="target"/>
<controller id="AgC-eL-Hgc" customClass="InterfaceController" customModule="LocalizationToolkitSample_watchOS_WatchKit_App" customModuleProvider="target"/>
</objects>
</scene>
</scenes>
Loading

0 comments on commit 0516c80

Please sign in to comment.