[IMP] Improved warning messages for report_webkit, share and wiki modules
bzr revid: pso@tinyerp.com-20120722134024-hu4fbdhw5ga8p1u7
This commit is contained in:
parent
d5d97cb6e3
commit
7e978dce74
|
@ -110,7 +110,7 @@ msgstr ""
|
||||||
#. module: share
|
#. module: share
|
||||||
#: code:addons/share/wizard/share_wizard.py:643
|
#: code:addons/share/wizard/share_wizard.py:643
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You must be a member of the Share/User group to use the share wizard"
|
msgid "You must be a member of the Share/User group to use the share wizard."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: share
|
#. module: share
|
||||||
|
@ -174,7 +174,7 @@ msgstr ""
|
||||||
#. module: share
|
#. module: share
|
||||||
#: code:addons/share/wizard/share_wizard.py:640
|
#: code:addons/share/wizard/share_wizard.py:640
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Action and Access Mode are required to create a shared access"
|
msgid "Action and Access Mode are required to create a shared access."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: share
|
#. module: share
|
||||||
|
@ -257,7 +257,7 @@ msgstr ""
|
||||||
#. module: share
|
#. module: share
|
||||||
#: code:addons/share/wizard/share_wizard.py:647
|
#: code:addons/share/wizard/share_wizard.py:647
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Please indicate the emails of the persons to share with, one per line"
|
msgid "Please indicate the emails of the persons to share with, one per line."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: share
|
#. module: share
|
||||||
|
@ -416,7 +416,7 @@ msgstr ""
|
||||||
#: code:addons/share/wizard/share_wizard.py:60
|
#: code:addons/share/wizard/share_wizard.py:60
|
||||||
#: code:addons/share/wizard/share_wizard.py:635
|
#: code:addons/share/wizard/share_wizard.py:635
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Sharing access could not be created."
|
msgid "Sharing access cannot be created."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: share
|
#. module: share
|
||||||
|
|
|
@ -649,19 +649,19 @@ class share_wizard(osv.TransientModel):
|
||||||
rule_name=rule_name, restrict=True, context=context)
|
rule_name=rule_name, restrict=True, context=context)
|
||||||
except Exception:
|
except Exception:
|
||||||
_logger.exception('Failed to create share access')
|
_logger.exception('Failed to create share access')
|
||||||
raise osv.except_osv(_('Sharing access could not be created'),
|
raise osv.except_osv(_('Sharing access cannot be created.'),
|
||||||
_('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
|
_('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
|
||||||
|
|
||||||
def _check_preconditions(self, cr, uid, wizard_data, context=None):
|
def _check_preconditions(self, cr, uid, wizard_data, context=None):
|
||||||
self._assert(wizard_data.action_id and wizard_data.access_mode,
|
self._assert(wizard_data.action_id and wizard_data.access_mode,
|
||||||
_('Action and Access Mode are required to create a shared access'),
|
_('Action and Access Mode are required to create a shared access.'),
|
||||||
context=context)
|
context=context)
|
||||||
self._assert(self.has_share(cr, uid, context=context),
|
self._assert(self.has_share(cr, uid, context=context),
|
||||||
_('You must be a member of the Share/User group to use the share wizard'),
|
_('You must be a member of the Share/User group to use the share wizard.'),
|
||||||
context=context)
|
context=context)
|
||||||
if wizard_data.user_type == 'emails':
|
if wizard_data.user_type == 'emails':
|
||||||
self._assert((wizard_data.new_users or wizard_data.email_1 or wizard_data.email_2 or wizard_data.email_3),
|
self._assert((wizard_data.new_users or wizard_data.email_1 or wizard_data.email_2 or wizard_data.email_3),
|
||||||
_('Please indicate the emails of the persons to share with, one per line'),
|
_('Please indicate the emails of the persons to share with, one per line.'),
|
||||||
context=context)
|
context=context)
|
||||||
|
|
||||||
def _create_share_users_group(self, cr, uid, wizard_data, context=None):
|
def _create_share_users_group(self, cr, uid, wizard_data, context=None):
|
||||||
|
|
|
@ -374,7 +374,7 @@ msgstr ""
|
||||||
#. module: wiki
|
#. module: wiki
|
||||||
#: code:addons/wiki/wizard/wiki_show_diff.py:54
|
#: code:addons/wiki/wizard/wiki_show_diff.py:54
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You need to select minimum one or maximum two history revision!"
|
msgid "You need to select minimum one or maximum two history revisions!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: wiki
|
#. module: wiki
|
||||||
|
|
|
@ -51,7 +51,7 @@ class showdiff(osv.osv_memory):
|
||||||
nids.sort()
|
nids.sort()
|
||||||
diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
|
diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
|
||||||
else:
|
else:
|
||||||
raise osv.except_osv(_('Warning'), _('You need to select minimum one or maximum two history revision!'))
|
raise osv.except_osv(_('Warning'), _('You need to select minimum one or maximum two history revisions!'))
|
||||||
|
|
||||||
|
|
||||||
return diff
|
return diff
|
||||||
|
|
Loading…
Reference in New Issue