Skip to content

Commit 6a8ae03

Browse files
nlutsenkonlutsenko
committed
Merge pull request #38 from ParsePlatform/nlutsenko.localization
Fixed localization by using a separate table with framework name.
2 parents fe881c2 + b5cca5b commit 6a8ae03

File tree

7 files changed

+28
-17
lines changed

7 files changed

+28
-17
lines changed

‎Parse-OSX.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
2020
'Parse/OSX.{h,m}',
2121
'Parse/Internal/**/*.{h,m}'
2222
s.public_header_files = 'Parse/*.h', 'Parse/OSX/*.h'
23-
s.resources = 'Parse/Resources/Localizable.strings'
23+
s.resources = 'Parse/Resources/en.lproj'
2424
s.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
2525
'Parse/PFProduct.{h,m}',
2626
'Parse/PFPurchase.{h,m}',

‎Parse.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
1515
s.source_files = 'Parse/*.{h,m}',
1616
'Parse/Internal/**/*.{h,m}'
1717
s.public_header_files = 'Parse/*.h'
18-
s.resources = 'Parse/Resources/Localizable.strings'
18+
s.resources = 'Parse/Resources/en.lproj'
1919

2020
s.frameworks = 'AudioToolbox',
2121
'CFNetwork',

‎Parse.xcodeproj/project.pbxproj

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,6 @@
565565
81AFE0E91A1FDB7D00AB6CB3 /* PFRESTUserCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 81AFE0E61A1FDB7900AB6CB3 /* PFRESTUserCommand.m */; };
566566
81B3F2011AC5DA7600A92677 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6393F38B15D3018400C4F78D /* libsqlite3.dylib */; };
567567
81B3F2021AC5DAA400A92677 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 970110191630B1FE00AB761E /* Cocoa.framework */; };
568-
81B3F2541AC9D4E100A92677 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81B3F2531AC9D4E100A92677 /* Localizable.strings */; };
569-
81B3F2551AC9D4E100A92677 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81B3F2531AC9D4E100A92677 /* Localizable.strings */; };
570568
81BB6E211B0E7A1A00465C38 /* PFBase64Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BB6E1F1B0E7A1A00465C38 /* PFBase64Encoder.h */; };
571569
81BB6E221B0E7A1A00465C38 /* PFBase64Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BB6E1F1B0E7A1A00465C38 /* PFBase64Encoder.h */; };
572570
81BB6E231B0E7A1A00465C38 /* PFBase64Encoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BB6E201B0E7A1A00465C38 /* PFBase64Encoder.m */; };
@@ -733,6 +731,8 @@
733731
81E7A2261B6042BD006CB680 /* PFObjectFileCodingLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 81E7A2231B6042BD006CB680 /* PFObjectFileCodingLogic.h */; };
734732
81E7A2271B6042BD006CB680 /* PFObjectFileCodingLogic.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E7A2241B6042BD006CB680 /* PFObjectFileCodingLogic.m */; };
735733
81E7A2281B6042BD006CB680 /* PFObjectFileCodingLogic.m in Sources */ = {isa = PBXBuildFile; fileRef = 81E7A2241B6042BD006CB680 /* PFObjectFileCodingLogic.m */; };
734+
81E7BDFE1B82B931007ACDD8 /* Parse.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81E7BE011B82B931007ACDD8 /* Parse.strings */; };
735+
81E7BDFF1B82B931007ACDD8 /* Parse.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81E7BE011B82B931007ACDD8 /* Parse.strings */; };
736736
81EB595E1AF46434001EA1FC /* PFFileController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EB595C1AF46434001EA1FC /* PFFileController.h */; };
737737
81EB595F1AF46434001EA1FC /* PFFileController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81EB595C1AF46434001EA1FC /* PFFileController.h */; };
738738
81EB59601AF46434001EA1FC /* PFFileController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EB595D1AF46434001EA1FC /* PFFileController.m */; };
@@ -1357,7 +1357,6 @@
13571357
81ABC0FD1B5427EC00BA9009 /* PFUserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFUserController.m; sourceTree = "<group>"; };
13581358
81AFE0E51A1FDB7900AB6CB3 /* PFRESTUserCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFRESTUserCommand.h; sourceTree = "<group>"; };
13591359
81AFE0E61A1FDB7900AB6CB3 /* PFRESTUserCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFRESTUserCommand.m; sourceTree = "<group>"; };
1360-
81B3F2531AC9D4E100A92677 /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
13611360
81BB6E1F1B0E7A1A00465C38 /* PFBase64Encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFBase64Encoder.h; sourceTree = "<group>"; };
13621361
81BB6E201B0E7A1A00465C38 /* PFBase64Encoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFBase64Encoder.m; sourceTree = "<group>"; };
13631362
81BBE12D19FFCB3700622646 /* PFURLConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFURLConstructor.h; sourceTree = "<group>"; };
@@ -1449,6 +1448,7 @@
14491448
81E7A21B1B602560006CB680 /* PFUserFileCodingLogic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFUserFileCodingLogic.m; sourceTree = "<group>"; };
14501449
81E7A2231B6042BD006CB680 /* PFObjectFileCodingLogic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFObjectFileCodingLogic.h; sourceTree = "<group>"; };
14511450
81E7A2241B6042BD006CB680 /* PFObjectFileCodingLogic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFObjectFileCodingLogic.m; sourceTree = "<group>"; };
1451+
81E7BE001B82B931007ACDD8 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Parse.strings; sourceTree = "<group>"; };
14521452
81EB595C1AF46434001EA1FC /* PFFileController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileController.h; sourceTree = "<group>"; };
14531453
81EB595D1AF46434001EA1FC /* PFFileController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileController.m; sourceTree = "<group>"; };
14541454
81EB6632198A7FA600851598 /* PFConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFConfig.h; sourceTree = "<group>"; };
@@ -1730,8 +1730,8 @@
17301730
children = (
17311731
09809FB91434F98C00EC3E74 /* Framework.plist */,
17321732
97AA93B816780B7600445C2D /* FrameworkOSX.plist */,
1733-
81B3F2531AC9D4E100A92677 /* Localizable.strings */,
17341733
8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */,
1734+
81E7BE011B82B931007ACDD8 /* Parse.strings */,
17351735
);
17361736
path = Resources;
17371737
sourceTree = "<group>";
@@ -3627,7 +3627,6 @@
36273627
hasScannedForEncodings = 0;
36283628
knownRegions = (
36293629
en,
3630-
"zh-Hans",
36313630
Base,
36323631
);
36333632
mainGroup = 09D3363F139C54930098E916;
@@ -3694,17 +3693,17 @@
36943693
isa = PBXResourcesBuildPhase;
36953694
buildActionMask = 2147483647;
36963695
files = (
3696+
81E7BDFF1B82B931007ACDD8 /* Parse.strings in Resources */,
36973697
8139B12E1A7BF630002BEF84 /* third_party_licenses.txt in Resources */,
3698-
81B3F2551AC9D4E100A92677 /* Localizable.strings in Resources */,
36993698
);
37003699
runOnlyForDeploymentPostprocessing = 0;
37013700
};
37023701
8139B12F1A7BF65F002BEF84 /* Resources */ = {
37033702
isa = PBXResourcesBuildPhase;
37043703
buildActionMask = 2147483647;
37053704
files = (
3705+
81E7BDFE1B82B931007ACDD8 /* Parse.strings in Resources */,
37063706
8139B1301A7BF662002BEF84 /* third_party_licenses.txt in Resources */,
3707-
81B3F2541AC9D4E100A92677 /* Localizable.strings in Resources */,
37083707
);
37093708
runOnlyForDeploymentPostprocessing = 0;
37103709
};
@@ -3737,7 +3736,7 @@
37373736
);
37383737
runOnlyForDeploymentPostprocessing = 0;
37393738
shellPath = /bin/sh;
3740-
shellScript = "# Generate localizable strings\nfind $PROJECT_DIR/Parse -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Parse/Resources\n";
3739+
shellScript = "# Generate localizable strings\nfind $PROJECT_DIR/Parse -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Parse/Resources/en.lproj\n";
37413740
};
37423741
97010FB71630B1B800AB761E /* Generate Localizable Strings */ = {
37433742
isa = PBXShellScriptBuildPhase;
@@ -3751,7 +3750,7 @@
37513750
);
37523751
runOnlyForDeploymentPostprocessing = 0;
37533752
shellPath = /bin/sh;
3754-
shellScript = "# Generate localizable strings\nfind $PROJECT_DIR/Parse -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Parse/Resources\n";
3753+
shellScript = "# Generate localizable strings\nfind $PROJECT_DIR/Parse -name '*.m' -print0 | xargs -0 genstrings -q -o $PROJECT_DIR/Parse/Resources/en.lproj\n";
37553754
};
37563755
/* End PBXShellScriptBuildPhase section */
37573756

