details:   https://code.tryton.org/tryton/commit/c0756ad8f3fa
branch:    default
user:      Cédric Krier <[email protected]>
date:      Thu Jun 25 17:10:23 2026 +0200
description:
        Set back XML record for English with other languages
diffstat:

 trytond/trytond/backend/postgresql/init.sql |   2 +
 trytond/trytond/backend/sqlite/init.sql     |   2 +
 trytond/trytond/convert.py                  |   2 +-
 trytond/trytond/ir/ir.xml                   |  33 -----------------------------
 trytond/trytond/ir/lang.xml                 |  26 ++++++++++++++++++++--
 trytond/trytond/ir/tryton.cfg               |   1 -
 6 files changed, 28 insertions(+), 38 deletions(-)

diffs (120 lines):

diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/backend/postgresql/init.sql
--- a/trytond/trytond/backend/postgresql/init.sql       Thu Jun 25 16:50:42 
2026 +0200
+++ b/trytond/trytond/backend/postgresql/init.sql       Thu Jun 25 17:10:23 
2026 +0200
@@ -102,6 +102,8 @@
     PRIMARY KEY(id)
 );
 
+INSERT INTO ir_lang (name, code, translatable, active, direction) VALUES 
('English', 'en', False, True, 'ltr');
+
 CREATE TABLE res_user (
     id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 2) NOT NULL
         CONSTRAINT res_user_id_positive CHECK(id >= 0),
diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/backend/sqlite/init.sql
--- a/trytond/trytond/backend/sqlite/init.sql   Thu Jun 25 16:50:42 2026 +0200
+++ b/trytond/trytond/backend/sqlite/init.sql   Thu Jun 25 17:10:23 2026 +0200
@@ -83,6 +83,8 @@
     direction VARCHAR NOT NULL
 );
 
+INSERT INTO ir_lang (name, code, translatable, active, direction) VALUES 
('English', 'en', False, True, 'ltr');
+
 CREATE TABLE res_user (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     name VARCHAR,
diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/convert.py
--- a/trytond/trytond/convert.py        Thu Jun 25 16:50:42 2026 +0200
+++ b/trytond/trytond/convert.py        Thu Jun 25 17:10:23 2026 +0200
@@ -566,8 +566,8 @@
                     field_names=(),
                     noupdate=self.noupdate,
                     )
+                mdata.save()
                 self.fs2db.set(module, fs_id, mdata)
-                self.grouped_model_data.add(mdata)
                 exists = True
 
         if exists:
diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/ir/ir.xml
--- a/trytond/trytond/ir/ir.xml Thu Jun 25 16:50:42 2026 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tryton>
-    <data noupdate="1">
-        <!--
-        lang_en is defined here to be in translation lang selection
-        -->
-        <record model="ir.lang" id="lang_en" search="[('code', '=', 'en')]">
-            <field name="code">en</field>
-            <field name="name">English</field>
-            <field name="nplurals" eval="2"/>
-            <field name="plural">n != 1</field>
-            <field name="date">%m/%d/%Y</field>
-            <field name="am">AM</field>
-            <field name="pm">PM</field>
-            <field name="grouping">[3, 3, 0]</field>
-            <field name="decimal_point">.</field>
-            <field name="thousands_sep">,</field>
-            <field name="mon_grouping">[3, 3, 0]</field>
-            <field name="mon_decimal_point">.</field>
-            <field name="mon_thousands_sep">,</field>
-            <field name="p_sign_posn" eval="1"/>
-            <field name="n_sign_posn" eval="1"/>
-            <field name="positive_sign"></field>
-            <field name="negative_sign">-</field>
-            <field name="p_cs_precedes" eval="True"/>
-            <field name="n_cs_precedes" eval="True"/>
-            <field name="p_sep_by_space" eval="False"/>
-            <field name="n_sep_by_space" eval="False"/>
-        </record>
-    </data>
-</tryton>
diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/ir/lang.xml
--- a/trytond/trytond/ir/lang.xml       Thu Jun 25 16:50:42 2026 +0200
+++ b/trytond/trytond/ir/lang.xml       Thu Jun 25 17:10:23 2026 +0200
@@ -102,9 +102,29 @@
             <field name="p_sep_by_space" eval="True"/>
             <field name="n_sep_by_space" eval="True"/>
         </record>
-        <!--
-        lang_en is defined in ir.xml
-        -->
+        <record model="ir.lang" id="lang_en" search="[('code', '=', 'en')]">
+            <field name="code">en</field>
+            <field name="name">English</field>
+            <field name="nplurals" eval="2"/>
+            <field name="plural">n != 1</field>
+            <field name="date">%m/%d/%Y</field>
+            <field name="am">AM</field>
+            <field name="pm">PM</field>
+            <field name="grouping">[3, 3, 0]</field>
+            <field name="decimal_point">.</field>
+            <field name="thousands_sep">,</field>
+            <field name="mon_grouping">[3, 3, 0]</field>
+            <field name="mon_decimal_point">.</field>
+            <field name="mon_thousands_sep">,</field>
+            <field name="p_sign_posn" eval="1"/>
+            <field name="n_sign_posn" eval="1"/>
+            <field name="positive_sign"></field>
+            <field name="negative_sign">-</field>
+            <field name="p_cs_precedes" eval="True"/>
+            <field name="n_cs_precedes" eval="True"/>
+            <field name="p_sep_by_space" eval="False"/>
+            <field name="n_sep_by_space" eval="False"/>
+        </record>
         <record model="ir.lang" id="lang_es" search="[('code', '=', 'es')]">
             <field name="code">es</field>
             <field name="name">Spanish</field>
diff -r 815409359e6a -r c0756ad8f3fa trytond/trytond/ir/tryton.cfg
--- a/trytond/trytond/ir/tryton.cfg     Thu Jun 25 16:50:42 2026 +0200
+++ b/trytond/trytond/ir/tryton.cfg     Thu Jun 25 17:10:23 2026 +0200
@@ -1,6 +1,5 @@
 [tryton]
 xml:
-    ir.xml
     ui/ui.xml
     ui/icon.xml
     ui/menu.xml

Reply via email to