# HG changeset patch # User Adrián Romero # Date 1452869932 -3600 # Fri Jan 15 15:58:52 2016 +0100 # Node ID 324681154a9e624ae61490c6bc04be0b94122cad # Parent 735b0063dcbb95dfdb0faef42e7b659944148206 Fixes issue 0031909: Does not exist translation for localized months, week days to be used to display dates * Adds localization strings for dates literals: Months, week days, and order of fields. * Adds utilities to read these literals * Overwrites enyo component to use these literals in DatePicker diff --git a/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java b/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java --- a/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java +++ b/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java @@ -83,6 +83,7 @@ jsDependency.add("data/ob-dal"); jsDependency.add("data/ob-model"); jsDependency.add("data/ob-windowmodel"); + jsDependency.add("component/ob-dateformat"); jsDependency.add("component/ob-terminal-component"); jsDependency.add("model/ob-router"); jsDependency.add("model/ob-terminal-model"); diff --git a/web/org.openbravo.mobile.core/source/component/ob-dateformat.js b/web/org.openbravo.mobile.core/source/component/ob-dateformat.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.mobile.core/source/component/ob-dateformat.js @@ -0,0 +1,29 @@ +/* + ************************************************************************************ + * Copyright (C) 2016 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global enyo, Backbone, */ + + +// This definition overwrites the enyo component 'enyo.g11n.Fmts' used for example in onyx.DatePicker +// This way localization is defined in Openbravo +enyo.kind({ + name: 'enyo.g11n.Fmts', + + getMonthFields: function () { + return OB.I18N.getMonthsShortList(); + }, + + getDateFieldOrder: function () { + return OB.I18N.getLabel('OBMOBC_Date_enyo_date_order'); + }, + + getTimeFieldOrder: function () { + return OB.I18N.getLabel('OBMOBC_Date_enyo_time_order'); + } +}); \ No newline at end of file diff --git a/web/org.openbravo.mobile.core/source/utils/ob-i18n.js b/web/org.openbravo.mobile.core/source/utils/ob-i18n.js --- a/web/org.openbravo.mobile.core/source/utils/ob-i18n.js +++ b/web/org.openbravo.mobile.core/source/utils/ob-i18n.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2013 Openbravo S.L.U. + * Copyright (C) 2012-2016 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -240,4 +240,58 @@ } return label; }; + + OB.I18N.lists = {}; + + OB.I18N.getLocalizedList = function (listname) { + if (!OB.I18N.lists[listname]) { + OB.I18N.lists[listname] = OB.I18N.getLabel(listname).split('_'); + } + return OB.I18N.lists[listname]; + }; + + OB.I18N.getLocalizedListElement = function (listname, i) { + return OB.I18N.getLocalizedList(listname)[i]; + }; + + OB.I18N.getMonthsList = function () { + return OB.I18N.getLocalizedList('OBMOBC_Date_Months'); + }; + + OB.I18N.getMonth = function (i) { // Starts with January + return OB.I18N.getLocalizedListElement('OBMOBC_Date_Months', i); + }; + + OB.I18N.getMonthsShortList = function () { + return OB.I18N.getLocalizedList('OBMOBC_Date_Months_Short'); + }; + + OB.I18N.getMonthShort = function (i) { // Starts with Jan + return OB.I18N.getLocalizedListElement('OBMOBC_Date_Months_Short', i); + }; + + OB.I18N.getWeekdaysList = function () { + return OB.I18N.getLocalizedList('OBMOBC_Date_Weekdays'); + }; + + OB.I18N.getWeekday = function (i) { // Starts with Sunday + return OB.I18N.getLocalizedListElement('OBMOBC_Date_Weekdays', i); + }; + + OB.I18N.getWeekdaysShortList = function () { + return OB.I18N.getLocalizedList('OBMOBC_Date_Weekdays_Short'); + }; + + OB.I18N.getWeekdayShort = function (i) { // Starts with Sun + return OB.I18N.getLocalizedListElement('OBMOBC_Date_Weekdays_Short', i); + }; + + OB.I18N.getWeekdaysMinList = function () { + return OB.I18N.getLocalizedList('OBMOBC_Date_Weekdays_Min'); + }; + + OB.I18N.getWeekdayMin = function (i) { // Starts with Su + return OB.I18N.getLocalizedListElement('OBMOBC_Date_Weekdays_Min', i); + }; + }()); \ No newline at end of file # HG changeset patch # User Adrián Romero # Date 1452870693 -3600 # Fri Jan 15 16:11:33 2016 +0100 # Node ID 630a2dab5fb840053131389a56cff51e250e527f # Parent 324681154a9e624ae61490c6bc04be0b94122cad Fixes issue 0031909: Does not exist translation for localized months, week days to be used to display dates * Adds missing localization strings diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -145,6 +145,19 @@ + + + + + + + + + + + + + @@ -385,6 +398,19 @@ + + + + + + + + + + + + + @@ -1165,6 +1191,19 @@ + + + + + + + + + + + + + @@ -1333,6 +1372,19 @@ + + + + + + + + + + + + + @@ -1381,6 +1433,19 @@ + + + + + + + + + + + + + @@ -1417,6 +1482,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +