aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomáš Znamenáček2015-10-08 11:30:24 +0200
committerTomáš Znamenáček2015-10-08 11:30:24 +0200
commita73a254ce717e22eaa17764d8516020177fd6034 (patch)
tree78b7020c72b4984efa1186d92e0d8d236ede4146
parented694bc1a54da3407a1dfec5bb40e51b187ce714 (diff)
downloadMASShortcut-a73a254ce717e22eaa17764d8516020177fd6034.tar.bz2
Documented the CocoaPods localization fix.
-rw-r--r--CHANGES3
-rw-r--r--Framework/MASLocalization.m4
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 7942f40..f35c2e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2.3.2 not released yet
+ - Fixed localization when building through CocoaPods [Allan Beaufour]
+
2.3.1 2015/9/10
- Trying to work around a strange build error in CocoaPods.
diff --git a/Framework/MASLocalization.m b/Framework/MASLocalization.m
index a36d3a4..431fc5f 100644
--- a/Framework/MASLocalization.m
+++ b/Framework/MASLocalization.m
@@ -1,6 +1,10 @@
#import "MASLocalization.h"
#import "MASShortcut.h"
+// The CocoaPods trickery here is needed because when then code
+// is built as a part of CocoaPods, it won’t make a separate framework
+// and the Localized.strings file won’t be bundled correctly.
+// See https://github.com/shpakovski/MASShortcut/issues/74
NSString *MASLocalizedString(NSString *key, NSString *comment) {
NSBundle *frameworkBundle = nil;
#ifdef COCOAPODS