Merge lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa into lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr

Proposed by Hardik Sanchawat (OpenERP)
Status: Merged
Merge reported by: Priyesh (OpenERP)
Merged at revision: not available
Proposed branch: lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa
Merge into: lp:~openerp-dev/openobject-addons/trunk-exception-warning-imp-dbr
Diff against target: 222 lines (+21/-21)
9 files modified
report_webkit/i18n/report_webkit.pot (+4/-4)
report_webkit/webkit_report.py (+8/-8)
share/i18n/share.pot (+1/-1)
share/wizard/share_wizard.py (+1/-1)
wiki/i18n/wiki.pot (+3/-3)
wiki/web/widgets/rss/feedparser.py (+1/-1)
wiki/wiki.py (+1/-1)
wiki/wizard/wiki_make_index.py (+1/-1)
wiki/wizard/wiki_show_diff.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/trunk-exception-warning-imp-dbr-extra-modules-hsa
Reviewer Review Type Date Requested Status
Kuldeep Joshi(OpenERP) Pending
Review via email: mp+114853@code.launchpad.net

Description of the change

Hello,

I update warning messages in different modules like:
report_webkit
share
wiki

Thanks
-hsa

To post a comment you must log in.
Revision history for this message
Priyesh (OpenERP) (pso-openerp) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_webkit/i18n/report_webkit.pot'
2--- report_webkit/i18n/report_webkit.pot 2012-02-08 01:08:30 +0000
3+++ report_webkit/i18n/report_webkit.pot 2012-07-13 12:36:21 +0000
4@@ -90,7 +90,7 @@
5 #: code:addons/report_webkit/webkit_report.py:285
6 #: code:addons/report_webkit/webkit_report.py:296
7 #, python-format
8-msgid "Webkit render"
9+msgid "Webkit render !"
10 msgstr ""
11
12 #. module: report_webkit
13@@ -113,7 +113,7 @@
14 #. module: report_webkit
15 #: code:addons/report_webkit/webkit_report.py:167
16 #, python-format
17-msgid "Webkit raise an error"
18+msgid "Webkit raise an error !"
19 msgstr ""
20
21 #. module: report_webkit
22@@ -273,7 +273,7 @@
23 #. module: report_webkit
24 #: code:addons/report_webkit/webkit_report.py:224
25 #, python-format
26-msgid "Please set a header in company settings"
27+msgid "Please set a header in company settings."
28 msgstr ""
29
30 #. module: report_webkit
31@@ -497,7 +497,7 @@
32 #. module: report_webkit
33 #: code:addons/report_webkit/webkit_report.py:218
34 #, python-format
35-msgid "Webkit Report template not found !"
36+msgid "Webkit report template not found !"
37 msgstr ""
38
39 #. module: report_webkit
40
41=== modified file 'report_webkit/webkit_report.py'
42--- report_webkit/webkit_report.py 2012-06-22 06:48:54 +0000
43+++ report_webkit/webkit_report.py 2012-07-13 12:36:21 +0000
44@@ -164,7 +164,7 @@
45 status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
46 if status :
47 raise except_osv(
48- _('Webkit raise an error' ),
49+ _('Webkit raise an error !' ),
50 status
51 )
52 except Exception:
53@@ -215,13 +215,13 @@
54 if not template and report_xml.report_webkit_data :
55 template = report_xml.report_webkit_data
56 if not template :
57- raise except_osv(_('Error!'), _('Webkit Report template not found !'))
58+ raise except_osv(_('Error!'), _('Webkit report template not found !'))
59 header = report_xml.webkit_header.html
60 footer = report_xml.webkit_header.footer_html
61 if not header and report_xml.header:
62 raise except_osv(
63 _('No header defined for this Webkit report!'),
64- _('Please set a header in company settings')
65+ _('Please set a header in company settings.')
66 )
67 if not report_xml.header :
68 header = ''
69@@ -249,7 +249,7 @@
70 except Exception, e:
71 msg = exceptions.text_error_template().render()
72 _logger.error(msg)
73- raise except_osv(_('Webkit render'), msg)
74+ raise except_osv(_('Webkit render !'), msg)
75 else:
76 try :
77 html = body_mako_tpl.render(helper=helper,
78@@ -260,7 +260,7 @@
79 except Exception, e:
80 msg = exceptions.text_error_template().render()
81 _logger.error(msg)
82- raise except_osv(_('Webkit render'), msg)
83+ raise except_osv(_('Webkit render !'), msg)
84 head_mako_tpl = mako_template(header)
85 try :
86 head = head_mako_tpl.render(helper=helper,
87@@ -269,7 +269,7 @@
88 _debug=False,
89 **self.parser_instance.localcontext)
90 except Exception, e:
91- raise except_osv(_('Webkit render'),
92+ raise except_osv(_('Webkit render !'),
93 exceptions.text_error_template().render())
94 foot = False
95 if footer :
96@@ -282,7 +282,7 @@
97 except:
98 msg = exceptions.text_error_template().render()
99 _logger.error(msg)
100- raise except_osv(_('Webkit render'), msg)
101+ raise except_osv(_('Webkit render !'), msg)
102 if report_xml.webkit_debug :
103 try :
104 deb = head_mako_tpl.render(helper=helper,
105@@ -293,7 +293,7 @@
106 except Exception, e:
107 msg = exceptions.text_error_template().render()
108 _logger.error(msg)
109- raise except_osv(_('Webkit render'), msg)
110+ raise except_osv(_('Webkit render !'), msg)
111 return (deb, 'html')
112 bin = self.get_lib(cursor, uid)
113 pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
114
115=== modified file 'share/i18n/share.pot'
116--- share/i18n/share.pot 2012-06-25 13:42:53 +0000
117+++ share/i18n/share.pot 2012-07-13 12:36:21 +0000
118@@ -416,7 +416,7 @@
119 #: code:addons/share/wizard/share_wizard.py:60
120 #: code:addons/share/wizard/share_wizard.py:635
121 #, python-format
122-msgid "Sharing access could not be created"
123+msgid "Sharing access could not be created."
124 msgstr ""
125
126 #. module: share
127
128=== modified file 'share/wizard/share_wizard.py'
129--- share/wizard/share_wizard.py 2012-06-29 13:22:51 +0000
130+++ share/wizard/share_wizard.py 2012-07-13 12:36:21 +0000
131@@ -57,7 +57,7 @@
132 The error_message should have been translated with _().
133 """
134 if not condition:
135- raise osv.except_osv(_('Sharing access could not be created'), error_message)
136+ raise osv.except_osv(_('Sharing access cannot be created.'), error_message)
137
138 def has_group(self, cr, uid, module, group_xml_id, context=None):
139 """Returns True if current user is a member of the group identified by the module, group_xml_id pair."""
140
141=== modified file 'wiki/i18n/wiki.pot'
142--- wiki/i18n/wiki.pot 2012-02-08 01:08:30 +0000
143+++ wiki/i18n/wiki.pot 2012-07-13 12:36:21 +0000
144@@ -115,7 +115,7 @@
145 #. module: wiki
146 #: code:addons/wiki/wizard/wiki_make_index.py:52
147 #, python-format
148-msgid "There is no section in this Page"
149+msgid "There is no section in this Page."
150 msgstr ""
151
152 #. module: wiki
153@@ -152,7 +152,7 @@
154 #. module: wiki
155 #: code:addons/wiki/wiki.py:237
156 #, python-format
157-msgid "There are no changes in revisions"
158+msgid "There are no changes in revisions."
159 msgstr ""
160
161 #. module: wiki
162@@ -374,7 +374,7 @@
163 #. module: wiki
164 #: code:addons/wiki/wizard/wiki_show_diff.py:54
165 #, python-format
166-msgid "You need to select minimum 1 or maximum 2 history revision!"
167+msgid "You need to select minimum one or maximum two history revision!"
168 msgstr ""
169
170 #. module: wiki
171
172=== modified file 'wiki/web/widgets/rss/feedparser.py'
173--- wiki/web/widgets/rss/feedparser.py 2011-12-19 16:54:40 +0000
174+++ wiki/web/widgets/rss/feedparser.py 2012-07-13 12:36:21 +0000
175@@ -233,7 +233,7 @@
176 assert not key.startswith('_')
177 return self.__getitem__(key)
178 except:
179- raise AttributeError, "object has no attribute '%s'" % key
180+ raise AttributeError, "Object has no attribute '%s'" % key
181
182 def __setattr__(self, key, value):
183 if key.startswith('_') or key == 'data':
184
185=== modified file 'wiki/wiki.py'
186--- wiki/wiki.py 2011-12-19 16:54:40 +0000
187+++ wiki/wiki.py 2012-07-13 12:36:21 +0000
188@@ -234,7 +234,7 @@
189 if text2:
190 line2=tools.ustr(text2.splitlines(1))
191 if (not line1 and not line2) or (line1 == line2):
192- raise osv.except_osv(_('Warning !'), _('There are no changes in revisions'))
193+ raise osv.except_osv(_('Warning !'), _('There are no changes in revisions.'))
194 diff = difflib.HtmlDiff()
195 return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
196
197
198=== modified file 'wiki/wizard/wiki_make_index.py'
199--- wiki/wizard/wiki_make_index.py 2011-03-24 13:33:50 +0000
200+++ wiki/wizard/wiki_make_index.py 2012-07-13 12:36:21 +0000
201@@ -49,7 +49,7 @@
202 order by section ", (tuple(data),))
203 lst0 = cr.fetchall()
204 if not lst0[0][1]:
205- raise osv.except_osv(_('Warning !'), _('There is no section in this Page'))
206+ raise osv.except_osv(_('Warning !'), _('There is no section in this Page.'))
207
208 lst = []
209 s_ids = {}
210
211=== modified file 'wiki/wizard/wiki_show_diff.py'
212--- wiki/wizard/wiki_show_diff.py 2011-01-14 00:11:01 +0000
213+++ wiki/wizard/wiki_show_diff.py 2012-07-13 12:36:21 +0000
214@@ -51,7 +51,7 @@
215 nids.sort()
216 diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
217 else:
218- raise osv.except_osv(_('Warning'), _('You need to select minimum 1 or maximum 2 history revision!'))
219+ raise osv.except_osv(_('Warning'), _('You need to select minimum one or maximum two history revision!'))
220
221
222 return diff

Subscribers

People subscribed via source and target branches