Skip to content

Commit

Permalink
[IMP] base: Remove translatable field of res.lang
Browse files Browse the repository at this point in the history
The technical field `translatable` of a res.lang has become useless

closes #34895

Signed-off-by: Romain Libert (rli) <rli@odoo.com>
  • Loading branch information
jbm-odoo authored and RomainLibert committed Jul 22, 2019
1 parent 5a6a414 commit 2c558eb
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 94 deletions.
166 changes: 83 additions & 83 deletions odoo/addons/base/data/res.lang.csv

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion odoo/addons/base/models/ir_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ def _update_category(self, category='Uncategorized'):

def _update_translations(self, filter_lang=None):
if not filter_lang:
langs = self.env['res.lang'].search([('translatable', '=', True)])
langs = self.env['res.lang'].search([])
filter_lang = [lang.code for lang in langs]
elif not isinstance(filter_lang, (list, tuple)):
filter_lang = [filter_lang]
Expand Down
6 changes: 3 additions & 3 deletions odoo/addons/base/models/ir_translation.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class IrTranslation(models.Model):

@api.model
def _get_languages(self):
langs = self.env['res.lang'].search([('translatable', '=', True)])
langs = self.env['res.lang'].search([])
return [(lang.code, lang.name) for lang in langs]

@api.depends('type', 'name', 'res_id')
Expand Down Expand Up @@ -592,7 +592,7 @@ def insert_missing(self, field, records):
query = """ INSERT INTO ir_translation (lang, type, name, res_id, src, value, module, state)
SELECT l.code, 'model_terms', %(name)s, %(res_id)s, %(src)s, %(src)s, %(module)s, 'to_translate'
FROM res_lang l
WHERE l.active AND l.translatable AND NOT EXISTS (
WHERE l.active AND NOT EXISTS (
SELECT 1 FROM ir_translation
WHERE lang=l.code AND type='model' AND name=%(name)s AND res_id=%(res_id)s AND src=%(src)s
)
Expand All @@ -613,7 +613,7 @@ def insert_missing(self, field, records):
query = """ INSERT INTO ir_translation (lang, type, name, res_id, src, value, module, state)
SELECT l.code, 'model', %(name)s, %(res_id)s, %(src)s, %(src)s, %(module)s, 'to_translate'
FROM res_lang l
WHERE l.active AND l.translatable AND NOT EXISTS (
WHERE l.active AND NOT EXISTS (
SELECT 1 FROM ir_translation
WHERE lang=l.code AND type='model' AND name=%(name)s AND res_id=%(res_id)s
);
Expand Down
2 changes: 0 additions & 2 deletions odoo/addons/base/models/res_lang.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Lang(models.Model):
name = fields.Char(required=True)
code = fields.Char(string='Locale Code', required=True, help='This field is used to set/get locales for user')
iso_code = fields.Char(string='ISO code', help='This ISO code is the name of po files to use for translations')
translatable = fields.Boolean()
active = fields.Boolean()
direction = fields.Selection([('ltr', 'Left-to-Right'), ('rtl', 'Right-to-Left')], required=True, default='ltr')
date_format = fields.Char(string='Date Format', required=True, default=DEFAULT_DATE_FORMAT)
Expand Down Expand Up @@ -141,7 +140,6 @@ def fix_datetime_format(format):
'iso_code': iso_lang,
'name': lang_name,
'active': True,
'translatable': True,
'date_format' : fix_datetime_format(locale.nl_langinfo(locale.D_FMT)),
'time_format' : fix_datetime_format(locale.nl_langinfo(locale.T_FMT)),
'decimal_point' : fix_xa0(str(conv['decimal_point'])),
Expand Down
3 changes: 0 additions & 3 deletions odoo/addons/base/views/res_lang_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<field name="code" groups="base.group_no_one"/>
<field name="iso_code" groups="base.group_no_one"/>
<field name="direction" groups="base.group_no_one"/>
<field name="translatable" groups="base.group_no_one"/>
<field name="active"/>
<button name="%(base.action_view_base_language_install)d"
string="Activate Language and Update Translations"
Expand Down Expand Up @@ -41,7 +40,6 @@
<field name="code"/>
<field name="iso_code"/>
<field name="active"/>
<field name="translatable"/>
</group>
<group>
<field name="direction"/>
Expand Down Expand Up @@ -93,7 +91,6 @@
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
string="Language"/>
<filter string="Translatable" name="translatable" domain="[('translatable','=',True)]"/>
<filter string="Active" name="active" domain="[('active','=',True)]"/>
<field name="direction"/>
</search>
Expand Down
2 changes: 1 addition & 1 deletion odoo/addons/base/wizard/base_export_language.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class BaseLanguageExport(models.TransientModel):

@api.model
def _get_languages(self):
langs = self.env['res.lang'].search([('translatable', '=', True)])
langs = self.env['res.lang'].search([])
return [(NEW_LANG_KEY, _('New Language (Empty translation template)'))] + \
[(lang.code, lang.name) for lang in langs]

Expand Down
2 changes: 1 addition & 1 deletion odoo/addons/base/wizard/base_update_translations.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BaseUpdateTranslations(models.TransientModel):

@api.model
def _get_languages(self):
langs = self.env['res.lang'].search([('active', '=', True), ('translatable', '=', True)])
langs = self.env['res.lang'].search([('active', '=', True)])
return [(lang.code, lang.name) for lang in langs]


Expand Down

0 comments on commit 2c558eb

Please sign in to comment.