Odoo Addons (MOVED TO GITHUB)

Merge lp:~akretion-team/openobject-addons/7.0-fix-1207782 into lp:openobject-addons/7.0

  1. 7.0-fix-1207782
  2. Merge into 7.0
Proposed by Raphaël Valyi - http://www.akretion.com
Status: Needs review
Proposed branch: lp:~akretion-team/openobject-addons/7.0-fix-1207782
Merge into: lp:openobject-addons/7.0
Diff against target: 38 lines (+0/-6)
3 files modified
portal_hr_employees/i18n/es.po (+0/-2)
portal_hr_employees/i18n/nl.po (+0/-2)
portal_hr_employees/i18n/pt_BR.po (+0/-2)
To merge this branch: bzr merge lp:~akretion-team/openobject-addons/7.0-fix-1207782
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+188175@code.launchpad.net

Description of the change

This fixes bug https://bugs.launchpad.net/openobject-addons/+bug/1207782
by eliminating the javascript that was translated by mistake in es, nl and pt_BR locales.

Not that this is still a bug that the server includes that javascript key in the translation template for translation. But if you don't translate it at least it doesn't break anymore.

To post a comment you must log in.

Unmerged revisions

9484. By Raphaël Valyi - http://www.akretion.com

[FIX][portal_hr_employees] fixed a javascript bug with es, nl and pt_BR locales because the Javascript code was translated (Sighhh...)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'portal_hr_employees/i18n/es.po'
2--- portal_hr_employees/i18n/es.po 2013-07-11 06:26:22 +0000
3+++ portal_hr_employees/i18n/es.po 2013-09-27 21:47:08 +0000
4@@ -112,8 +112,6 @@
5 "$('.oe_employee_picture').load(function() { if($(this).width() > "
6 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
7 msgstr ""
8-"$('.oe_employee_picture').load(function() { if($(this).width() > "
9-"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
10
11 #. module: portal_hr_employees
12 #: view:hr.employee:0
13
14=== modified file 'portal_hr_employees/i18n/nl.po'
15--- portal_hr_employees/i18n/nl.po 2013-07-11 06:26:22 +0000
16+++ portal_hr_employees/i18n/nl.po 2013-09-27 21:47:08 +0000
17@@ -112,8 +112,6 @@
18 "$('.oe_employee_picture').load(function() { if($(this).width() > "
19 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
20 msgstr ""
21-"$('.oe_employee_picture').load(function() { if($(this).width() > "
22-"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
23
24 #. module: portal_hr_employees
25 #: view:hr.employee:0
26
27=== modified file 'portal_hr_employees/i18n/pt_BR.po'
28--- portal_hr_employees/i18n/pt_BR.po 2013-07-19 06:36:47 +0000
29+++ portal_hr_employees/i18n/pt_BR.po 2013-09-27 21:47:08 +0000
30@@ -110,8 +110,6 @@
31 "$('.oe_employee_picture').load(function() { if($(this).width() > "
32 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
33 msgstr ""
34-"$ ('Oe_employee_picture.) Load (function () {if ($ (this) largura ()> $ "
35-"(this) height ()) {$ (this) addClass (' oe_employee_picture_wide ')}...}).;"
36
37 #. module: portal_hr_employees
38 #: view:hr.employee:0