[Checkins] SVN: z3ext.cssregistry/trunk/ - Correct Persistent property management
Nikolay Kim
fafhrd at datacom.kz
Tue Oct 28 09:14:29 EDT 2008
Log message for revision 92655:
- Correct Persistent property management
- Added translations: nl
Changed:
U z3ext.cssregistry/trunk/CHANGES.txt
U z3ext.cssregistry/trunk/buildout.cfg
D z3ext.cssregistry/trunk/i18nall.in
D z3ext.cssregistry/trunk/i18ncheck.in
A z3ext.cssregistry/trunk/scripts/
A z3ext.cssregistry/trunk/scripts/i18nall.in
A z3ext.cssregistry/trunk/scripts/i18ncheck.in
U z3ext.cssregistry/trunk/setup.py
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/command.py
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/configlet.py
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.pt
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.py
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/configure.zcml
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/LC_MESSAGES/
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/LC_MESSAGES/z3ext.cssregistry.po
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/LC_MESSAGES/
A z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/LC_MESSAGES/z3ext.cssregistry.po
U z3ext.cssregistry/trunk/src/z3ext/cssregistry/registry.py
-=-
Modified: z3ext.cssregistry/trunk/CHANGES.txt
===================================================================
--- z3ext.cssregistry/trunk/CHANGES.txt 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/CHANGES.txt 2008-10-28 13:14:28 UTC (rev 92655)
@@ -2,6 +2,14 @@
CHANGES
=======
+1.3.1 (2008-10-28)
+------------------
+
+- Correct Persistent property management
+
+- Added translations: ru, nl
+
+
1.3.0 (2008-10-10)
------------------
Modified: z3ext.cssregistry/trunk/buildout.cfg
===================================================================
--- z3ext.cssregistry/trunk/buildout.cfg 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/buildout.cfg 2008-10-28 13:14:28 UTC (rev 92655)
@@ -1,7 +1,6 @@
[buildout]
develop = .
-parts = test coverage-test coverage-report
- i18n- i18nall i18ncheck i18ndude
+parts = test coverage-test coverage-report i18n i18nall i18ncheck i18ndude
[test]
recipe = zc.recipe.testrunner
@@ -18,7 +17,7 @@
scripts = coverage=coverage-report
arguments = ('coverage', 'coverage/report')
-[i18n-]
+[i18n]
recipe = z3c.recipe.i18n:i18n
packages = z3ext.cssregistry
domain = z3ext.cssregistry
@@ -50,12 +49,12 @@
[i18nall]
recipe = buildout_script
-template_dir = ${buildout:directory}/
+template_dir = ${buildout:directory}/scripts/
template = i18nall.in
[i18ncheck]
recipe = buildout_script
-template_dir = ${buildout:directory}/
+template_dir = ${buildout:directory}/scripts/
template = i18ncheck.in
[i18ndude]
Deleted: z3ext.cssregistry/trunk/i18nall.in
===================================================================
--- z3ext.cssregistry/trunk/i18nall.in 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/i18nall.in 2008-10-28 13:14:28 UTC (rev 92655)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-update_egg()
-{
- echo "Start update $@"
-
- bin/i18n_${2}_extract && \
- bin/i18n_${2}_mergeall && \
- msgfmt ${1}/locales/nl/LC_MESSAGES/${2}.po -o ${1}/locales/nl/LC_MESSAGES/${2}.mo --no-hash && \
- msgfmt ${1}/locales/en/LC_MESSAGES/${2}.po -o ${1}/locales/en/LC_MESSAGES/${2}.mo --no-hash
-}
-
-update_egg src/z3ext/cssregistry z3ext && \
Deleted: z3ext.cssregistry/trunk/i18ncheck.in
===================================================================
--- z3ext.cssregistry/trunk/i18ncheck.in 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/i18ncheck.in 2008-10-28 13:14:28 UTC (rev 92655)
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Startup or shutdown buildbot
-
-bin/i18ndude find-untranslated ./ | grep z3ext.cssregistry | less
Copied: z3ext.cssregistry/trunk/scripts/i18nall.in (from rev 92654, z3ext.cssregistry/trunk/i18nall.in)
===================================================================
--- z3ext.cssregistry/trunk/scripts/i18nall.in (rev 0)
+++ z3ext.cssregistry/trunk/scripts/i18nall.in 2008-10-28 13:14:28 UTC (rev 92655)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+update_egg()
+{
+ echo "Start update $@"
+
+ bin/i18n_${2}_extract && \
+ bin/i18n_${2}_mergeall && \
+ msgfmt ${1}/locales/nl/LC_MESSAGES/${2}.po -o ${1}/locales/nl/LC_MESSAGES/${2}.mo --no-hash && \
+ msgfmt ${1}/locales/en/LC_MESSAGES/${2}.po -o ${1}/locales/en/LC_MESSAGES/${2}.mo --no-hash
+}
+
+update_egg src/z3ext/cssregistry z3ext && \
Copied: z3ext.cssregistry/trunk/scripts/i18ncheck.in (from rev 92654, z3ext.cssregistry/trunk/i18ncheck.in)
===================================================================
--- z3ext.cssregistry/trunk/scripts/i18ncheck.in (rev 0)
+++ z3ext.cssregistry/trunk/scripts/i18ncheck.in 2008-10-28 13:14:28 UTC (rev 92655)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Startup or shutdown buildbot
+
+bin/i18ndude find-untranslated ./ | grep z3ext.cssregistry | less
Modified: z3ext.cssregistry/trunk/setup.py
===================================================================
--- z3ext.cssregistry/trunk/setup.py 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/setup.py 2008-10-28 13:14:28 UTC (rev 92655)
@@ -54,11 +54,12 @@
namespace_packages=['z3ext'],
install_requires = ['setuptools',
'zope.schema',
- 'zope.proxy',
+ 'zope.proxy',
'zope.interface',
'zope.component',
- 'zope.i18nmessageid',
- 'zope.configuration',
+ 'zope.i18n',
+ 'zope.i18nmessageid',
+ 'zope.configuration',
'z3c.autoinclude',
'z3c.zrtresource>=1.1.0',
],
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/command.py
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/command.py 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/command.py 2008-10-28 13:14:28 UTC (rev 92655)
@@ -45,7 +45,6 @@
if registry is None:
return text
-
for property in removeAllProxies(registry).values():
text = property.process(text)
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/configlet.py
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/configlet.py 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/configlet.py 2008-10-28 13:14:28 UTC (rev 92655)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""
$Id$
"""
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.pt
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.pt 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.pt 2008-10-28 13:14:28 UTC (rev 92655)
@@ -2,7 +2,7 @@
i18n:domain="z3ext.cssregistry">
<div class="z-topframe" tal:define="props context/keys">
<h1 tal:content="context/__title__">Portal CSS properties</h1>
- <div class="pageDescription" tal:content="context/__description__"></div>
+ <div class="z-page-description" tal:content="context/__description__"></div>
<div class="z-form-field">
<label i18n:translate="">Status</label>
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.py
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.py 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/configletview.py 2008-10-28 13:14:28 UTC (rev 92655)
@@ -16,10 +16,12 @@
$Id$
"""
from zope import interface
+from zope.security.proxy import getObject
+
from z3ext.layout.pagelet import BrowserPagelet
from z3ext.statusmessage.interfaces import IStatusMessage
-from z3ext.cssregistry.property import Property
+from z3ext.cssregistry.property import Property, CSSProperty
from z3ext.cssregistry.registry import registries
from z3ext.cssregistry.interfaces import _, ICSSRegistry
@@ -46,7 +48,8 @@
registry = self.listRegistries()[int(reg)]['registry']
for prop, value in registry.items():
- self.context[prop] = value
+ self.context[prop] = CSSProperty(
+ value.name, value.value, value.description, value.type)
IStatusMessage(request).add(
_(u"CSS Registry has been copied."))
@@ -57,7 +60,7 @@
IStatusMessage(request).add(
_(u"Can't add property with emtpy name."), 'error')
else:
- self.context[name] = Property(
+ self.context[name] = CSSProperty(
name, request.get('form.add.value', ''))
if 'form.remove' in request:
@@ -70,7 +73,7 @@
if key.startswith('prop-'):
key = key[5:]
old = self.context[key]
- property = Property(
+ property = CSSProperty(
old.name, value, old.description, old.type)
self.context[key] = property
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/configure.zcml
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/configure.zcml 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/configure.zcml 2008-10-28 13:14:28 UTC (rev 92655)
@@ -1,5 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
+ xmlns:i18n="http://namespaces.zope.org/i18n"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="z3ext.cssregistry">
@@ -84,4 +85,7 @@
<include file="configlet.zcml" />
+ <!-- translations -->
+ <i18n:registerTranslations directory="locales"/>
+
</configure>
Added: z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/LC_MESSAGES/z3ext.cssregistry.po
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/LC_MESSAGES/z3ext.cssregistry.po (rev 0)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/nl/LC_MESSAGES/z3ext.cssregistry.po 2008-10-28 13:14:28 UTC (rev 92655)
@@ -0,0 +1,154 @@
+##############################################################################
+#
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+msgid ""
+msgstr ""
+"Project-Id-Version: Development/Unknown\n"
+"POT-Creation-Date: Thu Oct 9 22:21:34 2008\n"
+"PO-Revision-Date: 2008-10-28 11:19+0100\n"
+"Last-Translator: F. Kooman <fkooman at tuxed.net>\n"
+"Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: zope/app/locales/extract.py\n"
+
+#: src/z3ext/cssregistry/configlet.zcml:11
+msgid "CSS Properties"
+msgstr "Lettertypen/kleuren aanpassen"
+
+#: src/z3ext/cssregistry/configlet.zcml:11
+msgid "CSS properties registry configuration."
+msgstr "Lettertypen -en kleurenregisterconfiguratie"
+
+#: src/z3ext/cssregistry/configletview.pt:15
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: src/z3ext/cssregistry/configletview.pt:25
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: src/z3ext/cssregistry/configletview.pt:30
+msgid "Property"
+msgstr "Eigenschap"
+
+#: src/z3ext/cssregistry/configletview.pt:44
+msgid "Save"
+msgstr "Opslaan"
+
+#: src/z3ext/cssregistry/configletview.pt:46
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: src/z3ext/cssregistry/configletview.pt:51
+msgid "There are no any defined properties."
+msgstr "Er zijn geen gedefinieerde eigenschappen."
+
+#: src/z3ext/cssregistry/configletview.pt:57
+msgid "Add property"
+msgstr "Eigenschap toevoegen"
+
+#: src/z3ext/cssregistry/configletview.pt:76
+msgid "Add"
+msgstr "Toevoegen"
+
+#: src/z3ext/cssregistry/configletview.pt:8
+msgid "Status"
+msgstr "Status"
+
+#: src/z3ext/cssregistry/configletview.pt:83
+msgid "Copy/Update properties from existent registries"
+msgstr "Kopieer/Update eigenschappen van bestaande registers"
+
+#: src/z3ext/cssregistry/configletview.pt:87
+msgid "Registry"
+msgstr "Register"
+
+#: src/z3ext/cssregistry/configletview.pt:96
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: src/z3ext/cssregistry/configletview.py:34
+msgid "Without name"
+msgstr "Zonder naam"
+
+#: src/z3ext/cssregistry/configletview.py:52
+msgid "CSS Registry has been copied."
+msgstr "Lettertypen -en kleurenregister is gekopieerd."
+
+#: src/z3ext/cssregistry/configletview.py:58
+msgid "Can't add property with emtpy name."
+msgstr "Kan geen eigenschap zonder naam toevoegen."
+
+#: src/z3ext/cssregistry/configletview.py:66
+msgid "Properties have been removed."
+msgstr "Eigenschappen zijn verwijderd."
+
+#: src/z3ext/cssregistry/configletview.py:83
+msgid "Properties have been changed."
+msgstr "Eigenschappen zijn gewijzigd."
+
+#: src/z3ext/cssregistry/interfaces.py:30
+#: src/z3ext/cssregistry/interfaces.py:45
+msgid "Name"
+msgstr "Naam"
+
+#: src/z3ext/cssregistry/interfaces.py:31
+msgid "CSS Registry name"
+msgstr "Lettertypen -en kleurenregisternaam"
+
+#: src/z3ext/cssregistry/interfaces.py:36
+msgid "Title"
+msgstr "Titel"
+
+#: src/z3ext/cssregistry/interfaces.py:37
+msgid "CSS Registry title"
+msgstr "Lettertypen -en kleurenregistertitel"
+
+#: src/z3ext/cssregistry/interfaces.py:46
+#: src/z3ext/cssregistry/configletview.pt:60
+msgid "Property name"
+msgstr "Eigenschapsnaam"
+
+#: src/z3ext/cssregistry/interfaces.py:50
+msgid "Description"
+msgstr "Omschrijving"
+
+#: src/z3ext/cssregistry/interfaces.py:51
+msgid "Property description"
+msgstr "Omschrijving van eigenschap"
+
+#: src/z3ext/cssregistry/interfaces.py:55
+#: src/z3ext/cssregistry/configletview.pt:31
+#: src/z3ext/cssregistry/configletview.pt:68
+msgid "Value"
+msgstr "Waarde"
+
+#: src/z3ext/cssregistry/interfaces.py:56
+msgid "Property value"
+msgstr "Waarde van eigenschap"
+
+#: src/z3ext/cssregistry/interfaces.py:60
+msgid "Type"
+msgstr "Type"
+
+#: src/z3ext/cssregistry/interfaces.py:61
+msgid "Property type. (color, font, size)"
+msgstr "Eigenschaptype. (kleur, lettertype, grootte)"
+
+#: src/z3ext/cssregistry/interfaces.py:82
+#: src/z3ext/cssregistry/configletview.pt:11
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
Added: z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/LC_MESSAGES/z3ext.cssregistry.po
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/LC_MESSAGES/z3ext.cssregistry.po (rev 0)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/locales/ru/LC_MESSAGES/z3ext.cssregistry.po 2008-10-28 13:14:28 UTC (rev 92655)
@@ -0,0 +1,154 @@
+##############################################################################
+#
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+msgid ""
+msgstr ""
+"Project-Id-Version: Development/Unknown\n"
+"POT-Creation-Date: Thu Oct 9 22:21:34 2008\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: zope/app/locales/extract.py\n"
+
+#: src/z3ext/cssregistry/configlet.zcml:11
+msgid "CSS Properties"
+msgstr ""
+
+#: src/z3ext/cssregistry/configlet.zcml:11
+msgid "CSS properties registry configuration."
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:15
+msgid "Disabled"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:25
+msgid "Properties"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:30
+msgid "Property"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:44
+msgid "Save"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:46
+msgid "Remove"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:51
+msgid "There are no any defined properties."
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:57
+msgid "Add property"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:76
+msgid "Add"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:8
+msgid "Status"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:83
+msgid "Copy/Update properties from existent registries"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:87
+msgid "Registry"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.pt:96
+msgid "Copy"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.py:34
+msgid "Without name"
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.py:52
+msgid "CSS Registry has been copied."
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.py:58
+msgid "Can't add property with emtpy name."
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.py:66
+msgid "Properties have been removed."
+msgstr ""
+
+#: src/z3ext/cssregistry/configletview.py:83
+msgid "Properties have been changed."
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:30
+#: src/z3ext/cssregistry/interfaces.py:45
+msgid "Name"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:31
+msgid "CSS Registry name"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:36
+msgid "Title"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:37
+msgid "CSS Registry title"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:46
+#: src/z3ext/cssregistry/configletview.pt:60
+msgid "Property name"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:50
+msgid "Description"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:51
+msgid "Property description"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:55
+#: src/z3ext/cssregistry/configletview.pt:31
+#: src/z3ext/cssregistry/configletview.pt:68
+msgid "Value"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:56
+msgid "Property value"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:60
+msgid "Type"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:61
+msgid "Property type. (color, font, size)"
+msgstr ""
+
+#: src/z3ext/cssregistry/interfaces.py:82
+#: src/z3ext/cssregistry/configletview.pt:11
+msgid "Enabled"
+msgstr ""
+
Modified: z3ext.cssregistry/trunk/src/z3ext/cssregistry/registry.py
===================================================================
--- z3ext.cssregistry/trunk/src/z3ext/cssregistry/registry.py 2008-10-28 12:11:57 UTC (rev 92654)
+++ z3ext.cssregistry/trunk/src/z3ext/cssregistry/registry.py 2008-10-28 13:14:28 UTC (rev 92655)
@@ -55,7 +55,7 @@
def __delitem__(self, key):
del self.properties[key]
-
+
def get(self, key, default=None):
return self.properties.get(key, default)
More information about the Checkins
mailing list