Skip to content

Commit 00ecf1f

Browse files
peglipegli
committed
Merge branch 'release/1.0'
2 parents 1df18d0 + 9b08d52 commit 00ecf1f

File tree

18 files changed

+129
-35
lines changed

18 files changed

+129
-35
lines changed

‎mobile/ios/LocaleHelper.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 45;
6+
objectVersion = 46;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -36,19 +36,19 @@
3636
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
3737
proxyType = 1;
3838
remoteGlobalIDString = D2AAC07D0554694100DB518D;
39-
remoteInfo = "LocaleHelper";
39+
remoteInfo = LocaleHelper;
4040
};
4141
/* End PBXContainerItemProxy section */
4242

4343
/* Begin PBXFileReference section */
44-
24DD6CF71134B3F500162E58 /* ComObscureLocalehelperModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ComObscureLocalehelperModule.h"; path = "Classes/ComObscureLocalehelperModule.h"; sourceTree = "<group>"; };
45-
24DD6CF81134B3F500162E58 /* ComObscureLocalehelperModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ComObscureLocalehelperModule.m"; path = "Classes/ComObscureLocalehelperModule.m"; sourceTree = "<group>"; };
44+
24DD6CF71134B3F500162E58 /* ComObscureLocalehelperModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComObscureLocalehelperModule.h; path = Classes/ComObscureLocalehelperModule.h; sourceTree = "<group>"; };
45+
24DD6CF81134B3F500162E58 /* ComObscureLocalehelperModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComObscureLocalehelperModule.m; path = Classes/ComObscureLocalehelperModule.m; sourceTree = "<group>"; };
4646
24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
47-
24DE9E0F11C5FE74003F90F6 /* ComObscureLocalehelperModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ComObscureLocalehelperModuleAssets.h"; path = "Classes/ComObscureLocalehelperModuleAssets.h"; sourceTree = "<group>"; };
48-
24DE9E1011C5FE74003F90F6 /* ComObscureLocalehelperModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ComObscureLocalehelperModuleAssets.m"; path = "Classes/ComObscureLocalehelperModuleAssets.m"; sourceTree = "<group>"; };
49-
AA747D9E0F9514B9006C5449 /* ComObscureLocalehelper_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ComObscureLocalehelper_Prefix.pch"; sourceTree = SOURCE_ROOT; };
47+
24DE9E0F11C5FE74003F90F6 /* ComObscureLocalehelperModuleAssets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ComObscureLocalehelperModuleAssets.h; path = Classes/ComObscureLocalehelperModuleAssets.h; sourceTree = "<group>"; };
48+
24DE9E1011C5FE74003F90F6 /* ComObscureLocalehelperModuleAssets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComObscureLocalehelperModuleAssets.m; path = Classes/ComObscureLocalehelperModuleAssets.m; sourceTree = "<group>"; };
49+
AA747D9E0F9514B9006C5449 /* ComObscureLocalehelper_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComObscureLocalehelper_Prefix.pch; sourceTree = SOURCE_ROOT; };
5050
AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
51-
D2AAC07E0554694100DB518D /* libComObscureLocalehelper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libComObscureLocalehelper.a"; sourceTree = BUILT_PRODUCTS_DIR; };
51+
D2AAC07E0554694100DB518D /* libComObscureLocalehelper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libComObscureLocalehelper.a; sourceTree = BUILT_PRODUCTS_DIR; };
5252
/* End PBXFileReference section */
5353

