odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]google-caldav-warning-msg 

bzr revid: pna@tinyerp.com-20120712131337-uu2t52v22x3xo8ki
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-07-12 18:43:37 +05:30
parent 6cbb04758a
commit 0eb19849ba
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/caldav/calendar.py
View File

@ -786,7 +786,7 @@ class basic_calendar_line(osv.osv):
res = cr.fetchone() res = cr.fetchone()
if res: if res:
if res[0] > 0: if res[0] > 0:
raise osv.except_osv(_('Warning !'), _('Can not create line "%s" more than once') % (vals.get('name'))) raise osv.except_osv(_('Warning !'), _('Cannot create line "%s" more than once.') % (vals.get('name')))
return super(basic_calendar_line, self).create(cr, uid, vals, context=context) return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
basic_calendar_line() basic_calendar_line()
@ -876,7 +876,7 @@ class basic_calendar_fields(osv.osv):
line = line_obj.browse(cr, uid, l_id, context=context)[0] line = line_obj.browse(cr, uid, l_id, context=context)[0]
line_rel = line.object_id.model line_rel = line.object_id.model
if (relation != 'NULL') and (not relation == line_rel): if (relation != 'NULL') and (not relation == line_rel):
raise osv.except_osv(_('Warning !'), _('Please provide proper configuration of "%s" in Calendar Lines') % (name)) raise osv.except_osv(_('Warning !'), _('Please provide proper configuration of "%s" in Calendar Lines.') % (name))
return True return True
def create(self, cr, uid, vals, context=None): def create(self, cr, uid, vals, context=None):
@ -1192,7 +1192,7 @@ class Alarm(CalDAV, osv.osv_memory):
elif isinstance(child.value, datetime): elif isinstance(child.value, datetime):
# TODO # TODO
# remember, spec says this datetime is in UTC # remember, spec says this datetime is in UTC
raise NotImplementedError("we cannot parse absolute triggers") raise NotImplementedError("We cannot parse absolute triggers.")
if not seconds: if not seconds:
duration = abs(days) duration = abs(days)
related = days > 0 and 'after' or 'before' related = days > 0 and 'after' or 'before'

2
addons/caldav/i18n/caldav.pot
View File

@ -365,7 +365,7 @@ msgstr ""
#. module: caldav #. module: caldav
#: code:addons/caldav/wizard/calendar_event_import.py:63 #: code:addons/caldav/wizard/calendar_event_import.py:63
#, python-format #, python-format
msgid "Invalid format of the ics, file can not be imported" msgid "Invalid format of the ics, file cannot be imported."
msgstr "" msgstr ""
#. module: caldav #. module: caldav

2
addons/caldav/wizard/caldav_browse.py
View File

@ -178,7 +178,7 @@ configuration
res = {} res = {}
host = context.get('host') host = context.get('host')
if not config.get_misc('webdav','enable',True): if not config.get_misc('webdav','enable',True):
raise Exception("WebDAV is disabled, cannot continue") raise Exception("WebDAV is disabled, cannot continue.")
user_pool = self.pool.get('res.users') user_pool = self.pool.get('res.users')
current_user = user_pool.browse(cr, uid, uid, context=context) current_user = user_pool.browse(cr, uid, uid, context=context)
#TODO write documentation #TODO write documentation

2
addons/caldav/wizard/calendar_event_import.py
View File

@ -60,7 +60,7 @@ class calendar_event_import(osv.osv_memory):
try: try:
vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context) vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context)
except: except:
raise osv.except_osv(_('Warning !'),_('Invalid format of the ics, file can not be imported')) raise osv.except_osv(_('Warning !'),_('Invalid format of the ics, file cannot be imported.'))
global cnt global cnt
if vals: if vals:
cnt = len(vals) cnt = len(vals)

6
addons/google_docs/google_docs.py
View File

@ -27,7 +27,7 @@ try:
from gdata.docs.service import DOCUMENT_LABEL from gdata.docs.service import DOCUMENT_LABEL
import gdata.auth import gdata.auth
except ImportError: except ImportError:
raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list')) raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
class google_docs_ir_attachment(osv.osv): class google_docs_ir_attachment(osv.osv):
_inherit = 'ir.attachment' _inherit = 'ir.attachment'
@ -46,7 +46,7 @@ class google_docs_ir_attachment(osv.osv):
#login gmail account #login gmail account
client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context) client = google_pool.google_login( user_config['user'], user_config['password'], type='docs_client', context=context)
if not client: if not client:
raise osv.except_osv( _('Google Docs Error!'), _("Check your google configuration in users/synchronization")) raise osv.except_osv( _('Google Docs Error!'), _("Check your google configuration in Users/Users/Synchronization tab."))
return client return client
def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None): def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
@ -88,7 +88,7 @@ class google_docs_ir_attachment(osv.osv):
#copy the document you choose in the configuration #copy the document you choose in the configuration
copy_resource = client.copy_resource(original_resource, 'copy_%s' % original_resource.title.text) copy_resource = client.copy_resource(original_resource, 'copy_%s' % original_resource.title.text)
except: except:
raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL")) raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL."))
# create an ir.attachment # create an ir.attachment
self.create(cr, uid, { self.create(cr, uid, {
'res_model': res_model, 'res_model': res_model,