tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Fix translation of global messages for issue240

Browse Source
This commit is contained in:
Cédric Krier committed 2008-08-09 15:22:23 +02:00
1 parent 6afd23de0c
commit bfb2cce636
2 files changed
+14 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

trytond/ir/translation.xml
+6 -3
View File
@@ -69,26 +69,29 @@
action="act_translation_form" id="menu_translation_form"/>
<record model="ir.translation" id="translation_delete_xml_record">
<field name="name">None</field>
<field name="name">delete_xml_record</field>
<field name="lang">en_US</field>
<field name="type">error</field>
<field name="src">You are not allowed to delete this record.</field>
<field name="value">You are not allowed to delete this record.</field>
<field name="module">ir</field>
<field name="fuzzy" eval="False"/>
</record>
<record model="ir.translation" id="translation_xml_record_desc">
<field name="name">None</field>
<field name="name">xml_record_desc</field>
<field name="lang">en_US</field>
<field name="type">error</field>
<field name="src">This record is part of the base configuration.</field>
<field name="value">This record is part of the base configuration.</field>
<field name="module">ir</field>
<field name="fuzzy" eval="False"/>
</record>
<record model="ir.translation" id="translation_write_xml_record">
<field name="name">None</field>
<field name="name">write_xml_record</field>
<field name="lang">en_US</field>
<field name="type">error</field>
<field name="src">You are not allowed to modify this record.</field>
<field name="value">You are not allowed to modify this record.</field>
<field name="module">ir</field>
<field name="fuzzy" eval="False"/>
</record>
trytond/osv/orm.py
+8
View File
@@ -626,6 +626,10 @@ class ORM(object):
res = translation_obj._get_source(cursor, self._name, 'error',
context.get('language', 'en_US'), error)
if not res:
res = translation_obj._get_source(cursor, error, 'error',
context.get('language', 'en_US'))
if res:
error = res
@@ -638,6 +642,10 @@ class ORM(object):
res = translation_obj._get_source(cursor, self._name, 'error',
context.get('language', 'en_US'), error_description)
if not res:
res = translation_obj._get_source(cursor, error_description,
'error', context.get('language', 'en_US'))
if res:
error_description = res