[FIX] mail: mail_message: needaction_partner_ids wording
The 'string' attribute for both needaction_partner_ids and needaction fields was 'Need Action'. This was problematic for example in the custom filters of the searchview as it looked like the same field was appearing twice. Update mail.pot as well.
This commit is contained in:
Aaron Bohy
+76
-60
@@ -75,50 +75,44 @@ msgid "\n"
|
||||
" </tr>\n"
|
||||
" </tbody></table>\n"
|
||||
"</div>\n"
|
||||
"<div style=\"padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF\" class=\"\">\n"
|
||||
" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit\">\n"
|
||||
" <tbody>\n"
|
||||
" <tr>\n"
|
||||
" <td valign=\"top\" style=\"width:600px\">\n"
|
||||
" <div>\n"
|
||||
" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
|
||||
" </div>\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" </tbody>\n"
|
||||
"<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
|
||||
" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n"
|
||||
" <tbody><tr>\n"
|
||||
" <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n"
|
||||
" <div>\n"
|
||||
" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
|
||||
" </div>\n"
|
||||
" </td>\n"
|
||||
" </tr></tbody>\n"
|
||||
" </table>\n"
|
||||
"</div>\n"
|
||||
"<div class=\"snippet_row bg-color\" style=\"padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777\">\n"
|
||||
" <table style=\"width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit\">\n"
|
||||
"<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
|
||||
" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
|
||||
" <tbody><tr>\n"
|
||||
" <td style=\"padding:10px 30px; font-size:14px\">\n"
|
||||
" <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n"
|
||||
" ${object.body | safe}\n"
|
||||
" % if ctx.get('tracking'):\n"
|
||||
" <ul>\n"
|
||||
" % for tracking in ctx['tracking']\n"
|
||||
" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n"
|
||||
" <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li>\n"
|
||||
" % endfor\n"
|
||||
" </ul>\n"
|
||||
" % endif\n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" </tbody></table>\n"
|
||||
" </tr></tbody>\n"
|
||||
" </table>\n"
|
||||
"</div>\n"
|
||||
"% if ctx.get('signature'):\n"
|
||||
"<div class=\"snippet_row bg-color\" style=\"padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777\">\n"
|
||||
" <center>\n"
|
||||
" <table width=\"600\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit\">\n"
|
||||
" <tbody><tr>\n"
|
||||
" <td style=\"font-size:12px; padding: 5px 30px; text-align: left;\">\n"
|
||||
" \n"
|
||||
" ${ctx['signature'] | safe}\n"
|
||||
" \n"
|
||||
" </td>\n"
|
||||
" </tr>\n"
|
||||
" </tbody>\n"
|
||||
" </table>\n"
|
||||
" </center>\n"
|
||||
"<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
|
||||
" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
|
||||
" <tbody><tr>\n"
|
||||
" <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n"
|
||||
" ${ctx['signature'] | safe}\n"
|
||||
" </td>\n"
|
||||
" </tr></tbody>\n"
|
||||
" </table>\n"
|
||||
"</div>\n"
|
||||
"% endif\n"
|
||||
""
|
||||
"% endif"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
@@ -151,6 +145,13 @@ msgstr ""
|
||||
msgid "%s has joined the %s network."
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/thread.xml:86
|
||||
#, python-format
|
||||
msgid "(in channel"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/chatter.xml:48
|
||||
@@ -165,9 +166,27 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/thread.xml:122
|
||||
#: code:addons/mail/static/src/xml/thread.xml:147
|
||||
#, python-format
|
||||
msgid "-------- Show more messages --------"
|
||||
msgid "-------- Show older messages --------"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: code:addons/mail/models/mail_channel.py:513
|
||||
#, python-format
|
||||
msgid "<div class=\"o_mail_notification\">created <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: code:addons/mail/models/mail_channel.py:489
|
||||
#, python-format
|
||||
msgid "<div class=\"o_mail_notification\">joined <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: code:addons/mail/models/mail_channel.py:151
|
||||
#, python-format
|
||||
msgid "<div class=\"o_mail_notification\">left <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
@@ -247,13 +266,6 @@ msgstr ""
|
||||
msgid "Access Groups"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/js/client_action.js:154
|
||||
#, python-format
|
||||
msgid "Action"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
|
||||
@@ -613,6 +625,7 @@ msgstr ""
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/client_action.xml:23
|
||||
#: code:addons/mail/static/src/xml/client_action.xml:89
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
|
||||
@@ -1383,9 +1396,9 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
|
||||
msgid "In the \"Channels\" section, you will find the public and restricted channel.<br/>\n"
|
||||
" The \"Direct Message\" section allows you to talk directly to one person.<br/>\n"
|
||||
" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.<br/>"
|
||||
msgid "In the \"Channels\" section, you will find the public and restricted channel.<br>\n"
|
||||
" The \"Direct Message\" section allows you to talk directly to one person.<br>\n"
|
||||
" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.<br>"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
@@ -1831,11 +1844,8 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
|
||||
#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
|
||||
#: model:ir.model.fields,help:mail.field_mail_mail_needaction
|
||||
#: model:ir.model.fields,help:mail.field_mail_message_needaction
|
||||
@@ -2151,6 +2161,13 @@ msgstr ""
|
||||
msgid "Partners that did not ask not to be included in mass mailing campaigns"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
|
||||
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
|
||||
msgid "Partners with Need Action"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
|
||||
#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
|
||||
@@ -2723,7 +2740,7 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
|
||||
msgid "There are no messages to display.<br/>"
|
||||
msgid "There are no messages to display.<br>"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
@@ -2944,15 +2961,9 @@ msgstr ""
|
||||
msgid "Who can follow the group's activities?"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:mail.channel,name:mail.channel_all_employees
|
||||
msgid "Whole Company"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/chatter.xml:57
|
||||
#: code:addons/mail/static/src/xml/composer.xml:7
|
||||
#: code:addons/mail/static/src/xml/composer.xml:6
|
||||
#, python-format
|
||||
msgid "Write something"
|
||||
msgstr ""
|
||||
@@ -2998,14 +3009,14 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/js/client_action.js:469
|
||||
#: code:addons/mail/static/src/js/client_action.js:346
|
||||
#, python-format
|
||||
msgid "You unsubscribed from <b>%s</b>."
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
|
||||
msgid "Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.<br/>\n"
|
||||
msgid "Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.<br>\n"
|
||||
" The \"Starred\" section contains all your favorite messages."
|
||||
msgstr ""
|
||||
|
||||
@@ -3032,24 +3043,29 @@ msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/xml/client_action.xml:29
|
||||
#: code:addons/mail/static/src/xml/client_action.xml:30
|
||||
#, python-format
|
||||
msgid "dm"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: code:addons/mail/models/mail_thread.py:281
|
||||
#: code:addons/mail/models/mail_thread.py:314
|
||||
#, python-format
|
||||
msgid "document"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#. openerp-web
|
||||
#: code:addons/mail/static/src/js/chatter.js:232
|
||||
#: code:addons/mail/static/src/js/chatter.js:220
|
||||
#, python-format
|
||||
msgid "followers"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:mail.channel,name:mail.channel_all_employees
|
||||
msgid "general"
|
||||
msgstr ""
|
||||
|
||||
#. module: mail
|
||||
#: model:ir.model,name:mail.model_ir_actions_server
|
||||
msgid "ir.actions.server"
|
||||
|
||||
@@ -85,7 +85,7 @@ class Message(models.Model):
|
||||
# recipients
|
||||
partner_ids = fields.Many2many('res.partner', string='Recipients')
|
||||
needaction_partner_ids = fields.Many2many(
|
||||
'res.partner', 'mail_message_res_partner_needaction_rel', string='Need Action')
|
||||
'res.partner', 'mail_message_res_partner_needaction_rel', string='Partners with Need Action')
|
||||
needaction = fields.Boolean(
|
||||
'Need Action', compute='_get_needaction', search='_search_needaction',
|
||||
help='Need Action')
|
||||
|
||||
Reference in New Issue
Block a user