svn commit: r1186950 [3/4] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1186950 [3/4] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Thu Oct 20 17:33:36 2011 @@ -16,15 +16,19 @@ * specific language governing permissions and limitations * under the License. *******************************************************************************/ + + package org.ofbiz.common; import java.util.Map; import javolution.util.FastMap; -public final class JsLanguageFilesMapping { +public final class JsLanguageFilesMapping { + // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE + // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter public static class datejs { @@ -32,7 +36,7 @@ public final class JsLanguageFilesMappin private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js"; static { - localeFiles.put("sq", "/images/jquery/plugins/datejs/date-en-US.js"); + localeFiles.put("sq", "/images/jquery/plugins/datejs/date-en-US.js"); localeFiles.put("sq_AL", "/images/jquery/plugins/datejs/date-sq-AL.js"); localeFiles.put("ar", "/images/jquery/plugins/datejs/date-en-US.js"); localeFiles.put("ar_DZ", "/images/jquery/plugins/datejs/date-ar-DZ.js"); @@ -473,8 +477,8 @@ public final class JsLanguageFilesMappin localeFiles.put("pl", "/images/jquery/plugins/validate/localization/messages_pl.js"); localeFiles.put("pl_PL", "/images/jquery/plugins/validate/localization/messages_pl.js"); localeFiles.put("pt", "/images/jquery/plugins/validate/localization/messages_en.js"); - localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_en.js"); - localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_ptbr.js"); + localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_ptpt.js"); localeFiles.put("ro", "/images/jquery/plugins/validate/localization/messages_ro.js"); localeFiles.put("ro_RO", "/images/jquery/plugins/validate/localization/messages_ro.js"); localeFiles.put("ru", "/images/jquery/plugins/validate/localization/messages_ru.js"); @@ -511,15 +515,15 @@ public final class JsLanguageFilesMappin 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("th", "/images/jquery/plugins/validate/localization/messages_en.js"); - localeFiles.put("th_TH", "/images/jquery/plugins/validate/localization/messages_en.js"); - localeFiles.put("th_TH_TH", "/images/jquery/plugins/validate/localization/messages_en.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("vi", "/images/jquery/plugins/validate/localization/messages_en.js"); - localeFiles.put("vi_VN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("vi", "/images/jquery/plugins/validate/localization/messages_vi.js"); + localeFiles.put("vi_VN", "/images/jquery/plugins/validate/localization/messages_vi.js"); } public static String getFilePath(String locale) { @@ -528,6 +532,172 @@ public final class JsLanguageFilesMappin } return validation.localeFiles.get(locale); } + } + + public static class dateTime { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultDateTime = "/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"; + static { + localeFiles.put("sq", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("sq_AL", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_DZ", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_BH", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_EG", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_IQ", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_JO", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_KW", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_LB", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_LY", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_MA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_OM", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_QA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_SA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_SD", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_SY", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_TN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_AE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ar_YE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("be", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + 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("zh", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("zh_CN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("zh_HK", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("zh_SG", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("zh_TW", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("hr", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("hr_HR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("cs", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js"); + localeFiles.put("cs_CZ", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js"); + localeFiles.put("da", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("da_DK", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("nl", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js"); + localeFiles.put("nl_BE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js"); + localeFiles.put("nl_NL", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js"); + localeFiles.put("en", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_AU", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_CA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_IN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_IE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_MT", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_NZ", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_PH", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_SG", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_ZA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("en_GB", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + 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("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"); + localeFiles.put("fr_FR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js"); + localeFiles.put("fr_LU", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js"); + localeFiles.put("fr_CH", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js"); + localeFiles.put("de", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js"); + localeFiles.put("de_AT", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js"); + localeFiles.put("de_DE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js"); + localeFiles.put("de_LU", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js"); + localeFiles.put("de_CH", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js"); + localeFiles.put("el", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js"); + localeFiles.put("el_CY", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js"); + localeFiles.put("el_GR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js"); + localeFiles.put("iw", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("iw_IL", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("hi_IN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("hu", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js"); + localeFiles.put("hu_HU", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js"); + localeFiles.put("is", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("is_IS", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("in", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("in_ID", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ga", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ga_IE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + 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("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"); + localeFiles.put("lt_LT", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js"); + localeFiles.put("mk", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("mk_MK", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("ms", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + 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("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"); + localeFiles.put("sr_BA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + 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("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"); + localeFiles.put("es_AR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_BO", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_CL", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_CO", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_CR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_DO", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_EC", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_SV", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_GT", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_HN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_MX", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_NI", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_PA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_PY", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_PE", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_PR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + localeFiles.put("es_ES", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js"); + 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("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"); + localeFiles.put("tr", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js"); + localeFiles.put("tr_TR", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js"); + localeFiles.put("uk", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("uk_UA", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-en.js"); + localeFiles.put("vi", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js"); + localeFiles.put("vi_VN", "/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js"); + } + + public static String getFilePath(String locale) { + if (dateTime.localeFiles.get(locale) == null) { + return dateTime.defaultDateTime; + } + return dateTime.localeFiles.get(locale); + } } } Modified: ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl Thu Oct 20 17:33:36 2011 @@ -16,15 +16,21 @@ * specific language governing permissions and limitations * under the License. *******************************************************************************/ + +<#-- Use the createJsLanguageFileMapping service to create or update the JsLanguageFilesMapping.java. You will still need to compile thereafter --> + package org.ofbiz.common; import java.util.Map; import javolution.util.FastMap; -public final class JsLanguageFilesMapping { + <#-- The comment in UPPERCASE below is dynamically put in the JsLanguageFilesMapping.java generated file, so please keep it... --> +public final class JsLanguageFilesMapping { + // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE + // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter public static class datejs { @@ -84,6 +90,24 @@ public final class JsLanguageFilesMappin } return validation.localeFiles.get(locale); } + } + + public static class dateTime { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultDateTime = "/images/webapp/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-en.js"; + + static { + <#list dateTime.keySet() as dateTimeFiles> + <#assign filePath = dateTime.get(dateTimeFiles)! /> + localeFiles.put("${dateTimeFiles}", "${filePath}"); + </#list> + } + public static String getFilePath(String locale) { + if (dateTime.localeFiles.get(locale) == null) { + return dateTime.defaultDateTime; + } + return dateTime.localeFiles.get(locale); + } } } Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Thu Oct 20 17:33:36 2011 @@ -115,9 +115,10 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> @@ -129,6 +130,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> + <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> @@ -377,7 +379,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> @@ -386,6 +388,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> + <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1178182 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1186940 Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericEntity.java Thu Oct 20 17:33:36 2011 @@ -744,7 +744,7 @@ public class GenericEntity extends Obser } else { Debug.logWarning("The field name (or key) [" + name + "] is not valid for entity [" + this.getEntityName() + "], printing IllegalArgumentException instead of throwing it because Map interface specification does not allow throwing that exception.", module); } - fieldValue = null; + return null; } // In case of view entity first try to retrieve with View field names @@ -816,20 +816,23 @@ public class GenericEntity extends Obser // finish off by adding the values of all PK fields if (modelEntity instanceof ModelViewEntity){ // retrieve pkNames of realEntity - ModelViewEntity modelViewEntiy = (ModelViewEntity) modelEntity; + ModelViewEntity modelViewEntity = (ModelViewEntity) modelEntity; List<String> pkNamesToUse = FastList.newInstance(); // iterate on realEntity for pkField Iterator<ModelField> iter = modelEntityToUse.getPksIterator(); while (iter != null && iter.hasNext()) { ModelField curField = iter.next(); String pkName = null; - Iterator<ModelAlias> iterAlias = modelViewEntiy.getAliasesIterator(); + Iterator<ModelAlias> iterAlias = modelViewEntity.getAliasesIterator(); //search aliasName for pkField of realEntity while (iterAlias != null && iterAlias.hasNext()) { ModelAlias aliasField = iterAlias.next(); if (aliasField.getField().equals(curField.getName())){ - pkName = aliasField.getName(); - break; + ModelEntity memberModelEntity = modelViewEntity.getMemberModelEntity(aliasField.getEntityAlias()); + if (memberModelEntity.getEntityName().equals(modelEntityToUse.getEntityName())) { + pkName = aliasField.getName(); + break; + } } } if (pkName == null) pkName = curField.getName(); Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Thu Oct 20 17:33:36 2011 @@ -1092,7 +1092,7 @@ public class DatabaseUtil { private AbstractCountingCallable createPrimaryKeyFetcher(final DatabaseMetaData dbData, final String lookupSchemaName, final boolean needsUpperCase, final Map<String, Map<String, ColumnCheckInfo>> colInfo, final Collection<String> messages, final String curTable) { return new AbstractCountingCallable(null, null) { public AbstractCountingCallable call() throws Exception { - Debug.logInfo("Fetching primary keys for " + curTable, module); + Debug.logVerbose("Fetching primary keys for " + curTable, module); ResultSet rsPks = dbData.getPrimaryKeys(null, lookupSchemaName, curTable); count = checkPrimaryKeyInfo(rsPks, lookupSchemaName, needsUpperCase, colInfo, messages); return this; Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.gif URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.gif?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== Binary files - no diff available. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js Thu Oct 20 17:33:36 2011 @@ -678,7 +678,7 @@ function set_values (value, value2) { var target2 = obj_caller.target2; write_value(value, target); write_value(value2, target2) - if (SHOW_DESCRIPTION) setLookDescription(target.attr("id"), value + " " + value2, "", ""); + if (SHOW_DESCRIPTION) setLookDescription(target.attr("id"), value + " " + value2, "", "", SHOW_DESCRIPTION); closeLookup(); } Propchange: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/ ------------------------------------------------------------------------------ bugtraq:number = true Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/selectall.js Thu Oct 20 17:33:36 2011 @@ -430,7 +430,7 @@ function ajaxAutoCompleter(areaCsvString jQuery("#" + areaArray[0]).val(ui.item.value); // setting a text field jQuery("#" + areaArray[0]).trigger("lookup:changed"); // notify the field has changed if (showDescription) { - setLookDescription(areaArray[0], ui.item.label, areaArray[2], formName) + setLookDescription(areaArray[0], ui.item.label, areaArray[2], formName, showDescription) } } }); @@ -444,7 +444,7 @@ function ajaxAutoCompleter(areaCsvString } } -function setLookDescription(textFieldId, description, params, formName){ +function setLookDescription(textFieldId, description, params, formName, showDescription){ if (description) { var start = description.lastIndexOf(' ['); if (start != -1) { @@ -461,7 +461,7 @@ function setLookDescription(textFieldId, } var lookupWrapperEl = jQuery("#" + textFieldId).closest('.field-lookup'); if (lookupWrapperEl.length) { - if (start == -1) { + if (start == -1 && showDescription) { var start = description.indexOf(' '); if (start != -1 && description.indexOf('<script type="text/javascript">') == -1) { description = description.substring(start); Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264 -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1178182 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1186940 Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/config/ServiceConfigUtil.java Thu Oct 20 17:33:36 2011 @@ -154,7 +154,7 @@ public class ServiceConfigUtil implement if (node != null) { do { - if (node.getNodeType() == Node.ELEMENT_NODE && "engine".equals(node.getLocalName())) { + if (node.getNodeType() == Node.ELEMENT_NODE && "engine".equals(node.getNodeName())) { Element engine = (Element) node; if (engineName.equals(engine.getAttribute("name"))) { NodeList params = engine.getElementsByTagName("parameter"); Modified: ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java Thu Oct 20 17:33:36 2011 @@ -46,13 +46,37 @@ public class WebSiteWorker { if (webSiteId == null) { return null; } - Delegator delegator = (Delegator) request.getAttribute("delegator"); + return findWebSite((Delegator) request.getAttribute("delegator"), webSiteId); + } + + /** + * returns a WebSite-GenericValue (using entityCache) + * + * @param delegator + * @param webSiteId + * @return + */ + public static GenericValue findWebSite(Delegator delegator, String webSiteId) { + return findWebSite(delegator, webSiteId, true); + } + + /** + * returns a WebSite-GenericValue + * + * @param delegator + * @param webSiteId + * @param useCache + * @return + */ + public static GenericValue findWebSite(Delegator delegator, String webSiteId, boolean useCache) { + GenericValue result = null; try { - return delegator.findByPrimaryKeyCache("WebSite", UtilMisc.toMap("webSiteId", webSiteId)); - } catch (GenericEntityException e) { - Debug.logError(e, "Error looking up website with id " + webSiteId, module); + result = delegator.findOne("WebSite", useCache, UtilMisc.toMap("webSiteId", webSiteId)); + } + catch (GenericEntityException e) { + Debug.logError("Error looking up website with id " + webSiteId, module); } - return null; + return result; } } Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/config/WebtoolsUiLabels.xml Thu Oct 20 17:33:36 2011 @@ -824,7 +824,7 @@ <property key="WebtoolsCheckAll"> <value xml:lang="de">Alle auswählen</value> <value xml:lang="en">Check All</value> - <value xml:lang="fr">Sélectionner tout</value> + <value xml:lang="fr">Tout sélectionner</value> <value xml:lang="it">Seleziona tutto</value> <value xml:lang="pt">Selecionar todos</value> <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value> @@ -1950,7 +1950,7 @@ </property> <property key="WebtoolsGeosSelect"> <value xml:lang="en">Select Geos to associate</value> - <value xml:lang="fr">Sélectionner les zones géographiques à associer</value> + <value xml:lang="fr">Sélectionnez les zones géographiques à associer</value> </property> <property key="WebtoolsGroup"> <value xml:lang="de">Gruppe</value> Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/widget/GeoManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/widget/GeoManagementForms.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/widget/GeoManagementForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/widget/GeoManagementForms.xml Thu Oct 20 17:33:36 2011 @@ -59,11 +59,9 @@ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListLookupGeo" extends="ListGeos"> - <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}"> - <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="EditGeo"> - <parameter param-name="geoId"/> - </hyperlink> - </field> + <field name="geoId" title="${uiLabelMap.CommonGeoId}" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_value('${geoId}')"/> + </field> <field name="deleteLink"><ignored/></field> </form> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957 /ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1178182 +/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1186940 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Thu Oct 20 17:33:36 2011 @@ -2976,7 +2976,7 @@ <value xml:lang="de">Frequenz wählen</value> <value xml:lang="en">Select Frequency</value> <value xml:lang="es">Seleccione frecuencia</value> - <value xml:lang="fr">Sélectionner une fréquence</value> + <value xml:lang="fr">Sélectionnez une fréquence</value> <value xml:lang="it">Seleziona frequenza</value> <value xml:lang="ja">Select Frequency</value> <value xml:lang="nl">Selecteer frequentie</value> @@ -2992,7 +2992,7 @@ <value xml:lang="de">Intervall wählen</value> <value xml:lang="en">Select Interval</value> <value xml:lang="es">Seleccione intervalo</value> - <value xml:lang="fr">Sélectionner un intervalle</value> + <value xml:lang="fr">Sélectionnez un intervalle</value> <value xml:lang="hi_IN">ठनà¥à¤¤à¤° à¤à¥à¤¨à¥à¤</value> <value xml:lang="it">Seleziona intervallo</value> <value xml:lang="ja">Select Interval</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Thu Oct 20 17:33:36 2011 @@ -58,6 +58,7 @@ context.shoppingListTypes = shoppingList // get the shoppingListId for this reqest parameterMap = UtilHttp.getParameterMap(request); shoppingListId = parameterMap.shoppingListId ?: request.getAttribute("shoppingListId") ?: session.getAttribute("currentShoppingListId"); +context.shoppingListId = shoppingListId; // no passed shopping list id default to first list if (!shoppingListId) { @@ -135,6 +136,23 @@ if (shoppingListId) { shoppingListItemDatas.add(shoppingListItemData); } context.shoppingListItemDatas = shoppingListItemDatas; + // pagination for the shopping list + viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 1); + viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: 20); + listSize = 0; + if (shoppingListItemDatas) + listSize = shoppingListItemDatas.size(); + + lowIndex = (((viewIndex - 1) * viewSize) + 1); + highIndex = viewIndex * viewSize; + if (highIndex > listSize) { + highIndex = listSize; + } + context.viewIndex = viewIndex; + context.viewSize = viewSize; + context.listSize = listSize; + context.lowIndex = lowIndex; + context.highIndex = highIndex; } shoppingListType = shoppingList.getRelatedOne("ShoppingListType"); Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Thu Oct 20 17:33:36 2011 @@ -1982,6 +1982,23 @@ under the License. <response name="error" type="view" value="error"/> </request-map> + <request-map uri="showShoppingList"> + <security https="false" auth="false"/> + <response name="success" type="view" value="showShoppingList" save-current-view="true"/> + </request-map> + <request-map uri="showShoppingListSecure"> + <security https="true" auth="false"/> + <response name="success" type="view" value="showShoppingList" save-current-view="true"/> + </request-map> + <request-map uri="showShoppingListAjaxFired"> + <security https="false" auth="false"/> + <response name="success" type="view" value="showShoppingList" save-current-view="true"/> + </request-map> + <request-map uri="showShoppingListAjaxFiredSecure"> + <security https="true" auth="false"/> + <response name="success" type="view" value="showShoppingList" save-current-view="true"/> + </request-map> + <!-- End of Request Mappings --> <!-- View Mappings --> @@ -2137,6 +2154,9 @@ under the License. <!-- Product Category 's Ajax --> <view-map name="productCategoryList" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#productCategoryList"/> - + + <!-- Shopping List 's Ajax --> + <view-map name="showShoppingList" type="screen" page="component://ecommerce/widget/ShoppingListScreens.xml#showShoppingList"/> + <!-- End of View Mappings --> </site-conf> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Thu Oct 20 17:33:36 2011 @@ -65,7 +65,7 @@ under the License. <init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param> <init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param> </filter> - <filter> + <filter> <filter-name>ContentUrlFilter</filter-name> <display-name>ContentUrlFilter</display-name> <filter-class>org.ofbiz.content.content.ContentUrlFilter</filter-class> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Thu Oct 20 17:33:36 2011 @@ -148,15 +148,6 @@ function getConfigDetails(event) { type: 'POST', data: jQuery('#configFormId').serialize(), success: function(data) { - if (data._ERROR_MESSAGE_LIST_ != undefined) { - //console.log(data._ERROR_MESSAGE_LIST_); - //alert(data._ERROR_MESSAGE_LIST_); - }else if (data._ERROR_MESSAGE_ != undefined) { - //console.log(data._ERROR_MESSAGE_); - //alert(data._ERROR_MESSAGE_); - }else { - //console.log(data.totalPrice); - //console.log(data.configId); var totalPrice = data.totalPrice; var configId = data.configId; document.getElementById('totalPrice').innerHTML = totalPrice; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Thu Oct 20 17:33:36 2011 @@ -24,17 +24,17 @@ var isBillStepValidate = false; jQuery(document).ready(function(){ // Cart var validateCart = jQuery("#cartForm"); - validateCart.validate(); - + validateCart.validate(); + var validateShip = jQuery("#shippingForm"); validateShip.validate(); - + var validateShipOption = jQuery("#shippingOptionForm"); validateShipOption.validate(); - + var validateBill = jQuery("#billingForm"); validateBill.validate(); - + // Goto Edit Cart Panel jQuery('#openCartPanel').click(function() { showEditCartPanel(); @@ -143,8 +143,8 @@ function getServerError(data) { var serverError = ""; if (data._ERROR_MESSAGE_LIST_ != undefined) { serverErrorHash = data._ERROR_MESSAGE_LIST_; - serverErrorHash.each(function(error) { - serverError += error.message; + jQuery.each(serverErrorHash, function(i, error) { + serverError += error.message + '<br/>'; }); } if (data._ERROR_MESSAGE_ != undefined) { @@ -257,24 +257,29 @@ function createUpdateCustomerAndShipping async: false, data: jQuery('#shippingForm').serialize(), success: function(json) { - jQuery('#shippingFormServerError').fadeOut('fast'); - // Process Shipping data response. - jQuery('#shipToPartyId').val(json.partyId); - jQuery('#billToPartyId').val(json.partyId); - jQuery('#shipToContactMechId').val(json.contactMechId); - jQuery('#shipToPhoneContactMechId').val(json.phoneContactMechId); - jQuery('#emailContactMechId').val(json.emailContactMechId); - //jQuery('#completedShippingMethod').html(json.shippingDescription); - updateShippingSummary(); - getShipOptions(); - result = true; + if (!getServerError(json)) { + jQuery('#shippingFormServerError').fadeOut('fast'); + // Process Shipping data response. + jQuery('#shipToPartyId').val(json.partyId); + jQuery('#billToPartyId').val(json.partyId); + jQuery('#shipToContactMechId').val(json.contactMechId); + jQuery('#shipToPhoneContactMechId').val(json.phoneContactMechId); + jQuery('#emailContactMechId').val(json.emailContactMechId); + //jQuery('#completedShippingMethod').html(json.shippingDescription); + updateShippingSummary(); + getShipOptions(); + result = true; + } else { + jQuery('#shippingFormServerError').html(serverError); + result = false; + } }, error: function(error) { if (error != "") { - jQuery('#shippingFormServerError').html(serverError); + jQuery('#shippingFormServerError').html(error); } result = false; - } + } }); return result; } @@ -289,19 +294,24 @@ function getShipOptions() { type: 'POST', async: false, success: function(json) { - jQuery('#shippingFormServerError').fadeOut('fast'); - isShipStepValidate = true; - shipOptions = json.shippingOptions; - var shipMethod = jQuery('#shipMethod'); - shipMethod.find("option").remove(); - jQuery.each(shipOptions, function(shipOption) { - if (this.productStoreShipMethId){ - shipMethod.append(jQuery("<option value = " + this.shippingMethod + ":" + this.productStoreShipMethId + " > " + this.shippingDesc + " </option>")); + if (!getServerError(json)) { + jQuery('#shippingFormServerError').fadeOut('fast'); + isShipStepValidate = true; + shipOptions = json.shippingOptions; + var shipMethod = jQuery('#shipMethod'); + shipMethod.find("option").remove(); + jQuery.each(shipOptions, function(shipOption) { + if (this.productStoreShipMethId){ + shipMethod.append(jQuery("<option value = " + this.shippingMethod + ":" + this.productStoreShipMethId + " > " + this.shippingDesc + " </option>")); + } else { + shipMethod.append(jQuery("<option value = " + this.shippingMethod + " > " + this.shippingDesc + " </option>")); + } + }); + result = true; } else { - shipMethod.append(jQuery("<option value = " + this.shippingMethod + " > " + this.shippingDesc + " </option>")); + jQuery('#shippingFormServerError').html(serverError); + result = false; } - }); - result = true; }, error: function(error) { if (error != "") { @@ -328,6 +338,7 @@ function setShippingOption() { async: false, data: jQuery('#shippingOptionForm').serialize(), success: function(json) { + if (!getServerError(json)) { shipTotal = json.shippingTotal; isShipOptionStepValidate = true; jQuery('#selectedShipmentOption').html(json.shippingDescription); @@ -336,6 +347,10 @@ function setShippingOption() { //jQuery('#cartGrandTotal').val(json.cartGrandTotal); //jQuery('#totalSalesTax').val(json.totalSalesTax); result = true; + } else { + jQuery('#shippingFormServerError').html(serverError); + result = false; + } }, error: function(error) { if(error != "") { @@ -374,13 +389,18 @@ function processBillingAndPayment() { data: jQuery('#billingForm').serialize(), async: false, success: function(json) { - jQuery('#billingFormServerError').fadeOut('fast'); - isBillStepValidate = true; - jQuery('#billToContactMechId').val(json.contactMechId); - jQuery('#paymentMethodId').val(json.paymentMethodId); - jQuery('#billToPhoneContactMechId').val(json.phoneContactMechId); - updateBillingSummary(); - result = true; + if (!getServerError(json)) { + jQuery('#billingFormServerError').fadeOut('fast'); + isBillStepValidate = true; + jQuery('#billToContactMechId').val(json.contactMechId); + jQuery('#paymentMethodId').val(json.paymentMethodId); + jQuery('#billToPhoneContactMechId').val(json.phoneContactMechId); + updateBillingSummary(); + result = true; + } else { + jQuery('#shippingFormServerError').html(serverError); + result = false; + } }, error: function(error) { if(error != "") { @@ -430,8 +450,13 @@ function addPromoCode() { type: 'POST', data: {"productPromoCodeId" : jQuery('#productPromoCode').val()}, success: function(json) { - jQuery('#cartFormServerError').fadeOut('fast'); - updateCartData(); + if (!getServerError(json)) { + jQuery('#cartFormServerError').fadeOut('fast'); + updateCartData(); + } else { + jQuery('#shippingFormServerError').html(serverError); + result = false; + } }, error: function(error) { if(error != "") { @@ -452,7 +477,11 @@ function getProductLineItemIndex(event, async: false, data: formValues, success: function(json) { - itemIndex = json.itemIndex; + if (!getServerError(json)) { + itemIndex = json.itemIndex; + } else { + jQuery('#shippingFormServerError').html(serverError); + } } }); return itemIndex; @@ -491,32 +520,37 @@ function updateCartData(elementId, formV type: 'POST', data: formValues, success: function(json) { - if (json.totalQuantity == 0) { - jQuery('#emptyCartCheckoutPanel').show(); - jQuery('#checkoutPanel').hide(); - jQuery('#microCartNotEmpty').hide(); - jQuery('#microCartEmpty').show(); - jQuery('#quickCheckoutEnabled').hide(); - jQuery('#quickCheckoutDisabled').show(); - jQuery('#onePageCheckoutEnabled').hide(); - jQuery('#onePageCheckoutDisabled').show(); - jQuery('#googleCheckoutEnabled').hide(); - jQuery('#googleCheckoutDisabled').show(); - jQuery('#microCartPayPalCheckout').hide(); - } else { - // Replace whole cart panel with updated cart values for updating line item in case of gift item is added or remove in cart after applying coupon code - // No need to calculate individual value for shopping cart when whole cart is updating - jQuery.ajax({ - url: 'UpdateCart', - type: 'POST', - cache: false, - success: function(data) { - jQuery('#cartPanel').html(data); - initCartProcessObservers(); + if (!getServerError(json)) { + if (json.totalQuantity == 0) { + jQuery('#emptyCartCheckoutPanel').show(); + jQuery('#checkoutPanel').hide(); + jQuery('#microCartNotEmpty').hide(); + jQuery('#microCartEmpty').show(); + jQuery('#quickCheckoutEnabled').hide(); + jQuery('#quickCheckoutDisabled').show(); + jQuery('#onePageCheckoutEnabled').hide(); + jQuery('#onePageCheckoutDisabled').show(); + jQuery('#googleCheckoutEnabled').hide(); + jQuery('#googleCheckoutDisabled').show(); + jQuery('#microCartPayPalCheckout').hide(); + } else { + // Replace whole cart panel with updated cart values for updating line item in case of gift item is added or remove in cart after applying coupon code + // No need to calculate individual value for shopping cart when whole cart is updating + jQuery.ajax({ + url: 'UpdateCart', + type: 'POST', + cache: false, + success: function(data) { + jQuery('#cartPanel').html(data); + initCartProcessObservers(); + } + }); } - }); + } else { + jQuery('#shippingFormServerError').html(serverError); + result = false; + } } - } }); } function processOrder() { Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Thu Oct 20 17:33:36 2011 @@ -30,8 +30,54 @@ under the License. } jQuery(obj).submit(); } + + function callDocumentByPaginate(info) { + var str = info.split('~'); + var checkUrl = '<@ofbizUrl>showShoppingListAjaxFired</@ofbizUrl>'; + if(checkUrl.search("http")) + var ajaxUrl = '<@ofbizUrl>showShoppingListAjaxFired</@ofbizUrl>'; + else + var ajaxUrl = '<@ofbizUrl>showShoppingListAjaxFiredSecure</@ofbizUrl>'; + //jQuerry Ajax Request + jQuery.ajax({ + url: ajaxUrl, + type: 'POST', + data: {"shoppingListId" : str[0], "VIEW_SIZE" : str[1], "VIEW_INDEX" : str[2]}, + error: function(msg) { + alert("An error occured loading content! : " + msg); + }, + success: function(msg) { + jQuery('#div3').html(msg); + } + }); + } </script> <br /> +<#macro paginationControls> + <#assign viewIndexMax = Static["java.lang.Math"].ceil((listSize - 1)?double / viewSize?double)> + <#if (viewIndexMax?int > 0)> + <div class="product-prevnext"> + <#-- Start Page Select Drop-Down --> + <select name="pageSelect" onchange="callDocumentByPaginate(this[this.selectedIndex].value);"> + <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int} ${uiLabelMap.CommonOf} ${viewIndexMax + 1}</option> + <#list 0..viewIndexMax as curViewNum> + <option value="${shoppingListId?if_exists}~${viewSize}~${curViewNum?int + 1}">${uiLabelMap.CommonGotoPage} ${curViewNum + 1}</option> + </#list> + </select> + <#-- End Page Select Drop-Down --> + <#if (viewIndex?int > 1)> + <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId?if_exists}~${viewSize}~${viewIndex?int - 1}');" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + </#if> + <#if ((listSize?int - viewSize?int) > 0)> + <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> + </#if> + <#if highIndex?int < listSize?int> + | <a href="javascript: void(0);" onclick="callDocumentByPaginate('${shoppingListId?if_exists}~${viewSize}~${viewIndex?int + 1}');" class="buttontext">${uiLabelMap.CommonNext}</a> + </#if> + </div> + </#if> +</#macro> + <div class="screenlet"> <div class="boxlink"> <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> @@ -375,6 +421,8 @@ under the License. </div> <div class="screenlet-body"> <#if shoppingListItemDatas?has_content> + <#-- Pagination --> + <@paginationControls/> <table width="100%" cellspacing="0" cellpadding="1" border="0"> <tr> <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td> @@ -385,7 +433,7 @@ under the License. <td> </td> </tr> - <#list shoppingListItemDatas as shoppingListItemData> + <#list shoppingListItemDatas[lowIndex..highIndex-1] as shoppingListItemData> <#assign shoppingListItem = shoppingListItemData.shoppingListItem/> <#assign product = shoppingListItemData.product/> <#assign productContentWrapper = Static["org.ofbiz.product.product.ProductContentWrapper"].makeProductContentWrapper(product, request)/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Oct 20 17:33:36 2011 @@ -40,8 +40,10 @@ under the License. <!-- The default (main) java scripts --> <!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: --> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> - - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> + <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/> + + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ShoppingListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ShoppingListScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ShoppingListScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ShoppingListScreens.xml Thu Oct 20 17:33:36 2011 @@ -40,4 +40,28 @@ under the License. </widgets> </section> </screen> + + <screen name="showShoppingList"> + <section> + <condition> + <if-empty field="parameters.mainSubmited"/> + </condition> + <actions> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy"/> + <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/> + <service service-name="getVisualThemeResources"> + <field-map field-name="visualThemeId"/> + <field-map field-name="themeResources" from-field="layoutSettings"/> + </service> + <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + </screens> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Thu Oct 20 17:33:36 2011 @@ -88,7 +88,7 @@ </property> <property key="GoogleBaseExportCountryCode"> <value xml:lang="en">Select your country destination</value> - <value xml:lang="fr">Sélectionner votre pays de destination</value> + <value xml:lang="fr">Sélectionnez votre pays de destination</value> <value xml:lang="it">Seleziona il paese di destinazione</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸à¸£à¸°à¹à¸à¸¨à¹à¸à¹à¸²à¸«à¸¡à¸²à¸¢à¸à¸à¸à¸à¸¸à¸</value> <value xml:lang="zh">éæ©ä½ çå½å®¶åç®æ </value> @@ -276,6 +276,10 @@ <value xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸²à¸¡à¸´à¹à¸à¸à¸£à¹à¸£à¸«à¸±à¸ªà¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">缺å°productCategoryIdåæ°</value> </property> + <property key="productsExportToGoogle.missingProduct"> + <value xml:lang="en">You have to choose any product(s)</value> + <value xml:lang="fr">Vous devez choisir un ou des produits</value> + </property> <property key="productsExportToGoogle.noProductsAvailableInProductCategory"> <value xml:lang="en">No products available in the selected productCategoryId</value> <value xml:lang="fr">Aucun article disponible dans la réf. de catégorie d'articles sélectionnée</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl Thu Oct 20 17:33:36 2011 @@ -29,7 +29,7 @@ under the License. document.products.action="<@ofbizUrl>ProductsExportToGoogle</@ofbizUrl>"; document.products.submit(); } else { - alert("You have to choose any product(s)."); + alert("${StringUtil.wrapString(uiLabelMap.productsExportToGoogle.missingProduct)}"); } } </script> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Thu Oct 20 17:33:36 2011 @@ -47,6 +47,7 @@ under the License. <screen name="keywordsearch"> <section> <actions> + <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleSearchResults"/> <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/> <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy"/> Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1178182 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1186940 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1178182 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1186940 Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:33:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957 /ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1178182 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1186940 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1186950&r1=1186949&r2=1186950&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Oct 20 17:33:36 2011 @@ -573,7 +573,7 @@ <property key="PageTitleListTaskContent"> <value xml:lang="de">Liste Aufgabeninhaltselemente aud</value> <value xml:lang="en">List Task Content Items</value> - <value xml:lang="fr">Voir les élements de la tâche</value> + <value xml:lang="fr">Voir les éléments de la tâche</value> <value xml:lang="it">Lista righe contenuto compito</value> <value xml:lang="nl">Contentitems tonen</value> <value xml:lang="zh">ä»»å¡å 容æç»å表</value> @@ -878,7 +878,7 @@ <property key="ProjectMgrCreateByExistingTask"> <value xml:lang="de">Mit einer existierenden Aufgabe verbinden</value> <value xml:lang="en">Link to an existing Task</value> - <value xml:lang="fr">Lien à une tâche existante</value> + <value xml:lang="fr">Lier à une tâche existante</value> <value xml:lang="it">Link ad un compito esistente</value> <value xml:lang="nl">Aan bestaande taak koppelen</value> <value xml:lang="th">à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¹à¸à¸¢à¸±à¸à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¹à¸¥à¹à¸§</value> @@ -1426,7 +1426,7 @@ <property key="ProjectMgrQuickAssignPartyId"> <value xml:lang="de">Schnell verbinden mit Akteur ID</value> <value xml:lang="en">Quick Assign Party Id</value> - <value xml:lang="fr">Affecter rapidement un Réf. d'acteurt</value> + <value xml:lang="fr">Affecter rapidement un acteur</value> <value xml:lang="it">Assegnazione veloce soggetto</value> <value xml:lang="nl">Snel toewijzen aan actor</value> <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> @@ -1476,7 +1476,7 @@ </property> <property key="ProjectMgrRequestWorkEffortList"> <value xml:lang="en">Cust Request WorkEffort List</value> - <value xml:lang="fr">List des demandes de tâches client</value> + <value xml:lang="fr">Liste des demandes clients associées à la tâche</value> <value xml:lang="it">Lista impegno di lavoro richiesta</value> <value xml:lang="nl">Overzicht requesttaken</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸²à¸à¸à¸²à¸¡à¸à¸³à¸£à¹à¸à¸à¸à¸à¸à¸¥à¸¹à¸à¸à¹à¸²</value> @@ -1503,7 +1503,7 @@ <property key="ProjectMgrReviewedCustomerRequestTaskList"> <value xml:lang="de">Geprüfte aber nicht komplette Kunden Anfragen Liste mit verbundenen Aufgaben</value> <value xml:lang="en">Reviewed but not completed Customer Request list with task assigned'</value> - <value xml:lang="fr">Liste des demandes client vérifiée mais incomplète et ayant une tâche affectée</value> + <value xml:lang="fr">Liste des demandes client vérifiées mais incomplètes et associées à une tâche</value> <value xml:lang="it">Verificato ma non completato, lista richiesta cliente con il compito assegnato</value> <value xml:lang="nl">Overzicht requesttaken die zijn geevalueerd maar niet gecompleteerd</value> <value xml:lang="zh">å·²æ£æ¥ä½æ²¡æå®æä»»å¡æå®ç客æ·è¯·æ±å表</value> @@ -1596,7 +1596,7 @@ <property key="ProjectMgrStatusCannotUpdate"> <value xml:lang="de">Der Status erlaubt keine Aktualisierung</value> <value xml:lang="en">Status does not allow an update</value> - <value xml:lang="fr">CE status ne permet pas une mise à jour</value> + <value xml:lang="fr">Ce statut ne permet pas une mise à jour</value> <value xml:lang="it">Stato non permette un'aggiornamento</value> <value xml:lang="nl">Status laat geen wijzigingen toe</value> <value xml:lang="th">สà¸à¸²à¸à¸°à¸¢à¸±à¸à¹à¸¡à¹à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¸à¸±à¸à¹à¸à¸</value> @@ -1605,7 +1605,7 @@ <property key="ProjectMgrStatusId"> <value xml:lang="de">Status ID</value> <value xml:lang="en">Status Id</value> - <value xml:lang="fr">Réf. de status</value> + <value xml:lang="fr">Statut</value> <value xml:lang="it">Stato</value> <value xml:lang="nl">ID</value> <value xml:lang="th">รหัสสà¸à¸²à¸à¸°</value> @@ -1623,7 +1623,7 @@ <property key="ProjectMgrSubProjectList"> <value xml:lang="de">Liste der Teilprojekte</value> <value xml:lang="en">List of SubProjects</value> - <value xml:lang="fr">Listes des sous-projets</value> + <value xml:lang="fr">Liste des sous-projets</value> <value xml:lang="it">Lista dei sotto-progetti</value> <value xml:lang="nl">Overzicht subprojecten</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¹à¸à¸£à¹à¸à¸à¸¢à¹à¸à¸¢</value> @@ -1818,7 +1818,7 @@ <property key="ProjectMgrTimeEntries"> <value xml:lang="de">Zeitbuchungen</value> <value xml:lang="en">Time Entries</value> - <value xml:lang="fr">Echéances</value> + <value xml:lang="fr">Temps déclaré</value> <value xml:lang="it">Aggiungere/Aggiornare voce orario</value> <value xml:lang="nl">Urenboekingen</value> <value xml:lang="th">à¸à¸±à¹à¸§à¹à¸¡à¸à¸à¸£à¸´à¸</value> @@ -1827,7 +1827,7 @@ <property key="ProjectMgrToComplete"> <value xml:lang="de">Fertiggestellt</value> <value xml:lang="en">To complete</value> - <value xml:lang="fr">Changer pour 'terminé'</value> + <value xml:lang="fr">Changer pour 'Terminé'</value> <value xml:lang="it">Per completare</value> <value xml:lang="nl">Naar gecompleteerd</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸à¸£à¹à¸à¸à¹à¸ªà¸à¸à¸à¸à¸à¹à¸à¸</value> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |