[Checkins] SVN: z3ext.controlpanel/trunk/ - Fixed configlet storage if ISite doesn't exists

Nikolay Kim fafhrd at datacom.kz
Wed Oct 22 03:27:04 EDT 2008


Log message for revision 92459:
  - Fixed configlet storage if ISite doesn't exists
  
  - Updated translations: nl, ru
  
  
  

Changed:
  U   z3ext.controlpanel/trunk/CHANGES.txt
  U   z3ext.controlpanel/trunk/buildout.cfg
  U   z3ext.controlpanel/trunk/scripts/i18nall.in
  A   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/
  A   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/
  A   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.mo
  A   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.mo
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2008-10-22 07:27:01 UTC (rev 92459)
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+1.3.2 (2008-10-22)
+------------------
+
+- Fixed configlet storage if ISite doesn't exists
+
+- Updated translations: nl, ru
+
+
 1.3.1 (2008-10-07)
 ------------------
 

Modified: z3ext.controlpanel/trunk/buildout.cfg
===================================================================
--- z3ext.controlpanel/trunk/buildout.cfg	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/buildout.cfg	2008-10-22 07:27:01 UTC (rev 92459)
@@ -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.controlpanel
 domain = z3ext.controlpanel

Modified: z3ext.controlpanel/trunk/scripts/i18nall.in
===================================================================
--- z3ext.controlpanel/trunk/scripts/i18nall.in	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/scripts/i18nall.in	2008-10-22 07:27:01 UTC (rev 92459)
@@ -4,10 +4,10 @@
 {
     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
+    bin/i18nextract && \
+    bin/i18nmergeall && \
+    msgfmt ${1}/locales/ru/LC_MESSAGES/${2}.po -o ${1}/locales/ru/LC_MESSAGES/${2}.mo --no-hash && \
+    msgfmt ${1}/locales/nl/LC_MESSAGES/${2}.po -o ${1}/locales/nl/LC_MESSAGES/${2}.mo --no-hash
 }
 
-update_egg src/z3ext/controlpanel z3ext && \
+update_egg src/z3ext/controlpanel z3ext.controlpanel;

Added: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.mo
===================================================================
(Binary files differ)


Property changes on: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.mo
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po	                        (rev 0)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po	2008-10-22 07:27:01 UTC (rev 92459)
@@ -0,0 +1,63 @@
+###############################################################################
+#
+# 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: Wed Oct 22 13:17:55 2008\n"
+"PO-Revision-Date: 2008-10-14 17:25+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/controlpanel/browser/category.pt:8
+msgid "There are no configlets in this category."
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/configure.zcml:24
+msgid "View"
+msgstr "Bekijk"
+
+#: src/z3ext/controlpanel/configlettype.py:193
+msgid "Field is readonly"
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:42
+msgid "This area allows you to configure system."
+msgstr "In dit gebied kunt u het systeem configureren."
+
+#: src/z3ext/controlpanel/configure.zcml:42
+msgid "System configuration"
+msgstr "Systeemconfiguratie"
+
+#: src/z3ext/controlpanel/configure.zcml:50
+msgid "User interface configuration"
+msgstr "Uiterlijk configuratie"
+
+#: src/z3ext/controlpanel/configure.zcml:50
+msgid "This area allows you to configure portal look&feel."
+msgstr "Configureren uiterlijk van uw website "
+
+#: src/z3ext/controlpanel/configure.zcml:9
+msgid "Configure control panel's configlets."
+msgstr "Configure bedieningspaneel configlets."
+
+#: src/z3ext/controlpanel/root.py:36
+#: src/z3ext/controlpanel/browser/configure.zcml:53
+#: src/z3ext/controlpanel/browser/configure.zcml:60
+msgid "System settings"
+msgstr "Systeeminstellingen"
+

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.mo
===================================================================
(Binary files differ)

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po	2008-10-22 07:27:01 UTC (rev 92459)
@@ -1,4 +1,4 @@
-##############################################################################
+# #############################################################################
 #
 # Copyright (c) 2003-2004 Zope Corporation and Contributors.
 # All Rights Reserved.
