Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa
into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
Requested reviews:
Kuldeep Joshi(OpenERP) (kjo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa/+merge/114853
Hello,
I update warning messages in different modules like:
report_webkit
share
wiki
Thanks
-hsa
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa/+merge/114853
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr.
=== modified file 'report_webkit/i18n/report_webkit.pot'
--- report_webkit/i18n/report_webkit.pot 2012-02-08 01:08:30 +0000
+++ report_webkit/i18n/report_webkit.pot 2012-07-13 12:36:21 +0000
@@ -90,7 +90,7 @@
#: code:addons/report_webkit/webkit_report.py:285
#: code:addons/report_webkit/webkit_report.py:296
#, python-format
-msgid "Webkit render"
+msgid "Webkit render !"
msgstr ""
#. module: report_webkit
@@ -113,7 +113,7 @@
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:167
#, python-format
-msgid "Webkit raise an error"
+msgid "Webkit raise an error !"
msgstr ""
#. module: report_webkit
@@ -273,7 +273,7 @@
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:224
#, python-format
-msgid "Please set a header in company settings"
+msgid "Please set a header in company settings."
msgstr ""
#. module: report_webkit
@@ -497,7 +497,7 @@
#. module: report_webkit
#: code:addons/report_webkit/webkit_report.py:218
#, python-format
-msgid "Webkit Report template not found !"
+msgid "Webkit report template not found !"
msgstr ""
#. module: report_webkit
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2012-06-22 06:48:54 +0000
+++ report_webkit/webkit_report.py 2012-07-13 12:36:21 +0000
@@ -164,7 +164,7 @@
status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
if status :
raise except_osv(
- _('Webkit raise an error' ),
+ _('Webkit raise an error !' ),
status
)
except Exception:
@@ -215,13 +215,13 @@
if not template and report_xml.report_webkit_data :
template = report_xml.report_webkit_data
if not template :
- raise except_osv(_('Error!'), _('Webkit Report template not found !'))
+ raise except_osv(_('Error!'), _('Webkit report template not found !'))
header = report_xml.webkit_header.html
footer = report_xml.webkit_header.footer_html
if not header and report_xml.header:
raise except_osv(
_('No header defined for this Webkit report!'),
- _('Please set a header in company settings')
+ _('Please set a header in company settings.')
)
if not report_xml.header :
header = ''
@@ -249,7 +249,7 @@
except Exception, e:
msg = exceptions.text_error_template().render()
_logger.error(msg)
- raise except_osv(_('Webkit render'), msg)
+ raise except_osv(_('Webkit render !'), msg)
else:
try :
html = body_mako_tpl.render(helper=helper,
@@ -260,7 +260,7 @@
except Exception, e:
msg = exceptions.text_error_template().render()
_logger.error(msg)
- raise except_osv(_('Webkit render'), msg)
+ raise except_osv(_('Webkit render !'), msg)
head_mako_tpl = mako_template(header)
try :
head = head_mako_tpl.render(helper=helper,
@@ -269,7 +269,7 @@
_debug=False,
**self.parser_instance.localcontext)
except Exception, e:
- raise except_osv(_('Webkit render'),
+ raise except_osv(_('Webkit render !'),
exceptions.text_error_template().render())
foot = False
if footer :
@@ -282,7 +282,7 @@
except:
msg = exceptions.text_error_template().render()
_logger.error(msg)
- raise except_osv(_('Webkit render'), msg)
+ raise except_osv(_('Webkit render !'), msg)
if report_xml.webkit_debug :
try :
deb = head_mako_tpl.render(helper=helper,
@@ -293,7 +293,7 @@
except Exception, e:
msg = exceptions.text_error_template().render()
_logger.error(msg)
- raise except_osv(_('Webkit render'), msg)
+ raise except_osv(_('Webkit render !'), msg)
return (deb, 'html')
bin = self.get_lib(cursor, uid)
pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
=== modified file 'share/i18n/share.pot'
--- share/i18n/share.pot 2012-06-25 13:42:53 +0000
+++ share/i18n/share.pot 2012-07-13 12:36:21 +0000
@@ -416,7 +416,7 @@
#: code:addons/share/wizard/share_wizard.py:60
#: code:addons/share/wizard/share_wizard.py:635
#, python-format
-msgid "Sharing access could not be created"
+msgid "Sharing access could not be created."
msgstr ""
#. module: share
=== modified file 'share/wizard/share_wizard.py'
--- share/wizard/share_wizard.py 2012-06-29 13:22:51 +0000
+++ share/wizard/share_wizard.py 2012-07-13 12:36:21 +0000
@@ -57,7 +57,7 @@
The error_message should have been translated with _().
"""
if not condition:
- raise osv.except_osv(_('Sharing access could not be created'), error_message)
+ raise osv.except_osv(_('Sharing access cannot be created.'), error_message)
def has_group(self, cr, uid, module, group_xml_id, context=None):
"""Returns True if current user is a member of the group identified by the module, group_xml_id pair."""
=== modified file 'wiki/i18n/wiki.pot'
--- wiki/i18n/wiki.pot 2012-02-08 01:08:30 +0000
+++ wiki/i18n/wiki.pot 2012-07-13 12:36:21 +0000
@@ -115,7 +115,7 @@
#. module: wiki
#: code:addons/wiki/wizard/wiki_make_index.py:52
#, python-format
-msgid "There is no section in this Page"
+msgid "There is no section in this Page."
msgstr ""
#. module: wiki
@@ -152,7 +152,7 @@
#. module: wiki
#: code:addons/wiki/wiki.py:237
#, python-format
-msgid "There are no changes in revisions"
+msgid "There are no changes in revisions."
msgstr ""
#. module: wiki
@@ -374,7 +374,7 @@
#. module: wiki
#: code:addons/wiki/wizard/wiki_show_diff.py:54
#, python-format
-msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgid "You need to select minimum one or maximum two history revision!"
msgstr ""
#. module: wiki
=== modified file 'wiki/web/widgets/rss/feedparser.py'
--- wiki/web/widgets/rss/feedparser.py 2011-12-19 16:54:40 +0000
+++ wiki/web/widgets/rss/feedparser.py 2012-07-13 12:36:21 +0000
@@ -233,7 +233,7 @@
assert not key.startswith('_')
return self.__getitem__(key)
except:
- raise AttributeError, "object has no attribute '%s'" % key
+ raise AttributeError, "Object has no attribute '%s'" % key
def __setattr__(self, key, value):
if key.startswith('_') or key == 'data':
=== modified file 'wiki/wiki.py'
--- wiki/wiki.py 2011-12-19 16:54:40 +0000
+++ wiki/wiki.py 2012-07-13 12:36:21 +0000
@@ -234,7 +234,7 @@
if text2:
line2=tools.ustr(text2.splitlines(1))
if (not line1 and not line2) or (line1 == line2):
- raise osv.except_osv(_('Warning !'), _('There are no changes in revisions'))
+ raise osv.except_osv(_('Warning !'), _('There are no changes in revisions.'))
diff = difflib.HtmlDiff()
return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
=== modified file 'wiki/wizard/wiki_make_index.py'
--- wiki/wizard/wiki_make_index.py 2011-03-24 13:33:50 +0000
+++ wiki/wizard/wiki_make_index.py 2012-07-13 12:36:21 +0000
@@ -49,7 +49,7 @@
order by section ", (tuple(data),))
lst0 = cr.fetchall()
if not lst0[0][1]:
- raise osv.except_osv(_('Warning !'), _('There is no section in this Page'))
+ raise osv.except_osv(_('Warning !'), _('There is no section in this Page.'))
lst = []
s_ids = {}
=== modified file 'wiki/wizard/wiki_show_diff.py'
--- wiki/wizard/wiki_show_diff.py 2011-01-14 00:11:01 +0000
+++ wiki/wizard/wiki_show_diff.py 2012-07-13 12:36:21 +0000
@@ -51,7 +51,7 @@
nids.sort()
diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
else:
- raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
+ raise osv.except_osv(_('Warning'), _('You need to select minimum one or maximum two history revision!'))
return diff
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
