savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #01035
[Merge] lp:~savoirfairelinux-openerp/openobject-server/7.0_mail_thread_translate_bug1262000 into lp:openobject-server
Sandy Carter (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/openobject-server/7.0_mail_thread_translate_bug1262000 into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1262000 in OpenERP Addons: "[trunk/7.0]OE chatter's doesn't translate created objects in mail_thread widget"
https://bugs.launchpad.net/openobject-addons/+bug/1262000
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-server/7.0_mail_thread_translate_bug1262000/+merge/208804
Related to https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/7.0_mail_thread_translate_bug1262000/+merge/199374
Makes it so model descriptions are translated and chatter_widget can display the model in the proper language.
--
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-server/7.0_mail_thread_translate_bug1262000/+merge/208804
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openobject-server/7.0_mail_thread_translate_bug1262000.
=== modified file 'openerp/addons/base/i18n/fi.po'
--- openerp/addons/base/i18n/fi.po 2014-02-22 06:38:56 +0000
+++ openerp/addons/base/i18n/fi.po 2014-02-28 13:57:16 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-08-20 15:42+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2014-02-25 20:15+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+"Language-Team: Finnish <fi@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n"
"X-Generator: Launchpad (build 16926)\n"
+=======
+"X-Launchpad-Export-Date: 2014-02-26 07:30+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -405,6 +419,13 @@
"invoices from picking, OpenERP is able to add and compute the shipping "
"line.\n"
msgstr ""
+"\n"
+"Sallii toimitustapojen lisäämisen myyntitilauksille ja keräilyyn. \n"
+"==============================================================\n"
+"\n"
+"Voit määritellä oman huolitsijan ja toimitustaulukon hinnoille. Kun laskut "
+"luodaan \n"
+"keräilyssä, OpenERP lisää lähetysrivit ja laskee nille hinnat.\n"
#. module: base
#: code:addons/base/ir/ir_filters.py:80
@@ -550,7 +571,7 @@
#. module: base
#: view:workflow.transition:0
msgid "Workflow Transition"
-msgstr ""
+msgstr "Työnkulun eteneminen"
#. module: base
#: model:res.country,name:base.gf
@@ -599,6 +620,20 @@
"* Use emails to automatically confirm and send acknowledgements for any "
"event registration\n"
msgstr ""
+"\n"
+"Tapahtumien organisointi ja hallinta.\n"
+"====================================\n"
+"\n"
+"Tapahtumamoduuli mahdollistaa tehokkaan tapahtumien organisoinnin ja niihin "
+"liittyvien \n"
+"töiden hallinnan: suunnittelun, rekisteröintien seurannan, osallistumisen "
+"jne. \n"
+"\n"
+"Pääominaisuudet\n"
+"------------\n"
+"* Hallitse tapahtumia ja rekisteröintejä\n"
+"* Käytä sähköpostia automatisoimaan vahvistuksia ja lähettämään kuittaus "
+"jokaisesta rekisteröitymisestä.\n"
#. module: base
#: selection:base.language.install,lang:0
@@ -1616,6 +1651,11 @@
"=============\n"
" "
msgstr ""
+"\n"
+"Tämä moduuli lisää palautevalikon ja toimii jos Palauteportaali on "
+"asennettu. \n"
+"=======================================================================\n"
+" "
#. module: base
#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
@@ -1815,7 +1855,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_project_issue
msgid "Portal Issue"
-msgstr "Porttaaliongelma"
+msgstr "Portaaliongelma"
#. module: base
#: model:ir.ui.menu,name:base.menu_tools
@@ -1950,7 +1990,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_event
msgid "Portal Event"
-msgstr "Porttaalitapahtuma"
+msgstr "Portaalitapahtuma"
#. module: base
#: selection:ir.translation,state:0
@@ -6164,7 +6204,7 @@
#: view:ir.module.module:0
#: model:ir.ui.menu,name:base.module_mi
msgid "Apps"
-msgstr "Sovellukset"
+msgstr "Sovelluskauppa"
#. module: base
#: view:ir.ui.view_sc:0
@@ -7726,7 +7766,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_anonymous
msgid "Anonymous portal"
-msgstr "Yleinen porttaali"
+msgstr "Anonyymiportaali"
#. module: base
#: field:base.language.export,format:0
@@ -7784,7 +7824,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_claim
msgid "Portal Claim"
-msgstr "Reklmaatioporttaali"
+msgstr "Palauteportaali"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_pe
@@ -8029,7 +8069,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_project
msgid "Portal Project"
-msgstr "Porttaaliprojekti"
+msgstr "Portaaliprojekti"
#. module: base
#: model:res.country,name:base.cc
@@ -8538,7 +8578,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_sale
msgid "Portal Sale"
-msgstr "Myyntiporttaali"
+msgstr "Myyntiportaali"
#. module: base
#: field:ir.default,ref_id:0
@@ -8814,7 +8854,7 @@
#. module: base
#: model:ir.ui.menu,name:base.menu_view_base_module_update
msgid "Update Modules List"
-msgstr "Päivitä lista moduuleista"
+msgstr "Päivitä moduulilista"
#. module: base
#: code:addons/base/module/module.py:359
@@ -10021,7 +10061,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
msgid "Contracts Management: hr_expense link"
-msgstr "Sopimushallint: hr_expense link"
+msgstr "Sopimushallinat: hr_expense link"
#. module: base
#: view:ir.attachment:0
@@ -10283,7 +10323,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_stock
msgid "Portal Stock"
-msgstr "Porttaalivarasto"
+msgstr "Portaalivarasto"
#. module: base
#: field:workflow.activity,kind:0
@@ -10351,7 +10391,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
msgid "Contracts Management"
-msgstr "Sopimustenhallinta"
+msgstr "Sopimushallinta"
#. module: base
#: selection:base.language.install,lang:0
@@ -10455,7 +10495,7 @@
#: model:ir.module.category,name:base.module_category_portal
#: model:ir.module.module,shortdesc:base.module_portal
msgid "Portal"
-msgstr "Porttaali"
+msgstr "Portaali"
#. module: base
#: selection:ir.translation,state:0
@@ -10656,7 +10696,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_hr_employees
msgid "Portal HR employees"
-msgstr "Henkilöstöhallinnon työntekijäporttaali"
+msgstr "Henkilöstöhallinnon työntekijäportaali"
#. module: base
#: selection:base.language.install,lang:0
@@ -12595,7 +12635,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_crm
msgid "Portal CRM"
-msgstr "CRM-porttaali"
+msgstr "CRM-portaali"
#. module: base
#: model:ir.ui.menu,name:base.next_id_4
@@ -14878,7 +14918,7 @@
#. module: base
#: model:ir.ui.menu,name:base.menu_aftersale
msgid "After-Sale Services"
-msgstr "Jälkimarkkinapalvelut"
+msgstr "Asiakaspalvelut"
#. module: base
#: field:base.language.import,code:0
@@ -15623,7 +15663,7 @@
#: model:ir.actions.act_window,name:base.open_module_tree
#: model:ir.ui.menu,name:base.menu_module_tree
msgid "Installed Modules"
-msgstr "Asennetut moduulit"
+msgstr "Asenna moduulit"
#. module: base
#: code:addons/base/res/res_users.py:170
=== modified file 'openerp/addons/base/i18n/ja.po'
--- openerp/addons/base/i18n/ja.po 2014-02-22 06:38:56 +0000
+++ openerp/addons/base/i18n/ja.po 2014-02-28 13:57:16 +0000
@@ -7,15 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-09-20 05:23+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2014-02-25 09:21+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Japanese <ja@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n"
"X-Generator: Launchpad (build 16926)\n"
+=======
+"X-Launchpad-Export-Date: 2014-02-26 07:30+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -3262,7 +3273,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_hr_evaluation
msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "定期評価、査定、調査"
#. module: base
#: model:ir.actions.act_window,name:base.ir_property_form
@@ -5588,7 +5599,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_mrp
msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr ""
+msgstr "製造オーダ、部品表、工順"
#. module: base
#: field:ir.attachment,name:0
@@ -7954,7 +7965,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_account_accountant
msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "財務会計、分析会計"
#. module: base
#: model:ir.module.module,shortdesc:base.module_portal_project
@@ -8248,7 +8259,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_hr_recruitment
msgid "Jobs, Recruitment, Applications, Job Interviews"
-msgstr ""
+msgstr "仕事、求人、応募、面接"
#. module: base
#: code:addons/base/module/module.py:539
@@ -8657,7 +8668,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_note
msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "付箋、コラボレーション、メモ"
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr_attendance
@@ -9991,7 +10002,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_hr_holidays
msgid "Holidays, Allocation and Leave Requests"
-msgstr ""
+msgstr "休暇割当、申請・承認"
#. module: base
#: model:ir.module.module,description:base.module_web_hello
@@ -12898,7 +12909,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_stock
msgid "Inventory, Logistic, Storage"
-msgstr ""
+msgstr "在庫、経路、保管場所"
#. module: base
#: view:ir.actions.act_window:0
@@ -14676,7 +14687,7 @@
#. module: base
#: model:ir.module.module,summary:base.module_purchase
msgid "Purchase Orders, Receptions, Supplier Invoices"
-msgstr ""
+msgstr "発注、入荷、仕入先請求"
#. module: base
#: model:ir.module.module,description:base.module_hr_payroll
=== modified file 'openerp/addons/base/i18n/ro.po'
--- openerp/addons/base/i18n/ro.po 2014-02-22 06:38:56 +0000
+++ openerp/addons/base/i18n/ro.po 2014-02-28 13:57:16 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-01-05 18:18+0000\n"
"Last-Translator: ERPSystems.ro <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
+"PO-Revision-Date: 2014-02-22 05:51+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+"Language-Team: Romanian <ro@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n"
"X-Generator: Launchpad (build 16926)\n"
+=======
+"X-Launchpad-Export-Date: 2014-02-23 07:44+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+>>>>>>> MERGE-SOURCE
#. module: base
#: model:ir.module.module,description:base.module_account_check_writing
@@ -465,6 +479,14 @@
msgstr "Limită de credit"
#. module: base
+<<<<<<< TREE
+=======
+#: model:ir.module.module,shortdesc:base.module_portal_project_long_term
+msgid "Portal Project Long Term"
+msgstr "Portal proiect termen lung"
+
+#. module: base
+>>>>>>> MERGE-SOURCE
#: field:ir.model.constraint,date_update:0
#: field:ir.model.data,date_update:0
#: field:ir.model.relation,date_update:0
=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py 2014-01-29 17:29:49 +0000
+++ openerp/addons/base/ir/ir_model.py 2014-02-28 13:57:16 +0000
@@ -33,7 +33,7 @@
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools import config
from openerp.tools.translate import _
-from openerp.osv.orm import except_orm, browse_record
+from openerp.osv.orm import except_orm, browse_record, MAGIC_COLUMNS
_logger = logging.getLogger(__name__)
@@ -302,7 +302,13 @@
def _drop_column(self, cr, uid, ids, context=None):
for field in self.browse(cr, uid, ids, context):
+<<<<<<< TREE
model = self.pool[field.model]
+=======
+ if field.name in MAGIC_COLUMNS:
+ continue
+ model = self.pool.get(field.model)
+>>>>>>> MERGE-SOURCE
cr.execute('select relkind from pg_class where relname=%s', (model._table,))
result = cr.fetchone()
cr.execute("SELECT column_name FROM information_schema.columns WHERE table_name ='%s' and column_name='%s'" %(model._table, field.name))
=== modified file 'openerp/addons/test_impex/tests/test_export.py'
--- openerp/addons/test_impex/tests/test_export.py 2012-09-07 12:08:04 +0000
+++ openerp/addons/test_impex/tests/test_export.py 2014-02-28 13:57:16 +0000
@@ -309,8 +309,9 @@
def test_external_id(self):
integer_id = self.registry('export.integer').create(
self.cr, openerp.SUPERUSER_ID, {'value': 42})
- # __export__.$class.$id
- external_id = u'__export__.export_many2one_%d' % integer_id
+ # Expecting the m2o target model name in the external id,
+ # not this model's name
+ external_id = u'__export__.export_integer_%d' % integer_id
self.assertEqual(
self.export(integer_id, fields=['value/id']),
[[external_id]])
=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py 2014-02-20 16:05:48 +0000
+++ openerp/osv/orm.py 2014-02-28 13:57:16 +0000
@@ -1124,7 +1124,7 @@
def _get_xml_id(self, cr, uid, r):
model_data = self.pool.get('ir.model.data')
- data_ids = model_data.search(cr, uid, [('model', '=', r._table_name), ('res_id', '=', r['id'])])
+ data_ids = model_data.search(cr, uid, [('model', '=', r._model._name), ('res_id', '=', r['id'])])
if len(data_ids):
d = model_data.read(cr, uid, data_ids, ['name', 'module'])[0]
if d['module']:
@@ -1134,13 +1134,13 @@
else:
postfix = 0
while True:
- n = self._table+'_'+str(r['id']) + (postfix and ('_'+str(postfix)) or '' )
+ n = r._model._table+'_'+str(r['id']) + (postfix and ('_'+str(postfix)) or '' )
if not model_data.search(cr, uid, [('name', '=', n)]):
break
postfix += 1
model_data.create(cr, SUPERUSER_ID, {
'name': n,
- 'model': self._name,
+ 'model': r._model._name,
'res_id': r['id'],
'module': '__export__',
})
=== modified file 'openerp/tools/translate.py'
--- openerp/tools/translate.py 2014-02-27 16:18:19 +0000
+++ openerp/tools/translate.py 2014-02-28 13:57:16 +0000
@@ -736,6 +736,11 @@
except (IOError, etree.XMLSyntaxError):
_logger.exception("couldn't export translation for report %s %s %s", name, report_type, fname)
+ elif model == 'ir.model':
+ model_pool = pool.get(obj.model)
+ if model_pool:
+ push_translation(module, 'model', '_description', 0, model_pool._description)
+
for field_name,field_def in obj._table._columns.items():
if field_def.translate:
name = model + "," + field_name