@@ -4310,6 +4309,17 @@
43104309
};
43114310
/* End PBXTargetDependency section */
43124311

4312+
/* Begin PBXVariantGroup section */
4313+
81E7BE011B82B931007ACDD8 /* Parse.strings */ = {
4314+
isa = PBXVariantGroup;
4315+
children = (
4316+
81E7BE001B82B931007ACDD8 /* en */,
4317+
);
4318+
name = Parse.strings;
4319+
sourceTree = "<group>";
4320+
};
4321+
/* End PBXVariantGroup section */
4322+
43134323
/* Begin XCBuildConfiguration section */
43144324
09D3366B139C54940098E916 /* Debug */ = {
43154325
isa = XCBuildConfiguration;

‎Parse/Internal/Push/Utilites/PFPushUtilities.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ + (void)clearDeviceToken {
5656

5757
#if TARGET_OS_IPHONE
5858

59-
+ (void)showAlertViewWithTitle:(NSString *)title
60-
message:(NSString *)message {
59+
+ (void)showAlertViewWithTitle:(NSString *)title message:(NSString *)message {
60+
NSString *cancelButtonTitle = NSLocalizedStringFromTableInBundle(@"OK", @"Parse",
61+
[NSBundle bundleForClass:[self class]],
62+
@"Default alert view cancel button title.");
6163
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title
6264
message:message
6365
delegate:nil
64-
cancelButtonTitle:NSLocalizedString(@"OK",
65-
@"Default alert cancel button title.")
66+
cancelButtonTitle:cancelButtonTitle
6667
otherButtonTitles:nil];
6768
[alert show];
6869
}

‎Parse/PFPush.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ + (void)handlePush:(NSDictionary *)userInfo {
398398
NSDictionary *alertDict = alert;
399399
NSString *locKey = alertDict[@"loc-key"];
400400
if (locKey) {
401-
message = [PFInternalUtils _stringWithFormat:NSLocalizedString(locKey, nil)
402-
arguments:alertDict[@"loc-args"]];
401+
NSString *format = [[NSBundle mainBundle] localizedStringForKey:locKey value:@"" table:nil];
402+
message = [PFInternalUtils _stringWithFormat:format arguments:alertDict[@"loc-args"]];
403403
}
404404
}
405405
if (message) {

‎Parse/Resources/Localizable.strings

-112 Bytes
Binary file not shown.

‎Parse/Resources/en.lproj/Parse.strings

122 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)