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
=== modified file 'portal_hr_employees/i18n/es.po'
--- portal_hr_employees/i18n/es.po 2013-07-11 06:26:22 +0000
+++ portal_hr_employees/i18n/es.po 2013-09-27 21:47:08 +0000
@@ -112,8 +112,6 @@
112"$('.oe_employee_picture').load(function() { if($(this).width() > "112"$('.oe_employee_picture').load(function() { if($(this).width() > "
113"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"113"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
114msgstr ""114msgstr ""
115"$('.oe_employee_picture').load(function() { if($(this).width() > "
116"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
117115
118#. module: portal_hr_employees116#. module: portal_hr_employees
119#: view:hr.employee:0117#: view:hr.employee:0
120118
=== modified file 'portal_hr_employees/i18n/nl.po'
--- portal_hr_employees/i18n/nl.po 2013-07-11 06:26:22 +0000
+++ portal_hr_employees/i18n/nl.po 2013-09-27 21:47:08 +0000
@@ -112,8 +112,6 @@
112"$('.oe_employee_picture').load(function() { if($(this).width() > "112"$('.oe_employee_picture').load(function() { if($(this).width() > "
113"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"113"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
114msgstr ""114msgstr ""
115"$('.oe_employee_picture').load(function() { if($(this).width() > "
116"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
117115
118#. module: portal_hr_employees116#. module: portal_hr_employees
119#: view:hr.employee:0117#: view:hr.employee:0
120118
=== modified file 'portal_hr_employees/i18n/pt_BR.po'
--- portal_hr_employees/i18n/pt_BR.po 2013-07-19 06:36:47 +0000
+++ portal_hr_employees/i18n/pt_BR.po 2013-09-27 21:47:08 +0000
@@ -110,8 +110,6 @@
110"$('.oe_employee_picture').load(function() { if($(this).width() > "110"$('.oe_employee_picture').load(function() { if($(this).width() > "
111"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"111"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
112msgstr ""112msgstr ""
113"$ ('Oe_employee_picture.) Load (function () {if ($ (this) largura ()> $ "
114"(this) height ()) {$ (this) addClass (' oe_employee_picture_wide ')}...}).;"
115113
116#. module: portal_hr_employees114#. module: portal_hr_employees
117#: view:hr.employee:0115#: view:hr.employee:0