Reviewers: ,
Please review this at http://codereview.tryton.org/200001/
Affected files:
M account.py
M move.py
M tax.py
Index: account.py
===================================================================
--- a/account.py
+++ b/account.py
@@ -10,6 +10,7 @@
from trytond.pyson import Eval, PYSONEncoder, Date
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.config import CONFIG
class TypeTemplate(ModelSQL, ModelView):
@@ -114,7 +115,7 @@
new_id = type_obj.create(vals)
- prev_lang = template._context.get('language') or 'en_US'
+ prev_lang = template._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -279,7 +280,7 @@
if vals:
self.write(type.id, vals)
- prev_lang = type._context.get('language') or 'en_US'
+ prev_lang = type._context.get('language') or CONFIG['language']
prev_data = {}
for field_name, field in type.template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -440,7 +441,7 @@
new_id = account_obj.create(vals)
- prev_lang = template._context.get('language') or 'en_US'
+ prev_lang = template._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -914,7 +915,7 @@
if vals:
self.write(account.id, vals)
- prev_lang = account._context.get('language') or 'en_US'
+ prev_lang = account._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in account.template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -1496,13 +1497,10 @@
lang_obj = pool.get('ir.lang')
company = company_obj.browse(datas['form']['company'])
- for code in [Transaction().language, 'en_US']:
- lang_ids = lang_obj.search([
- ('code', '=', code),
+ lang_id, = lang_obj.search([
+ ('code', '=', Transaction().language),
])
- if lang_ids:
- break
- lang = lang_obj.browse(lang_ids[0])
+ lang = lang_obj.browse(lang_id)
date = lang_obj.strftime(datas['form']['date'], lang.code,
lang.date)
@@ -1735,7 +1733,7 @@
tax_rule_line_template_obj = \
pool.get('account.tax.rule.line.template')
- with Transaction().set_context(language='en_US'):
+ with Transaction().set_context(language=CONFIG['language']):
account_template = account_template_obj.browse(
datas['form']['account_template'])
Index: move.py
===================================================================
--- a/move.py
+++ b/move.py
@@ -15,6 +15,7 @@
from trytond.pyson import Eval, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool
+from trytond.config import CONFIG
_MOVE_STATES = {
'readonly': Eval('state') == 'posted',
@@ -1249,10 +1250,10 @@
account = line.account
amount = currency_obj.round(account.currency, amount)
period_id = period_obj.find(account.company.id, date=date)
- lang_code = 'en_US'
+ lang_code = CONFIG['language']
if account.company.lang:
lang_code = account.company.lang.code
- writeoff = translation_obj._get_source(
+ writeoff = translation_obj.get_source(
'account.move.reconcile_lines.writeoff', 'view',
lang_code,
'Write-Off') or 'Write-Off'
move_id = move_obj.create({
Index: tax.py
===================================================================
--- a/tax.py
+++ b/tax.py
@@ -8,6 +8,7 @@
from trytond.transaction import Transaction
from trytond.cache import Cache
from trytond.pool import Pool
+from trytond.config import CONFIG
class Group(ModelSQL, ModelView):
@@ -104,7 +105,7 @@
new_id = tax_code_obj.create(vals)
- prev_lang = template._context.get('language') or 'en_US'
+ prev_lang = template._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -274,7 +275,7 @@
if vals:
self.write(code.id, vals)
- prev_lang = code._context.get('language') or 'en_US'
+ prev_lang = code._context.get('language') or CONFIG['language']
prev_data = {}
for field_name, field in code.template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -523,7 +524,7 @@
new_id = tax_obj.create(vals)
- prev_lang = template._context.get('language') or 'en_US'
+ prev_lang = template._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -871,7 +872,7 @@
if vals:
self.write(tax.id, vals)
- prev_lang = tax._context.get('language') or 'en_US'
+ prev_lang = tax._context.get('language') or CONFIG['language']
prev_data = {}
for field_name, field in tax.template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -988,7 +989,7 @@
vals['company'] = company_id
new_id = rule_obj.create(vals)
- prev_lang = template._context.get('language') or 'en_US'
+ prev_lang = template._context.get('language') or
CONFIG['language']
prev_data = {}
for field_name, field in template._columns.iteritems():
if getattr(field, 'translate', False):
@@ -1078,7 +1079,7 @@
if vals:
self.write(rule.id, vals)
- prev_lang = rule._context.get('language') or 'en_US'
+ prev_lang = rule._context.get('language') or CONFIG['language']
prev_data = {}
for field_name, field in rule.template._columns.iteritems():
if getattr(field, 'translate', False):
--
[email protected] mailing list
