Author: erwan
Date: Wed Sep 5 11:17:02 2012
New Revision: 1381146
URL: http://svn.apache.org/viewvc?rev=1381146&view=rev
Log:
A patch from Leon - OFBIZ-5025 - jquery validator localization looks for
messages_cn.js for locale zh_CN and _tw for zh_TW
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1381146&r1=1381145&r2=1381146&view=diff
==============================================================================
---
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
(original)
+++
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
Wed Sep 5 11:17:02 2012
@@ -72,9 +72,11 @@ public class JsLanguageFileMappingCreato
String displayCountry = locale.toString();
String modifiedDisplayCountry = null;
String modifiedDisplayCountryForValidation = null;
+ String modifiedDisplayCountryForValidation2 = null;
if (displayCountry.indexOf('_') != -1) {
modifiedDisplayCountry = displayCountry.replace("_", "-");
modifiedDisplayCountryForValidation =
displayCountry.replace("_", "").toLowerCase(); // fun: in validate plugin we
have also ptpt and ptbr for instance...
+ modifiedDisplayCountryForValidation2 =
displayCountry.substring(displayCountry.indexOf('_')+1).toLowerCase(); //
weird, validate plugin treat zh_CN as cn (not zhcn) and zh_TW as tw (not zhtw)
} else {
modifiedDisplayCountry = displayCountry;
}
@@ -115,14 +117,21 @@ public class JsLanguageFileMappingCreato
if (file.exists()) {
fileUrl = validateRelPath + validateLocalePrefix +
strippedLocale + jsFilePostFix;
} else {
+ // use default language en
+ fileUrl = validateRelPath + validateLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
// Try to guess a language (fun: in validate plugin we have
also ptpt and ptbr for instance....)
- fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
- file = FileUtil.getFile(fileName);
- if (file.exists()) {
- fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation + jsFilePostFix;
- } else {
- // use default language en
- fileUrl = validateRelPath + validateLocalePrefix +
defaultLocaleJquery + jsFilePostFix;
+ if (modifiedDisplayCountryForValidation != null) {
+ fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation + jsFilePostFix;
+ file = FileUtil.getFile(fileName);
+ if (file.exists()) {
+ fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation + jsFilePostFix;
+ } else {
+ fileName = componentRoot + validateRelPath +
validateLocalePrefix + modifiedDisplayCountryForValidation2 + jsFilePostFix;
+ file = FileUtil.getFile(fileName);
+ if (file.exists()) {
+ fileUrl = validateRelPath + validateLocalePrefix +
modifiedDisplayCountryForValidation2 + jsFilePostFix;
+ }
+ }
}
}
validationLocaleFile.put(displayCountry, fileUrl);
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1381146&r1=1381145&r2=1381146&view=diff
==============================================================================
---
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
(original)
+++
ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
Wed Sep 5 11:17:02 2012
@@ -399,10 +399,10 @@ public final class JsLanguageFilesMappin
localeFiles.put("ca",
"/images/jquery/plugins/validate/localization/messages_ca.js");
localeFiles.put("ca_ES",
"/images/jquery/plugins/validate/localization/messages_ca.js");
localeFiles.put("zh",
"/images/jquery/plugins/validate/localization/messages_en.js");
- localeFiles.put("zh_CN",
"/images/jquery/plugins/validate/localization/messages_en.js");
+ localeFiles.put("zh_CN",
"/images/jquery/plugins/validate/localization/messages_cn.js");
localeFiles.put("zh_HK",
"/images/jquery/plugins/validate/localization/messages_en.js");
localeFiles.put("zh_SG",
"/images/jquery/plugins/validate/localization/messages_en.js");
- localeFiles.put("zh_TW",
"/images/jquery/plugins/validate/localization/messages_en.js");
+ localeFiles.put("zh_TW",
"/images/jquery/plugins/validate/localization/messages_tw.js");
localeFiles.put("hr",
"/images/jquery/plugins/validate/localization/messages_en.js");
localeFiles.put("hr_HR",
"/images/jquery/plugins/validate/localization/messages_en.js");
localeFiles.put("cs",
"/images/jquery/plugins/validate/localization/messages_cs.js");
@@ -490,8 +490,8 @@ public final class JsLanguageFilesMappin
localeFiles.put("sr_RS",
"/images/jquery/plugins/validate/localization/messages_sr.js");
localeFiles.put("sk",
"/images/jquery/plugins/validate/localization/messages_sk.js");
localeFiles.put("sk_SK",
"/images/jquery/plugins/validate/localization/messages_sk.js");
- localeFiles.put("sl",
"/images/jquery/plugins/validate/localization/messages_en.js");
- localeFiles.put("sl_SI",
"/images/jquery/plugins/validate/localization/messages_en.js");
+ localeFiles.put("sl",
"/images/jquery/plugins/validate/localization/messages_sl.js");
+ localeFiles.put("sl_SI",
"/images/jquery/plugins/validate/localization/messages_sl.js");
localeFiles.put("es",
"/images/jquery/plugins/validate/localization/messages_es.js");
localeFiles.put("es_AR",
"/images/jquery/plugins/validate/localization/messages_es.js");
localeFiles.put("es_BO",
"/images/jquery/plugins/validate/localization/messages_es.js");
@@ -514,14 +514,14 @@ public final class JsLanguageFilesMappin
localeFiles.put("es_UY",
"/images/jquery/plugins/validate/localization/messages_es.js");
localeFiles.put("es_VE",
"/images/jquery/plugins/validate/localization/messages_es.js");
localeFiles.put("sv",
"/images/jquery/plugins/validate/localization/messages_en.js");
- localeFiles.put("sv_SE",
"/images/jquery/plugins/validate/localization/messages_en.js");
+ localeFiles.put("sv_SE",
"/images/jquery/plugins/validate/localization/messages_se.js");
localeFiles.put("th",
"/images/jquery/plugins/validate/localization/messages_th.js");
localeFiles.put("th_TH",
"/images/jquery/plugins/validate/localization/messages_th.js");
localeFiles.put("th_TH_TH",
"/images/jquery/plugins/validate/localization/messages_th.js");
localeFiles.put("tr",
"/images/jquery/plugins/validate/localization/messages_tr.js");
localeFiles.put("tr_TR",
"/images/jquery/plugins/validate/localization/messages_tr.js");
localeFiles.put("uk",
"/images/jquery/plugins/validate/localization/messages_en.js");
- localeFiles.put("uk_UA",
"/images/jquery/plugins/validate/localization/messages_en.js");
+ localeFiles.put("uk_UA",
"/images/jquery/plugins/validate/localization/messages_ua.js");
localeFiles.put("vi",
"/images/jquery/plugins/validate/localization/messages_vi.js");
localeFiles.put("vi_VN",
"/images/jquery/plugins/validate/localization/messages_vi.js");
}
@@ -563,8 +563,8 @@ public final class JsLanguageFilesMappin
localeFiles.put("be_BY",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("bg",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("bg_BG",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ca",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ca_ES",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("ca",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js");
+ localeFiles.put("ca_ES",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ca.js");
localeFiles.put("zh",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("zh_CN",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-CN.js");
localeFiles.put("zh_HK",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-zh-HK.js");
@@ -593,8 +593,8 @@ public final class JsLanguageFilesMappin
localeFiles.put("en_US",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("et",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js");
localeFiles.put("et_EE",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js");
- localeFiles.put("fi",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("fi_FI",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("fi",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js");
+ localeFiles.put("fi_FI",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fi.js");
localeFiles.put("fr",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js");
localeFiles.put("fr_BE",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js");
localeFiles.put("fr_CA",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js");
@@ -623,11 +623,11 @@ public final class JsLanguageFilesMappin
localeFiles.put("it",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js");
localeFiles.put("it_IT",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js");
localeFiles.put("it_CH",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js");
- localeFiles.put("ja",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ja_JP",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ja_JP_JP",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ko",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ko_KR",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("ja",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js");
+ localeFiles.put("ja_JP",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js");
+ localeFiles.put("ja_JP_JP",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ja.js");
+ localeFiles.put("ko",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js");
+ localeFiles.put("ko_KR",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ko.js");
localeFiles.put("lv",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("lv_LV",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("lt",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js");
@@ -638,16 +638,16 @@ public final class JsLanguageFilesMappin
localeFiles.put("ms_MY",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("mt",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("mt_MT",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("no",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("no_NO",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("no_NO_NY",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("pl",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("pl_PL",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("pt",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("pt_BR",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("pt_PT",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ro",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("ro_RO",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("no",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js");
+ localeFiles.put("no_NO",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js");
+ localeFiles.put("no_NO_NY",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-no.js");
+ localeFiles.put("pl",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js");
+ localeFiles.put("pl_PL",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pl.js");
+ localeFiles.put("pt",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js");
+ localeFiles.put("pt_BR",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js");
+ localeFiles.put("pt_PT",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-pt.js");
+ localeFiles.put("ro",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js");
+ localeFiles.put("ro_RO",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ro.js");
localeFiles.put("ru",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js");
localeFiles.put("ru_RU",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js");
localeFiles.put("sr",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
@@ -655,8 +655,8 @@ public final class JsLanguageFilesMappin
localeFiles.put("sr_ME",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("sr_CS",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("sr_RS",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("sk",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("sk_SK",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("sk",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js");
+ localeFiles.put("sk_SK",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sk.js");
localeFiles.put("sl",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("sl_SI",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("es",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js");
@@ -680,8 +680,8 @@ public final class JsLanguageFilesMappin
localeFiles.put("es_US",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js");
localeFiles.put("es_UY",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js");
localeFiles.put("es_VE",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js");
- localeFiles.put("sv",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
- localeFiles.put("sv_SE",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
+ localeFiles.put("sv",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js");
+ localeFiles.put("sv_SE",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-sv.js");
localeFiles.put("th",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("th_TH",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
localeFiles.put("th_TH_TH",
"/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js");
