diff --git a/browser/form.py b/browser/form.py index ce3cd2e..e7ac588 100644 --- a/browser/form.py +++ b/browser/form.py @@ -83,7 +83,7 @@ class ObjectForm(NodeView): def checkPermissions(self): obj = self.target if obj is None: - obj = self.context + obj = self.containerext return canWriteObject(obj) @Lazy @@ -289,7 +289,9 @@ class CreateObjectForm(ObjectForm): @Lazy def title(self): if self.fixedType: - return _(u'Create %s') % self.typeConcept.title + #return _(u'Create %s') % self.typeConcept.title + return _(u'Create $type', + mapping=dict(type=self.typeConcept.title)) else: return _(self.defaultTitle) diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo index d8111cf..6abb17f 100644 Binary files a/locales/de/LC_MESSAGES/loops.mo and b/locales/de/LC_MESSAGES/loops.mo differ diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po index 2a8925c..157d161 100644 --- a/locales/de/LC_MESSAGES/loops.po +++ b/locales/de/LC_MESSAGES/loops.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: $Id$\n" "POT-Creation-Date: 2007-05-22 12:00 CET\n" -"PO-Revision-Date: 2012-05-09 12:00 CET\n" +"PO-Revision-Date: 2012-05-30 12:00 CET\n" "Last-Translator: Helmut Merz \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -47,6 +47,9 @@ msgstr "Ressource anlegen..." msgid "Create %s" msgstr "%s anlegen" +msgid "Create $type" +msgstr "$type anlegen" + msgid "Create a new resource object." msgstr "Eine neue Ressource erzeugen" @@ -230,7 +233,7 @@ msgstr "Begriff bearbeiten" msgid "Create Event..." msgstr "Termin anlegen..." -msgid "Create a new event" +msgid "Create a new event." msgstr "Einen neuen Termin anlegen." msgid "Create Task..." diff --git a/organize/browser/event.py b/organize/browser/event.py index fb97b4b..17220f9 100644 --- a/organize/browser/event.py +++ b/organize/browser/event.py @@ -27,6 +27,7 @@ from zope import interface, component from zope.app.pagetemplate import ViewPageTemplateFile from zope.cachedescriptors.property import Lazy +from cybertools.browser.action import actions from cybertools.meta.interfaces import IOptions from loops.browser.action import DialogAction from loops.browser.concept import ConceptView @@ -38,6 +39,17 @@ from loops.util import _ organize_macros = ViewPageTemplateFile('view_macros.pt') +actions.register('createEvent', 'portlet', DialogAction, + title=_(u'Create Event...'), + description=_(u'Create a new event.'), + viewName='create_concept.html', + dialogName='createEvent', + typeToken='.loops/concepts/event', + fixedType=True, + prerequisites=['registerDojoDateWidget'], +) + + class Events(ConceptView): @Lazy @@ -45,19 +57,11 @@ class Events(ConceptView): return organize_macros.macros['events'] def getActions(self, category='object', page=None, target=None): - actions = [] + acts = super(Events, self).getActions(category, page, target) if category == 'portlet': - actions.append(DialogAction(self, title=_(u'Create Event...'), - description=_(u'Create a new event.'), - viewName='create_concept.html', - dialogName='createEvent', - typeToken='.loops/concepts/event', - fixedType=True, - innerForm='inner_concept_form.html', - page=page, - target=target)) - self.registerDojoDateWidget() - return actions + acts.extend(actions.get(category, ['createEvent'], + view=self, page=page, target=target)) + return acts @Lazy def selectedDate(self):