From 60fcf86b7dbcb2b0d0345aad6411fe65a6ecb4c0 Mon Sep 17 00:00:00 2001 From: Robert Wahler Date: Mon, 8 Jul 2013 18:42:12 -0400 Subject: [PATCH 1/4] add Android languageCode and countryCode to MOAIEnvironment Code originally authored by An Nguyen at MeYuMe --- ant/libmoai/jni/src/moai.cpp | 13 +++++++++++++ .../project/src/com/ziplinegames/moai/Moai.java | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/ant/libmoai/jni/src/moai.cpp b/ant/libmoai/jni/src/moai.cpp index 9b44b8cc6c..219f3119ce 100755 --- a/ant/libmoai/jni/src/moai.cpp +++ b/ant/libmoai/jni/src/moai.cpp @@ -596,3 +596,16 @@ AKUUpdate (); } + + extern "C" void Java_com_ziplinegames_moai_Moai_AKUSetDeviceLocale ( JNIEnv* env, jclass obj, jstring jlangCode, jstring jcountryCode ) { + JNI_GET_CSTRING ( jlangCode, langCode ); + JNI_GET_CSTRING ( jcountryCode, countryCode ); + + MOAIEnvironment& environment = MOAIEnvironment::Get (); + + environment.SetValue ( MOAI_ENV_languageCode, langCode ); + environment.SetValue( MOAI_ENV_countryCode, countryCode ); + + JNI_RELEASE_CSTRING ( jlangCode, langCode ); + JNI_RELEASE_CSTRING ( jcountryCode, countryCode ); + } diff --git a/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java b/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java index 3b3b415ad3..d17b6be0a9 100644 --- a/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java +++ b/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java @@ -24,6 +24,7 @@ import java.util.TimeZone; import java.util.ArrayList; import java.util.UUID; +import java.util.Locale; //================================================================// // Moai @@ -175,6 +176,7 @@ public static InputSensor valueOf ( int index ) { protected static native void AKUSetWorkingDirectory ( String path ); protected static native void AKUUntzInit (); protected static native void AKUUpdate (); + protected static native void AKUSetDeviceLocale ( String langCode, String countryCode ); //----------------------------------------------------------------// static { @@ -341,6 +343,8 @@ public static void init () { } AKUSetDeviceProperties ( appName, appId, appVersion, Build.CPU_ABI, Build.BRAND, Build.DEVICE, Build.MANUFACTURER, Build.MODEL, Build.PRODUCT, Runtime.getRuntime ().availableProcessors (), "Android", Build.VERSION.RELEASE, udid ); + + AKUSetDeviceLocale(Locale.getDefault().getLanguage(), Locale.getDefault().getCountry()); } } From a43ac316884f0cf8f42f0925fe8c8a221915b019 Mon Sep 17 00:00:00 2001 From: Robert Wahler Date: Wed, 10 Jul 2013 13:36:00 -0400 Subject: [PATCH 2/4] revert changes to Moai.java, this was the distribution file The correct file is ant/host-source/source/project/src/moai/Moai.java --- .../host-source/project/src/com/ziplinegames/moai/Moai.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java b/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java index d17b6be0a9..3b3b415ad3 100644 --- a/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java +++ b/distribute/hosts/ant/host-source/project/src/com/ziplinegames/moai/Moai.java @@ -24,7 +24,6 @@ import java.util.TimeZone; import java.util.ArrayList; import java.util.UUID; -import java.util.Locale; //================================================================// // Moai @@ -176,7 +175,6 @@ public static InputSensor valueOf ( int index ) { protected static native void AKUSetWorkingDirectory ( String path ); protected static native void AKUUntzInit (); protected static native void AKUUpdate (); - protected static native void AKUSetDeviceLocale ( String langCode, String countryCode ); //----------------------------------------------------------------// static { @@ -343,8 +341,6 @@ public static void init () { } AKUSetDeviceProperties ( appName, appId, appVersion, Build.CPU_ABI, Build.BRAND, Build.DEVICE, Build.MANUFACTURER, Build.MODEL, Build.PRODUCT, Runtime.getRuntime ().availableProcessors (), "Android", Build.VERSION.RELEASE, udid ); - - AKUSetDeviceLocale(Locale.getDefault().getLanguage(), Locale.getDefault().getCountry()); } } From 93595173b4fb03d81e1233cea4637137f9194aa8 Mon Sep 17 00:00:00 2001 From: Robert Wahler Date: Wed, 10 Jul 2013 13:41:37 -0400 Subject: [PATCH 3/4] add AKUSetDeviceLocale to the host-source version of Moai.java --- ant/host-source/source/project/src/moai/Moai.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ant/host-source/source/project/src/moai/Moai.java b/ant/host-source/source/project/src/moai/Moai.java index e71e4e2399..a9d1a51471 100644 --- a/ant/host-source/source/project/src/moai/Moai.java +++ b/ant/host-source/source/project/src/moai/Moai.java @@ -24,6 +24,7 @@ import java.util.TimeZone; import java.util.ArrayList; import java.util.UUID; +import java.util.Locale; //================================================================// // Moai @@ -177,7 +178,8 @@ public static InputSensor valueOf ( int index ) { protected static native void AKUSetWorkingDirectory ( String path ); protected static native void AKUUntzInit (); protected static native void AKUUpdate (); - + protected static native void AKUSetDeviceLocale ( String langCode, String countryCode ); + //----------------------------------------------------------------// static { @@ -343,6 +345,8 @@ public static void init () { } AKUSetDeviceProperties ( appName, appId, appVersion, Build.CPU_ABI, Build.BRAND, Build.DEVICE, Build.MANUFACTURER, Build.MODEL, Build.PRODUCT, Runtime.getRuntime ().availableProcessors (), "Android", Build.VERSION.RELEASE, udid ); + + AKUSetDeviceLocale(Locale.getDefault().getLanguage(), Locale.getDefault().getCountry()); } } From 44c1cd4a452adbb0804ba8f4af539c74567f92dc Mon Sep 17 00:00:00 2001 From: Robert Wahler Date: Wed, 10 Jul 2013 14:07:18 -0400 Subject: [PATCH 4/4] remove bad space char \160 --- ant/host-source/source/project/src/moai/Moai.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant/host-source/source/project/src/moai/Moai.java b/ant/host-source/source/project/src/moai/Moai.java index a9d1a51471..1e52c9a0f2 100644 --- a/ant/host-source/source/project/src/moai/Moai.java +++ b/ant/host-source/source/project/src/moai/Moai.java @@ -346,7 +346,7 @@ public static void init () { AKUSetDeviceProperties ( appName, appId, appVersion, Build.CPU_ABI, Build.BRAND, Build.DEVICE, Build.MANUFACTURER, Build.MODEL, Build.PRODUCT, Runtime.getRuntime ().availableProcessors (), "Android", Build.VERSION.RELEASE, udid ); - AKUSetDeviceLocale(Locale.getDefault().getLanguage(), Locale.getDefault().getCountry()); + AKUSetDeviceLocale(Locale.getDefault().getLanguage(), Locale.getDefault().getCountry()); } }