@@ -10,12 +10,12 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-##############################################################################
+# #############################################################################
 msgid ""
 msgstr ""
 "Project-Id-Version: z3ext.controlpanel\n"
-"POT-Creation-Date: Tue Oct  7 18:55:43 2008\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: Wed Oct 22 13:17:55 2008\n"
+"PO-Revision-Date: 2008-10-22 13:22+0600\n"
 "Last-Translator: Nikolay Kim <fafhrd91 at gmail.com>\n"
 "Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
 "MIME-Version: 1.0\n"
@@ -35,23 +35,23 @@
 msgid "Field is readonly"
 msgstr "Поле только для чтения"
 
-#: src/z3ext/controlpanel/configure.zcml:41
+#: src/z3ext/controlpanel/configure.zcml:42
 msgid "This area allows you to configure system."
-msgstr ""
+msgstr "Конфиглеты в этой категории позволяют вам конфигурировать систему."
 
-#: src/z3ext/controlpanel/configure.zcml:41
+#: src/z3ext/controlpanel/configure.zcml:42
 msgid "System configuration"
 msgstr "Конфигурация системы"
 
-#: src/z3ext/controlpanel/configure.zcml:49
+#: src/z3ext/controlpanel/configure.zcml:50
 msgid "User interface configuration"
 msgstr "Конфигурация пользовательского интерфейса"
 
-#: src/z3ext/controlpanel/configure.zcml:49
+#: src/z3ext/controlpanel/configure.zcml:50
 msgid "This area allows you to configure portal look&feel."
-msgstr ""
+msgstr "Конфиглеты в этой категории позволяют вам конфигурировать как выглядит сайт."
 
-#: src/z3ext/controlpanel/configure.zcml:8
+#: src/z3ext/controlpanel/configure.zcml:9
 msgid "Configure control panel's configlets."
 msgstr ""
 

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot	2008-10-22 07:27:01 UTC (rev 92459)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Tue Oct  7 18:55:43 2008\n"
+"POT-Creation-Date: Wed Oct 22 13:26:20 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"
@@ -35,23 +35,23 @@
 msgid "Field is readonly"
 msgstr ""
 
-#: src/z3ext/controlpanel/configure.zcml:41
+#: src/z3ext/controlpanel/configure.zcml:42
 msgid "This area allows you to configure system."
 msgstr ""
 
-#: src/z3ext/controlpanel/configure.zcml:41
+#: src/z3ext/controlpanel/configure.zcml:42
 msgid "System configuration"
 msgstr ""
 
-#: src/z3ext/controlpanel/configure.zcml:49
+#: src/z3ext/controlpanel/configure.zcml:50
 msgid "User interface configuration"
 msgstr ""
 
-#: src/z3ext/controlpanel/configure.zcml:49
+#: src/z3ext/controlpanel/configure.zcml:50
 msgid "This area allows you to configure portal look&feel."
 msgstr ""
 
-#: src/z3ext/controlpanel/configure.zcml:8
+#: src/z3ext/controlpanel/configure.zcml:9
 msgid "Configure control panel's configlets."
 msgstr ""
 

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py	2008-10-21 21:55:43 UTC (rev 92458)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py	2008-10-22 07:27:01 UTC (rev 92459)
@@ -140,8 +140,14 @@
 @interface.implementer(IConfigletData)
 def getConfigletData(configlet):
     site = getSite()
-    storage = IConfigletDataStorage(site.getSiteManager())
 
+    storage = None
+    if site is not None:
+        storage = IConfigletDataStorage(site.getSiteManager())
+
+    if storage is None:
+        return IConfigletDataFactory(configlet)()
+
     if configlet.__id__ not in storage:
         data = IConfigletDataFactory(configlet)()
         event.notify(ObjectCreatedEvent(data))



More information about the Checkins mailing list