mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Resolves: #i86470# Wrong Java locale when using "nl" and "fr"""

Browse Source 
This reverts commit 4c13c4da16, after
475e4b477c "Move i18nlangtag lib to URELIB".

Change-Id: I61eb0c786b1fac8eb51db7b54156c906398dfb48
Reviewed-on: https://gerrit.libreoffice.org/30279
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2016-10-25 19:58:04 +02:00
parent 48304cb5b4
commit f08ef855b1
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stoc/Library_javavm.mk
View File

@@ -16,6 +16,7 @@ $(eval $(call gb_Library_use_udk_api,javavm))
$(eval $(call gb_Library_use_libraries,javavm,\ $(eval $(call gb_Library_use_libraries,javavm,\
cppu \ cppu \
cppuhelper \ cppuhelper \
i18nlangtag \
jvmaccess \ jvmaccess \
jvmfwk \ jvmfwk \
sal \ sal \

30
stoc/source/javavm/javavm.cxx
View File

@@ -71,6 +71,7 @@
#include <uno/current_context.hxx> #include <uno/current_context.hxx>
#include <uno/environment.h> #include <uno/environment.h>
#include <jvmfwk/framework.hxx> #include <jvmfwk/framework.hxx>
#include <i18nlangtag/languagetag.hxx>
#include "jni.h" #include "jni.h"
#include <stack> #include <stack>
@@ -368,28 +369,25 @@ void getDefaultLocaleFromConfig(
// read locale // read locale
css::uno::Reference<css::registry::XRegistryKey> locale = xRegistryRootKey->openKey("L10N/ooLocale"); css::uno::Reference<css::registry::XRegistryKey> locale = xRegistryRootKey->openKey("L10N/ooLocale");
if(locale.is() && !locale->getStringValue().isEmpty()) { if(locale.is() && !locale->getStringValue().isEmpty()) {
LanguageTag aLanguageTag( locale->getStringValue());
OUString language; OUString language;
OUString script;
OUString country; OUString country;
// Java knows nothing but plain old ISO language and country codes.
aLanguageTag.getIsoLanguageScriptCountry( language, script, country);
sal_Int32 index = locale->getStringValue().indexOf((sal_Unicode) '-'); if(!language.isEmpty()) {
OUString prop = "user.language="
+ language;
if(index >= 0) { pjvm->pushProp(prop);
language = locale->getStringValue().copy(0, index); }
country = locale->getStringValue().copy(index + 1);
if(!language.isEmpty()) { if(!country.isEmpty()) {
OUString prop = "user.language=" OUString prop = "user.country="
+ language; + country;
pjvm->pushProp(prop); pjvm->pushProp(prop);
}
if(!country.isEmpty()) {
OUString prop = "user.country="
+ country;
pjvm->pushProp(prop);
}
} }
} }