Merge lp:~openerp-dev/openerp-web/7.0-opw-585320-msh into lp:openerp-web/7.0

Proposed by Mohammed Shekha(Open ERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 3746
Merged at revision: 3857
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-585320-msh
Merge into: lp:openerp-web/7.0
Diff against target: 47 lines (+37/-0)
1 file modified
addons/web/static/src/js/view_form.js (+37/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-585320-msh
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+147026@code.launchpad.net

Description of the change

Hello,

Fixed the issue of translation for jquery datetime picker.

Demo :- Open jQuery Datetime picker in any other language you will see terms Months, Done, Today etc not going to translated.

This branch will set regional information jQuery datetime picker.

Thanks.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

The same patch was already merged at revision 3857 for fixing bug 1101072. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2013-02-05 17:05:56 +0000
+++ addons/web/static/src/js/view_form.js 2013-02-07 06:58:21 +0000
@@ -2384,6 +2384,43 @@
2384 this.$input = this.$el.find('input.oe_datepicker_master');2384 this.$input = this.$el.find('input.oe_datepicker_master');
2385 this.$input_picker = this.$el.find('input.oe_datepicker_container');2385 this.$input_picker = this.$el.find('input.oe_datepicker_container');
23862386
2387 $.datepicker.setDefaults({
2388 clearText: _t("Clear"),
2389 clearStatus: _t("Erase the current date"),
2390 closeText: _t("Done"),
2391 closeStatus: _t("Close without change"),
2392 prevText: _t("<Prev"),
2393 prevStatus: _t("Show the previous month"),
2394 nextText: _t("Next>"),
2395 nextStatus: _t("Show the next month"),
2396 currentText: _t("Today"),
2397 currentStatus: _t("Show the current month"),
2398 monthNames: Date.CultureInfo.monthNames,
2399 monthNamesShort: Date.CultureInfo.abbreviatedMonthNames,
2400 monthStatus: _t("Show a different month"),
2401 yearStatus: _t("Show a different year"),
2402 weekHeader: _t("Wk"),
2403 weekStatus: _t("Week of the year"),
2404 dayNames: Date.CultureInfo.dayNames,
2405 dayNamesShort: Date.CultureInfo.abbreviatedDayNames,
2406 dayNamesMin: Date.CultureInfo.shortestDayNames,
2407 dayStatus: _t("Set DD as first week day"),
2408 dateStatus: _t("Select D, M d"),
2409 firstDay: Date.CultureInfo.firstDayOfWeek,
2410 initStatus: _t("Select a date"),
2411 isRTL: false
2412 });
2413
2414 $.timepicker.setDefaults({
2415 timeOnlyTitle: _t("Choose Time"),
2416 timeText: _t("Time"),
2417 hourText: _t("Hour"),
2418 minuteText: _t("Minute"),
2419 secondText: _t("Second"),
2420 currentText: _t("Now"),
2421 closeText: _t("Done")
2422 });
2423
2387 this.picker({2424 this.picker({
2388 onClose: this.on_picker_select,2425 onClose: this.on_picker_select,
2389 onSelect: this.on_picker_select,2426 onSelect: this.on_picker_select,