svn commit: r1178203 - in /ofbiz/branches/release11.04: ./ applications/order/script/org/
Locked
svn commit: r1178203 - in /ofbiz/branches/release11.04: ./ applications/order/script/org/
 
|
Author: jleroux
Date: Sun Oct 2 16:24:36 2011 New Revision: 1178203 URL: http://svn.apache.org/viewvc?rev=1178203&view=rev Log: "Applied fix from trunk for revision: 1178199" ------------------------------------------------------------------------ r1178199 | jleroux | 2011-10-02 17:59:12 +0200 (dim., 02 oct. 2011) | 7 lines Closes "The time part (cursors) of the Date Time picker is not internationalized" https://issues.apache.org/jira/browse/OFBIZ-4015 Fixes the problem by: * Updating datetimepicker from 0.9.3 to 0.9.6 (where a localization folder exists) * Use the fantastic createJsLanguageFileMapping service Sascha introduced (I just removed the confusing wrong comment about JsLanguageFilesMapping.ftl being generated and added a block for datetimepicker, also in JsLanguageFileMappingCreator.java). A very good dynamic+static tool, kudos Sascha! Should work also in eCommerce though I did not found any uses ------------------------------------------------------------------------ Added: ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/README.md ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/ (props changed) - copied from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/ ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-cs.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-de.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-el.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-es.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-et.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-fr.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-hu.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-id.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-it.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-lt.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-nl.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-ru.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-tr.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js - copied unchanged from r1178199, ofbiz/trunk/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/jquery-ui-timepicker-vi.js Removed: ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.js ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js Modified: ofbiz/branches/release11.04/ (props changed) ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java ofbiz/branches/release11.04/framework/common/template/JsLanguageFilesMapping.ftl ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml (props changed) ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) Propchange: ofbiz/branches/release11.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1133353,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24:36 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1178203&r1=1178202&r2=1178203&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Sun Oct 2 16:24:36 2011 @@ -31,14 +31,17 @@ public class JsLanguageFileMappingCreato List<Locale> localeList = UtilMisc.availableLocales(); Map<String, Object> jQueryLocaleFile = FastMap.newInstance(); Map<String, String> dateJsLocaleFile = FastMap.newInstance(); + Map<String, String> dateTimePickerLocaleFile = FastMap.newInstance(); // setup some variables to locate the js files String componentRoot = "component://images/webapp"; String jqueryUiLocaleRelPath = "/images/jquery/ui/development-bundle/ui/i18n/"; String dateJsLocaleRelPath = "/images/jquery/plugins/datejs/"; + String dateTimePickerJsLocaleRelPath = "/images/jquery/plugins/datetimepicker/localization/"; String jsFilePostFix = ".js"; String dateJsLocalePrefix = "date-"; String jqueryUiLocalePrefix = "jquery.ui.datepicker-"; + String dateTimePickerPrefix = "jquery-ui-timepicker-"; String defaultLocaleDateJs = "en-US"; String defaultLocaleJquery = "en"; @@ -110,6 +113,28 @@ public class JsLanguageFileMappingCreato } jQueryLocaleFile.put(displayCountry, fileUrl); + + /* + * Try to open the datetimepicker language file + */ + file = null; + fileUrl = null; + + fileName = componentRoot + dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + strippedLocale + jsFilePostFix; + file = FileUtil.getFile(fileName); + + if (file.exists()) { + fileUrl = dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + strippedLocale + jsFilePostFix; + } else { + fileName = componentRoot + dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + modifiedDisplayCountry + jsFilePostFix; + file = FileUtil.getFile(fileName); + + if (file.exists()) { + fileUrl = dateTimePickerJsLocaleRelPath + dateTimePickerPrefix + modifiedDisplayCountry + jsFilePostFix; + } + } + + dateTimePickerLocaleFile.put(displayCountry, fileUrl); } // check the template file @@ -118,6 +143,7 @@ public class JsLanguageFileMappingCreato Map<String, Object> mapWrapper = new HashMap<String, Object>(); mapWrapper.put("datejs", dateJsLocaleFile); mapWrapper.put("jquery", jQueryLocaleFile); + mapWrapper.put("dateTime", dateTimePickerLocaleFile); // some magic to create a new java file // render it as FTL Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1178203&r1=1178202&r2=1178203&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Sun Oct 2 16:24:36 2011 @@ -24,8 +24,6 @@ import javolution.util.FastMap; public final class JsLanguageFilesMapping { - // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE - public static class datejs { private static Map<String, String> localeFiles = FastMap.newInstance(); @@ -362,4 +360,337 @@ public final class JsLanguageFilesMappin } } + + public static class validation { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; + + static { + localeFiles.put("sq", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("sq_AL", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ar", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_DZ", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_BH", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_EG", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_IQ", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_JO", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_KW", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_LB", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_LY", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_MA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_OM", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_QA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SD", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SY", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_TN", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_AE", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_YE", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("be", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("be_BY", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("bg", "/images/jquery/plugins/validate/localization/messages_bg.js"); + localeFiles.put("bg_BG", "/images/jquery/plugins/validate/localization/messages_bg.js"); + 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_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("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"); + localeFiles.put("cs_CZ", "/images/jquery/plugins/validate/localization/messages_cs.js"); + localeFiles.put("da", "/images/jquery/plugins/validate/localization/messages_da.js"); + localeFiles.put("da_DK", "/images/jquery/plugins/validate/localization/messages_da.js"); + localeFiles.put("nl", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("nl_BE", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("nl_NL", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("en", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_AU", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_CA", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_IN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_IE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_MT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_NZ", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_PH", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_SG", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_ZA", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_GB", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_US", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("et", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("et_EE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("fi", "/images/jquery/plugins/validate/localization/messages_fi.js"); + localeFiles.put("fi_FI", "/images/jquery/plugins/validate/localization/messages_fi.js"); + localeFiles.put("fr", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_BE", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_CA", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_FR", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_LU", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_CH", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("de", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_AT", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_DE", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_LU", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_CH", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("el", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("el_CY", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("el_GR", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("iw", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("iw_IL", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hi_IN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hu", "/images/jquery/plugins/validate/localization/messages_hu.js"); + localeFiles.put("hu_HU", "/images/jquery/plugins/validate/localization/messages_hu.js"); + localeFiles.put("is", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("is_IS", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("in", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("in_ID", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ga", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ga_IE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("it", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("it_IT", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("it_CH", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("ja", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ja_JP", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ja_JP_JP", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ko", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ko_KR", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("lv", "/images/jquery/plugins/validate/localization/messages_lv.js"); + localeFiles.put("lv_LV", "/images/jquery/plugins/validate/localization/messages_lv.js"); + localeFiles.put("lt", "/images/jquery/plugins/validate/localization/messages_lt.js"); + localeFiles.put("lt_LT", "/images/jquery/plugins/validate/localization/messages_lt.js"); + localeFiles.put("mk", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mk_MK", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ms", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ms_MY", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mt", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mt_MT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("no", "/images/jquery/plugins/validate/localization/messages_no.js"); + localeFiles.put("no_NO", "/images/jquery/plugins/validate/localization/messages_no.js"); + localeFiles.put("no_NO_NY", "/images/jquery/plugins/validate/localization/messages_no.js"); + 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("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"); + localeFiles.put("ru_RU", "/images/jquery/plugins/validate/localization/messages_ru.js"); + localeFiles.put("sr", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_BA", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_ME", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_CS", "/images/jquery/plugins/validate/localization/messages_sr.js"); + 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("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"); + localeFiles.put("es_CL", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_CO", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_CR", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_DO", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_EC", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_SV", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_GT", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_HN", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_MX", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_NI", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PA", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PY", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PE", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PR", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_ES", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_US", "/images/jquery/plugins/validate/localization/messages_es.js"); + 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("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_vi.js"); + localeFiles.put("vi_VN", "/images/jquery/plugins/validate/localization/messages_vi.js"); + } + + public static String getFilePath(String locale) { + if (validation.localeFiles.get(locale) == null) { + return validation.defaultValidation; + } + return validation.localeFiles.get(locale); + } + } + + public static class dateTime { + private static Map<String, String> localeFiles = FastMap.newInstance(); + + static { + localeFiles.put("sq", ""); + localeFiles.put("sq_AL", ""); + localeFiles.put("ar", ""); + localeFiles.put("ar_DZ", ""); + localeFiles.put("ar_BH", ""); + localeFiles.put("ar_EG", ""); + localeFiles.put("ar_IQ", ""); + localeFiles.put("ar_JO", ""); + localeFiles.put("ar_KW", ""); + localeFiles.put("ar_LB", ""); + localeFiles.put("ar_LY", ""); + localeFiles.put("ar_MA", ""); + localeFiles.put("ar_OM", ""); + localeFiles.put("ar_QA", ""); + localeFiles.put("ar_SA", ""); + localeFiles.put("ar_SD", ""); + localeFiles.put("ar_SY", ""); + localeFiles.put("ar_TN", ""); + localeFiles.put("ar_AE", ""); + localeFiles.put("ar_YE", ""); + localeFiles.put("be", ""); + localeFiles.put("be_BY", ""); + localeFiles.put("bg", ""); + localeFiles.put("bg_BG", ""); + localeFiles.put("ca", ""); + localeFiles.put("ca_ES", ""); + localeFiles.put("zh", ""); + localeFiles.put("zh_CN", ""); + localeFiles.put("zh_HK", ""); + localeFiles.put("zh_SG", ""); + localeFiles.put("zh_TW", ""); + localeFiles.put("hr", ""); + localeFiles.put("hr_HR", ""); + 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", ""); + localeFiles.put("da_DK", ""); + 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", ""); + localeFiles.put("en_AU", ""); + localeFiles.put("en_CA", ""); + localeFiles.put("en_IN", ""); + localeFiles.put("en_IE", ""); + localeFiles.put("en_MT", ""); + localeFiles.put("en_NZ", ""); + localeFiles.put("en_PH", ""); + localeFiles.put("en_SG", ""); + localeFiles.put("en_ZA", ""); + localeFiles.put("en_GB", ""); + localeFiles.put("en_US", ""); + 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", ""); + localeFiles.put("fi_FI", ""); + 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", ""); + localeFiles.put("iw_IL", ""); + localeFiles.put("hi_IN", ""); + 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", ""); + localeFiles.put("is_IS", ""); + localeFiles.put("in", ""); + localeFiles.put("in_ID", ""); + localeFiles.put("ga", ""); + localeFiles.put("ga_IE", ""); + 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", ""); + localeFiles.put("ja_JP", ""); + localeFiles.put("ja_JP_JP", ""); + localeFiles.put("ko", ""); + localeFiles.put("ko_KR", ""); + localeFiles.put("lv", ""); + localeFiles.put("lv_LV", ""); + 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", ""); + localeFiles.put("mk_MK", ""); + localeFiles.put("ms", ""); + localeFiles.put("ms_MY", ""); + localeFiles.put("mt", ""); + localeFiles.put("mt_MT", ""); + localeFiles.put("no", ""); + localeFiles.put("no_NO", ""); + localeFiles.put("no_NO_NY", ""); + localeFiles.put("pl", ""); + localeFiles.put("pl_PL", ""); + localeFiles.put("pt", ""); + localeFiles.put("pt_BR", ""); + localeFiles.put("pt_PT", ""); + localeFiles.put("ro", ""); + localeFiles.put("ro_RO", ""); + 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", ""); + localeFiles.put("sr_BA", ""); + localeFiles.put("sr_ME", ""); + localeFiles.put("sr_CS", ""); + localeFiles.put("sr_RS", ""); + localeFiles.put("sk", ""); + localeFiles.put("sk_SK", ""); + localeFiles.put("sl", ""); + localeFiles.put("sl_SI", ""); + 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", ""); + localeFiles.put("sv_SE", ""); + localeFiles.put("th", ""); + localeFiles.put("th_TH", ""); + localeFiles.put("th_TH_TH", ""); + 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", ""); + localeFiles.put("uk_UA", ""); + 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 null; + } + return dateTime.localeFiles.get(locale); + } + } } Modified: ofbiz/branches/release11.04/framework/common/template/JsLanguageFilesMapping.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/template/JsLanguageFilesMapping.ftl?rev=1178203&r1=1178202&r2=1178203&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/template/JsLanguageFilesMapping.ftl (original) +++ ofbiz/branches/release11.04/framework/common/template/JsLanguageFilesMapping.ftl Sun Oct 2 16:24:36 2011 @@ -24,8 +24,6 @@ import javolution.util.FastMap; public final class JsLanguageFilesMapping { - // DO NOT EDIT THIS FILE! THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE - public static class datejs { private static Map<String, String> localeFiles = FastMap.newInstance(); @@ -66,4 +64,41 @@ public final class JsLanguageFilesMappin } } + + public static class validation { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; + + static { + <#list validation.keySet() as validationFiles> + <#assign filePath = validation.get(validationFiles) /> + localeFiles.put("${validationFiles}", "${filePath}"); + </#list> + } + + public static String getFilePath(String locale) { + if (validation.localeFiles.get(locale) == null) { + return validation.defaultValidation; + } + return validation.localeFiles.get(locale); + } + } + + public static class dateTime { + private static Map<String, String> localeFiles = FastMap.newInstance(); + + 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 null; + } + return dateTime.localeFiles.get(locale); + } + } } Modified: ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml?rev=1178203&r1=1178202&r2=1178203&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/release11.04/framework/common/widget/CommonScreens.xml Sun Oct 2 16:24:36 2011 @@ -107,8 +107,15 @@ under the License. <actions> <!-- The default (global) java scripts --> <!-- jQuery part --> + <!-- Load available JS Language Files --> + <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.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.11.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> @@ -124,6 +131,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.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.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker-0.9.6/jquery-ui-timepicker-addon.css" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/> @@ -343,7 +351,7 @@ under the License. <!-- The default (global) java scripts --> <!-- jQuery part --> <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.11.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"/> @@ -352,6 +360,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.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.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker-0.9.6/jquery-ui-timepicker-addon.css" global="true"/> <!-- Load available JS Language Files --> <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> Propchange: ofbiz/branches/release11.04/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/framework/images/webapp/images/jquery/plugins/datetimepicker/localization/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: ofbiz/branches/release11.04/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/specialpurpose/ebaystore/lib:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1178203&r1=1178202&r2=1178203&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/release11.04/specialpurpose/ecommerce/widget/CommonScreens.xml Sun Oct 2 16:24:36 2011 @@ -40,7 +40,12 @@ 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="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"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 Propchange: ofbiz/branches/release11.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 2 16:24: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:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:1100197,1100880,1104423,1131144,1131396,1132496,1132749,1134990,1135199,1135686,1135929,1137201,1137433,1137435,1138463,1138485,1139346,1139385,1139504,1139521,1140358,1140362,1140375,1140469,1144537,1144791,1153073,1153768,1158124,1158126,1158608,1159080,1163036,1163093,1163533,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1172213,1172243,1174964,1175130,1175135,1175143,1177128,1178175,1178199 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |