--- a/javamanager/javainstaller/installer/src.s60/utils/sysutil.cpp Thu May 27 12:49:31 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/utils/sysutil.cpp Fri Jun 11 13:33:44 2010 +0300
@@ -25,13 +25,20 @@
#include <sysutil.h>
#include <driveinfo.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include "hbextendedlocale.h"
+#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
#include "com_nokia_mj_impl_installer_utils_SysUtil.h"
+#include "javajniutils.h"
#include "logger.h"
#ifndef KPSUidJavaLatestInstallation
#define KPSUidJavaLatestInstallation 0x10282567
#endif
+using namespace java::util;
+
/**
* Helper method for creating HBufC from jstring.
*/
@@ -720,3 +727,21 @@
}
return value;
}
+
+/*
+ * Class: com_nokia_mj_impl_installer_utils_SysUtil
+ * Method: _isoToLang
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_utils_SysUtil__1isoToLang
+(JNIEnv *aEnv, jclass, jstring aLocale)
+{
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ return HbExtendedLocale::ISOToSymbianLang(
+ QString::fromStdWString(JniUtils::jstringToWstring(aEnv, aLocale)));
+#else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ (void)aEnv; // suppress compilation warning about unused argument
+ (void)aLocale; // suppress compilation warning about unused argument
+ return -1;
+#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+}