diff options
| author | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
| commit | 1debe0efcd00a294fa436a8a13416ccb1de0e919 (patch) | |
| tree | a9a7209823affdaedb129f6f1cd1c0173fa11a6e /addons/share/wizard | |
| parent | 083deae5a4845cb9578b318ec08bd2d62b79a755 (diff) | |
| parent | a6e3d4bf0029d879e008414090d54499ffe358f4 (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
Diffstat (limited to 'addons/share/wizard')
| -rw-r--r-- | addons/share/wizard/share_wizard.py | 6 | ||||
| -rw-r--r-- | addons/share/wizard/share_wizard_view.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 336f56a5f97..274570e9169 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -176,7 +176,7 @@ class share_wizard(osv.osv_memory): help='Main access page for users that are granted shared access'), 'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"), 'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"), - 'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."), + 'message': fields.text("Personal Message", help="An optional personal message, to be included in the email notification."), 'embed_code': fields.function(_embed_code, type='text'), 'embed_option_title': fields.boolean("Display title"), @@ -200,8 +200,8 @@ class share_wizard(osv.osv_memory): def go_step_1(self, cr, uid, ids, context=None): wizard_data = self.browse(cr,uid,ids,context)[0] if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context): - raise osv.except_osv(_('No e-mail address configured'), - _('You must configure your e-mail address in the user preferences before using the Share button.')) + raise osv.except_osv(_('No email address configured'), + _('You must configure your email address in the user preferences before using the Share button.')) model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1') action = self.pool.get(model).read(cr, uid, res_id, context=context) action['res_id'] = ids[0] diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index 246efa01f51..41f356ce583 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -41,10 +41,10 @@ <field name="invite" invisible="1"/> </group> <group> - <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one e-mail per line)"> + <group name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}" string="Share with these People (one email per line)"> <field colspan="2" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/> </group> - <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one e-mail per line)"> + <group name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}" string="Share with these People (one email per line)"> <field name="email_1"/> <field name="email_2"/> <field name="email_3"/> @@ -72,7 +72,7 @@ <field name="access_mode" invisible="1"/> </header> <group attrs="{'invisible':[('user_type','=','embedded')]}"> - <separator string="An e-mail notification with instructions has been sent to the following people:"/> + <separator string="An email notification with instructions has been sent to the following people:"/> <field name="result_line_ids" nolabel="1" mode="tree"> <tree string="Summary"> <field name="login"/> |