[tryton-debian-vcs] tryton-modules-calendar-classification branch upstream updated. upstream/3.4.1-1-g726d856
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:03:05 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-classification.git;a=commitdiff;h=upstream/3.4.1-1-g726d856
commit 726d856723876852d7efdc8dba820213c1b9bbd1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:54 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 4b41f43..4ce2f79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b0f1960..1616fb4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_classification
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_calendar_classification
===============================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 0597dab..21e2e9f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
from .calendar_ import *
diff --git a/calendar_.py b/calendar_.py
index e101500..b31bca5 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import vobject
from trytond.tools import reduce_ids, grouped_slice
@@ -30,18 +30,24 @@ class Event:
domain = [domain,
['OR',
[
- ('classification', '=', 'confidential'),
+ ('classification', '=', 'private'),
['OR',
('calendar.owner', '=', Transaction().user),
('calendar.write_users', '=', Transaction().user),
],
],
- ('classification', '!=', 'confidential'),
+ ('classification', '!=', 'private'),
],
]
- return super(Event, cls).search(domain, offset=offset, limit=limit,
+ records = super(Event, cls).search(domain, offset=offset, limit=limit,
order=order, count=count, query=query)
+ if Transaction().user:
+ # Clear the cache as it was not cleaned for confidential
+ cache = Transaction().cursor.get_cache()
+ cache.pop(cls.__name__, None)
+ return records
+
@classmethod
def create(cls, vlist):
events = super(Event, cls).create(vlist)
@@ -51,9 +57,9 @@ class Event:
return events
@classmethod
- def _clean_private(cls, record, transp):
+ def _clean_confidential(cls, record, transp):
'''
- Clean private record
+ Clean confidential record
'''
summary = cls.raise_user_error(transp, raise_exception=False)
if 'summary' in record:
@@ -116,9 +122,9 @@ class Event:
to_remove.add(field)
res = super(Event, cls).read(ids, fields_names=fields_names)
for record in res:
- if record['classification'] == 'private' \
+ if record['classification'] == 'confidential' \
and record['id'] not in writable_ids:
- cls._clean_private(record, record['transp'])
+ cls._clean_confidential(record, record['transp'])
for field in to_remove:
del record[field]
return res
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b8538d9..e61d644 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,10 +2,239 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:calendar.event.attendee:"
+msgid " * "
+msgstr " * "
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) changed his/her participation status to: %s\n"
+"\n"
+msgstr "%s (%s) cambió su estado de participación"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has accepted this invitation:\n"
+"\n"
+msgstr "%s (%s) ha aceptado esta invitación:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ""
+"%s (%s) has declined this invitattion:\n"
+"\n"
+msgstr "%s (%s) rechazó esta invitación:"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "%s: %s @ %s"
+msgstr "%s: %s @ %s"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "(No Subject)"
+msgstr "(Sin Asunto)"
+
+msgctxt "error:calendar.event.attendee:"
+msgid ":"
+msgstr ":"
+
+msgctxt "error:calendar.event.attendee:"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:"
+msgid " * "
+msgstr " * "
+
+msgctxt "error:calendar.event:"
+msgid "(No Subject)"
+msgstr "(Sin Asunto)"
+
+msgctxt "error:calendar.event:"
+msgid ":"
+msgstr ":"
+
msgctxt "error:calendar.event:"
msgid "Busy"
-msgstr "Ocupado"
+msgstr ""
+
+msgctxt "error:calendar.event:"
+msgid "Cancelled Event: %s @ %s"
+msgstr "Evento Cancelado: %s @ %s"
+#, fuzzy
msgctxt "error:calendar.event:"
msgid "Free"
-msgstr "Libre"
+msgstr "Gratis"
+
+msgctxt "error:calendar.event:"
+msgid "Invitation: %s @ %s"
+msgstr "Invitación: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been canceled.\n"
+"\n"
+msgstr "Este evento se canceló."
+
+msgctxt "error:calendar.event:"
+msgid ""
+"This event has been changed.\n"
+"\n"
+msgstr "Este evento cambió."
+
+msgctxt "error:calendar.event:"
+msgid "Updated Invitation: %s @ %s"
+msgstr "Invitación actualizada: %s @ %s"
+
+msgctxt "error:calendar.event:"
+msgid "When"
+msgstr "Cuando"
+
+msgctxt "error:calendar.event:"
+msgid ""
+"You have been invited to the following event.\n"
+"\n"
+msgstr "Usted fue invitado al siguiente evento."
+
+msgctxt "field:calendar.event,organizer_schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente de Planeación"
+
+msgctxt "field:calendar.event,organizer_schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de Planeación"
+
+msgctxt "field:calendar.event.attendee,schedule_agent:"
+msgid "Schedule Agent"
+msgstr "Agente de Planeación"
+
+msgctxt "field:calendar.event.attendee,schedule_status:"
+msgid "Schedule Status"
+msgstr "Estado de Planeación"
+
+msgctxt "field:res.user,calendar_email_notification_cancel:"
+msgid "Cancelled invitations"
+msgstr "Invitaciones canceladas"
+
+msgctxt "field:res.user,calendar_email_notification_new:"
+msgid "New invitations"
+msgstr "Nuevas invitaciones"
+
+msgctxt "field:res.user,calendar_email_notification_partstat:"
+msgid "Invitation Replies"
+msgstr "Invitaciones Contestadas"
+
+msgctxt "field:res.user,calendar_email_notification_update:"
+msgid "Changed invitations"
+msgstr "Invitaciones Cambiadas"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "None"
+msgstr "Ninguna"
+
+msgctxt "selection:calendar.event,organizer_schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event,organizer_schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Client"
+msgstr "Cliente"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:calendar.event.attendee,schedule_agent:"
+msgid "Server"
+msgstr "Servidor"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.0"
+msgstr "1.0"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.1"
+msgstr "1.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "1.2"
+msgstr "1.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.7"
+msgstr "3.7"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "3.8"
+msgstr "3.8"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.1"
+msgstr "5.1"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.2"
+msgstr "5.2"
+
+msgctxt "selection:calendar.event.attendee,schedule_status:"
+msgid "5.3"
+msgstr "5.3"
+
+msgctxt "view:res.user:"
+msgid "Calendar Email Notifications"
+msgstr "Notificaciones de Calendario por Email"
+
+msgctxt "view:res.user:"
+msgid "Notifications"
+msgstr "Notificaciones"
diff --git a/setup.py b/setup.py
index 6f6baee..3a59969 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup
import re
@@ -84,6 +84,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tryton.cfg b/tryton.cfg
index 3f3c8ff..aaf9806 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
calendar
ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index 5c2cef8..a89054a 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-classification
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add classification access to events
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_calendar_classification
===============================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index 4a027be..467718b 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
vobject >= 0.8.0
-trytond_calendar >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_calendar >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-calendar-classification
More information about the tryton-debian-vcs
mailing list