5454
/* Begin PBXFrameworksBuildPhase section */
@@ -79,7 +79,7 @@
7979
0867D69AFE84028FC02AAC07 /* Frameworks */,
8080
034768DFFF38A50411DB9C8B /* Products */,
8181
);
82-
name = "LocaleHelper";
82+
name = LocaleHelper;
8383
sourceTree = "<group>";
8484
};
8585
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
@@ -138,8 +138,8 @@
138138
);
139139
dependencies = (
140140
);
141-
name = "LocaleHelper";
142-
productName = "LocaleHelper";
141+
name = LocaleHelper;
142+
productName = LocaleHelper;
143143
productReference = D2AAC07E0554694100DB518D /* libComObscureLocalehelper.a */;
144144
productType = "com.apple.product-type.library.static";
145145
};
@@ -148,8 +148,11 @@
148148
/* Begin PBXProject section */
149149
0867D690FE84028FC02AAC07 /* Project object */ = {
150150
isa = PBXProject;
151+
attributes = {
152+
LastUpgradeCheck = 0610;
153+
};
151154
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "LocaleHelper" */;
152-
compatibilityVersion = "Xcode 3.1";
155+
compatibilityVersion = "Xcode 3.2";
153156
developmentRegion = English;
154157
hasScannedForEncodings = 1;
155158
knownRegions = (
@@ -212,11 +215,11 @@
212215
buildSettings = {
213216
CODE_SIGN_IDENTITY = "iPhone Developer";
214217
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
215-
DSTROOT = "/tmp/ComObscureLocalehelper.dst";
218+
DSTROOT = /tmp/ComObscureLocalehelper.dst;
216219
GCC_C_LANGUAGE_STANDARD = c99;
217220
GCC_OPTIMIZATION_LEVEL = 0;
218221
GCC_PRECOMPILE_PREFIX_HEADER = YES;
219-
GCC_PREFIX_HEADER = "ComObscureLocalehelper_Prefix.pch";
222+
GCC_PREFIX_HEADER = ComObscureLocalehelper_Prefix.pch;
220223
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
221224
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
222225
GCC_VERSION = "";
@@ -235,11 +238,10 @@
235238
"-DTI_POST_1_2",
236239
);
237240
OTHER_LDFLAGS = "-ObjC";
238-
PRODUCT_NAME = "ComObscureLocalehelper";
241+
PRODUCT_NAME = ComObscureLocalehelper;
239242
PROVISIONING_PROFILE = "";
240243
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
241244
RUN_CLANG_STATIC_ANALYZER = NO;
242-
SDKROOT = iphoneos;
243245
USER_HEADER_SEARCH_PATHS = "";
244246
};
245247
name = Debug;
@@ -249,11 +251,11 @@
249251
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
250252
buildSettings = {
251253
ALWAYS_SEARCH_USER_PATHS = NO;
252-
DSTROOT = "/tmp/ComObscureLocalehelper.dst";
254+
DSTROOT = /tmp/ComObscureLocalehelper.dst;
253255
GCC_C_LANGUAGE_STANDARD = c99;
254256
GCC_MODEL_TUNING = G5;
255257
GCC_PRECOMPILE_PREFIX_HEADER = YES;
256-
GCC_PREFIX_HEADER = "ComObscureLocalehelper_Prefix.pch";
258+
GCC_PREFIX_HEADER = ComObscureLocalehelper_Prefix.pch;
257259
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
258260
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
259261
GCC_VERSION = "";
@@ -266,13 +268,11 @@
266268
GCC_WARN_UNUSED_VALUE = NO;
267269
GCC_WARN_UNUSED_VARIABLE = NO;
268270
INSTALL_PATH = /usr/local/lib;
269-
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
270271
LIBRARY_SEARCH_PATHS = "";
271272
OTHER_CFLAGS = "-DTI_POST_1_2";
272273
OTHER_LDFLAGS = "-ObjC";
273-
PRODUCT_NAME = "ComObscureLocalehelper";
274+
PRODUCT_NAME = ComObscureLocalehelper;
274275
RUN_CLANG_STATIC_ANALYZER = NO;
275-
SDKROOT = iphoneos;
276276
USER_HEADER_SEARCH_PATHS = "";
277277
};
278278
name = Release;
@@ -283,11 +283,11 @@
283283
buildSettings = {
284284
CODE_SIGN_IDENTITY = "iPhone Developer";
285285
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
286-
DSTROOT = "/tmp/ComObscureLocalehelper.dst";
286+
DSTROOT = /tmp/ComObscureLocalehelper.dst;
287287
GCC_C_LANGUAGE_STANDARD = c99;
288288
GCC_OPTIMIZATION_LEVEL = 0;
289289
GCC_PRECOMPILE_PREFIX_HEADER = YES;
290-
GCC_PREFIX_HEADER = "ComObscureLocalehelper_Prefix.pch";
290+
GCC_PREFIX_HEADER = ComObscureLocalehelper_Prefix.pch;
291291
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
292292
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
293293
GCC_VERSION = "";
@@ -300,12 +300,14 @@
300300
GCC_WARN_UNUSED_VALUE = NO;
301301
GCC_WARN_UNUSED_VARIABLE = NO;
302302
INSTALL_PATH = /usr/local/lib;
303+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
304+
ONLY_ACTIVE_ARCH = YES;
303305
OTHER_CFLAGS = (
304306
"-DDEBUG",
305307
"-DTI_POST_1_2",
306308
);
307309
OTHER_LDFLAGS = "-ObjC";
308-
PRODUCT_NAME = "ComObscureLocalehelper";
310+
PRODUCT_NAME = ComObscureLocalehelper;
309311
PROVISIONING_PROFILE = "";
310312
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
311313
RUN_CLANG_STATIC_ANALYZER = NO;
@@ -319,11 +321,11 @@
319321
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
320322
buildSettings = {
321323
ALWAYS_SEARCH_USER_PATHS = NO;
322-
DSTROOT = "/tmp/ComObscureLocalehelper.dst";
324+
DSTROOT = /tmp/ComObscureLocalehelper.dst;
323325
GCC_C_LANGUAGE_STANDARD = c99;
324326
GCC_MODEL_TUNING = G5;
325327
GCC_PRECOMPILE_PREFIX_HEADER = YES;
326-
GCC_PREFIX_HEADER = "ComObscureLocalehelper_Prefix.pch";
328+
GCC_PREFIX_HEADER = ComObscureLocalehelper_Prefix.pch;
327329
GCC_PREPROCESSOR_DEFINITIONS = "TI_VERSION=$(TI_VERSION)";
328330
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
329331
GCC_VERSION = "";
@@ -336,10 +338,10 @@
336338
GCC_WARN_UNUSED_VALUE = NO;
337339
GCC_WARN_UNUSED_VARIABLE = NO;
338340
INSTALL_PATH = /usr/local/lib;
339-
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
341+
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
340342
OTHER_CFLAGS = "-DTI_POST_1_2";
341343
OTHER_LDFLAGS = "-ObjC";
342-
PRODUCT_NAME = "ComObscureLocalehelper";
344+
PRODUCT_NAME = ComObscureLocalehelper;
343345
RUN_CLANG_STATIC_ANALYZER = NO;
344346
SDKROOT = iphoneos;
345347
USER_HEADER_SEARCH_PATHS = "";

‎mobile/ios/manifest‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 0.1
5+
version: 1.0
66
apiversion: 2
7-
description: My module
8-
author: Your Name
9-
license: Specify your license
10-
copyright: Copyright (c) 2013 by Your Company
7+
description: LocaleHelper allows you to change the Titanium locale programatically
8+
author: Paul Mietz Egli
9+
license: Apache License 2.0
10+
copyright: Copyright (c) 2013 by Paul Mietz Egli
1111

1212

1313
# these should not be edited
1414
name: LocaleHelper
1515
moduleid: com.obscure.localehelper
1616
guid: c3519c26-c3d4-4c02-880e-67372893d1f1
1717
platform: iphone
18-
minsdk: 3.1.3.GA
18+
minsdk: 3.5.0.GA
19+
architectures: armv7 arm64 i386 x86_64

‎mobile/ios/titanium.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
55
//
66
//
7-
TITANIUM_SDK_VERSION = 3.1.3.GA
7+
TITANIUM_SDK_VERSION = 3.5.0.GA
88

99

1010
//

‎mobile/noarch/testapp/Resources/app.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// This is a test harness for your module
2+
// You should do something interesting in this harness
3+
// to test out the module and to provide instructions
4+
// to users on how to use it by example.
5+
6+
7+
// open a single window
8+
var win = Ti.UI.createWindow({
9+
backgroundColor:'white'
10+
});
11+
var label = Ti.UI.createLabel();
12+
win.add(label);
13+
win.open();
14+
15+
// TODO: write your module tests here
16+
var LocaleHelper = require('com.obscure.localehelper');
17+
Ti.API.info("module is => " + LocaleHelper);
18+
19+
LocaleHelper.locale = "es";
20+
label.text = L("key1");

‎mobile/noarch/testapp/Resources/iphone/[email protected]‎

514 KB
Loading

‎mobile/noarch/testapp/Resources/iphone/[email protected]‎

501 KB
Loading

‎mobile/noarch/testapp/Resources/iphone/[email protected]‎

1.67 MB
Loading

‎mobile/noarch/testapp/Resources/iphone/Default-Landscape.png‎

745 KB
Loading

‎mobile/noarch/testapp/Resources/iphone/[email protected]‎

2.1 MB
Loading

‎mobile/noarch/testapp/Resources/iphone/[email protected]‎

1020 KB
Loading

0 commit comments

Comments
 (0)