summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>2012-07-12 14:15:51 +0530
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>2012-07-12 14:15:51 +0530
commitbc2cd7d2e0df767ea1b0183b107d9b29233ac78e (patch)
tree53d920267088010ed3f5db331057c23cd62edf82
parent6cbb04758af8d1e7056df3eadbf1b490b958b0b5 (diff)
[IMP]base-warning-msg
bzr revid: pna@tinyerp.com-20120712084551-vkw1pz1o25ttu4ma
-rw-r--r--addons/base_action_rule/base_action_rule.py2
-rw-r--r--addons/base_action_rule/i18n/base_action_rule.pot2
-rw-r--r--addons/base_calendar/base_calendar.py10
-rw-r--r--addons/base_calendar/i18n/base_calendar.pot10
-rw-r--r--addons/base_calendar/wizard/base_calendar_invite_attendee.py4
-rw-r--r--addons/base_crypt/crypt.py2
-rw-r--r--addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py6
-rw-r--r--addons/base_status/base_stage.py2
8 files changed, 19 insertions, 19 deletions
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 1a3d96cbc33..9b3d55162ab 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -490,7 +490,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
return True
_constraints = [
- (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
+ (_check_mail, 'Error: The mail is not well formated.', ['act_mail_body']),
]
base_action_rule()
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index 9b09e28a1f3..1b8ed238a6a 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -332,7 +332,7 @@ msgstr ""
#. module: base_action_rule
#: constraint:base.action.rule:0
-msgid "Error: The mail is not well formated"
+msgid "Error: The mail is not well formated."
msgstr ""
#. module: base_action_rule
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bbededc8eaf..5a1b90c3dc3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -413,7 +413,7 @@ property or property parameter."),
cal = vobject.iCalendar()
event = cal.add('vevent')
if not event_obj.date_deadline or not event_obj.date:
- raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!"))
+ raise osv.except_osv(_('Warning !'),_("First specified the date for Invitation."))
event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
event.add('dtstart').value = ics_datetime(event_obj.date)
event.add('dtend').value = ics_datetime(event_obj.date_deadline)
@@ -1000,9 +1000,9 @@ class calendar_event(osv.osv):
for datas in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context):
event = datas['id']
if datas.get('interval', 0) < 0:
- raise osv.except_osv(_('Warning!'), _('Interval cannot be negative'))
+ raise osv.except_osv(_('Warning!'), _('Interval cannot be negative.'))
if datas.get('count', 0) < 0:
- raise osv.except_osv(_('Warning!'), _('Count cannot be negative'))
+ raise osv.except_osv(_('Warning!'), _('Count cannot be negative.'))
if datas['recurrency']:
result[event] = self.compute_rule_string(datas)
else:
@@ -1191,7 +1191,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
def get_month_string(freq, datas):
if freq == 'monthly':
if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
- raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
+ raise osv.except_osv(_('Error!'), ("Please select proper Day of month."))
if datas.get('select1')=='day':
return ';BYDAY=' + datas.get('byday') + datas.get('week_list')
@@ -1408,7 +1408,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
context = {}
if 'date' in groupby:
- raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead'))
+ raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead.'))
virtual_id = context.get('virtual_id', True)
context.update({'virtual_id': False})
res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 628f7af2baa..257970aaf1d 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -108,7 +108,7 @@ msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1006
#, python-format
-msgid "Count cannot be negative"
+msgid "Count cannot be negative."
msgstr ""
#. module: base_calendar
@@ -261,7 +261,7 @@ msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1004
#, python-format
-msgid "Interval cannot be negative"
+msgid "Interval cannot be negative."
msgstr ""
#. module: base_calendar
@@ -273,7 +273,7 @@ msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
#, python-format
-msgid "%s must have an email address to send mail"
+msgid "%s must have an email address to send mail."
msgstr ""
#. module: base_calendar
@@ -407,7 +407,7 @@ msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1411
#, python-format
-msgid "Group by date not supported, use the calendar view instead"
+msgid "Group by date not supported, use the calendar view instead."
msgstr ""
#. module: base_calendar
@@ -1405,7 +1405,7 @@ msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:418
#, python-format
-msgid "Couldn't Invite because date is not specified!"
+msgid "First specified the date for Invitation."
msgstr ""
#. module: base_calendar
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 676f9b3fdd2..9326a505124 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -93,7 +93,7 @@ send an Email to Invited Person')
if type == 'internal':
if not datas.get('user_ids'):
- raise osv.except_osv(_('Error!'), ("Please select any User"))
+ raise osv.except_osv(_('Error!'), ("Please select any User."))
for user_id in datas.get('user_ids'):
user = user_obj.browse(cr, uid, user_id)
res = {
@@ -140,7 +140,7 @@ send an Email to Invited Person')
if not mail_to:
name = map(lambda x: x[1], filter(lambda x: type==x[0], \
self._columns['type'].selection))
- raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail") %(name[0]))
+ raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail.") %(name[0]))
att_obj._send_mail(cr, uid, attendees, mail_to, \
email_from = current_user.user_email or tools.config.get('email_from', False))
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index 8a9d1ac1dc7..d675d98b338 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -181,7 +181,7 @@ class users(osv.osv):
cr = pooler.get_db(db).cursor()
return self._login(cr, db, login, password)
except Exception:
- _logger.exception('Could not authenticate')
+ _logger.exception('Cannot authenticate!')
return Exception('Access Denied')
finally:
if cr is not None:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
index 30a2079433a..df61ae50af7 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tiny_socket.py
@@ -56,14 +56,14 @@ class mysocket:
while totalsent < size:
sent = self.sock.send(msg[totalsent:])
if sent == 0:
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
totalsent = totalsent + sent
def myreceive(self):
buf=''
while len(buf) < 8:
chunk = self.sock.recv(8 - len(buf))
if chunk == '':
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
buf += chunk
size = int(buf)
buf = self.sock.recv(1)
@@ -75,7 +75,7 @@ class mysocket:
while len(msg) < size:
chunk = self.sock.recv(size-len(msg))
if chunk == '':
- raise RuntimeError, "socket connection broken"
+ raise RuntimeError, "Socket connection broken!"
msg = msg + chunk
msgio = cStringIO.StringIO(msg)
unpickler = cPickle.Unpickler(msgio)
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 0c3bac20da9..e539df2ecea 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -202,7 +202,7 @@ class base_stage(object):
if case.section_id.parent_id.user_id:
data['user_id'] = case.section_id.parent_id.user_id.id
else:
- raise osv.except_osv(_('Error !'), _('You can not escalate, you are already at the top level regarding your sales-team category.'))
+ raise osv.except_osv(_('Error !'), _("You are already at the top level of your sales-team category.\n That's why you cannot escalate."))
self.write(cr, uid, [case.id], data, context=context)
case.case_escalate_send_note(case.section_id.parent_id, context=context)
cases = self.browse(cr, uid, ids, context=context)