You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Deepak Dixit <de...@hotwaxsystems.com> on 2017/09/23 12:40:17 UTC
Re: svn commit: r1809410 - in /ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbi
z/common: JsLanguageFileMappingCreator.java JsLanguageFilesMapping.java
Thanks Jacques done at r#1809413
Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
www.hotwax.co
On Sat, Sep 23, 2017 at 6:01 PM, Jacques Le Roux <
jacques.le.roux@les7arts.com> wrote:
> Hi Deepak,
>
> As explained in its top
>
> // 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
>
> So maybe you ran this service at some point? because date-en-US.js is the
> default and replace others when missing.
>
> Anyway, I think we should either remove this line or replace it by
>
> localeFiles.put("cs", "/common/js/jquery/plugins/datejs/date-cs-CZ.js");
>
> Jacques
>
>
> Le 23/09/2017 à 14:18, Deepak Dixit a écrit :
>
>> - localeFiles.put("cs", "/common/js/jquery/plugins/
>>>>>
>>>> datejs/date-cs-CZ.js");
>>
>>> + localeFiles.put("cs", "/common/js/jquery/plugins/
>>>>>
>>>> datejs/date-en-US.js");
>>
>> I don't know why this changes took place, I simply run the
>> createJsLanguageFileMapping
>> and committed the code. Interesting we have date-cs-CZ.js in system.
>>
>> Thanks & Regards
>> --
>> Deepak Dixit
>> https://ofbiz.apache.org/
>>
>>
>> On Sat, Sep 23, 2017 at 5:41 PM, <de...@apache.org> wrote:
>>
>> Author: deepak
>>> Date: Sat Sep 23 12:11:31 2017
>>> New Revision: 1809410
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1809410&view=rev
>>> Log:
>>> Fixed: JsLanguageFilesMapping.java location in
>>> createJsLanguageFileMapping
>>> service, and commiting the auto generated java file for language mapping
>>> js.
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
>>> ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>> framework/common/src/main/java/org/apache/ofbiz/common/
>>> JsLanguageFileMappingCreator.java?rev=1809410&r1=1809409&
>>> r2=1809410&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java
>>> (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFileMappingCreator.java Sat Sep
>>> 23
>>> 12:11:31 2017
>>> @@ -180,7 +180,7 @@ public class JsLanguageFileMappingCreato
>>>
>>> // check the template file
>>> String template = "themes/common/template/
>>> JsLanguageFilesMapping.ftl";
>>> - String output = "framework/common/src/org/apache/ofbiz/common/
>>> JsLanguageFilesMapping.java";
>>> + String output = "framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFilesMapping.java";
>>> Map<String, Object> mapWrapper = new HashMap<String, Object>();
>>> mapWrapper.put("datejs", dateJsLocaleFile);
>>> mapWrapper.put("jquery", jQueryLocaleFile);
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFilesMapping.java
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>> framework/common/src/main/java/org/apache/ofbiz/common/
>>> JsLanguageFilesMapping.java?rev=1809410&r1=1809409&r2=1809410&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFilesMapping.java (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/
>>> java/org/apache/ofbiz/common/JsLanguageFilesMapping.java Sat Sep 23
>>> 12:11:31 2017
>>> @@ -68,7 +68,7 @@ public final class JsLanguageFilesMappin
>>> localeFiles.put("zh_TW", "/common/js/jquery/plugins/
>>> datejs/date-zh-TW.js");
>>> localeFiles.put("hr", "/common/js/jquery/plugins/
>>> datejs/date-hr-HR.js");
>>> localeFiles.put("hr_HR", "/common/js/jquery/plugins/
>>> datejs/date-hr-HR.js");
>>> - localeFiles.put("cs", "/common/js/jquery/plugins/
>>> datejs/date-cs-CZ.js");
>>> + localeFiles.put("cs", "/common/js/jquery/plugins/
>>> datejs/date-en-US.js");
>>> localeFiles.put("cs_CZ", "/common/js/jquery/plugins/
>>> datejs/date-cs-CZ.js");
>>> localeFiles.put("da", "/common/js/jquery/plugins/
>>> datejs/date-da-DA.js");
>>> localeFiles.put("da_DK", "/common/js/jquery/plugins/
>>> datejs/date-da-DK.js");
>>> @@ -556,7 +556,7 @@ public final class JsLanguageFilesMappin
>>>
>>> public static class dateTime {
>>> private static Map<String, String> localeFiles = new
>>> HashMap<String, String>();
>>> - private static String defaultDateTime =
>>> "/images/webapp/common/js/
>>> jquery/ui/i18n/jquery.ui.datepicker-en.js";
>>> + private static String defaultDateTime =
>>> "/common/js/jquery/ui/i18n/jquery.ui.datepicker-en.js";
>>>
>>> static {
>>> localeFiles.put("sq", "/common/js/jquery/plugins/
>>> datetimepicker/localization/jquery-ui-timepicker-en.js");
>>>
>>>
>>>
>>>
>