[Zope3-checkins] SVN: Zope3/trunk/ Improved bug 199: ZPTPage macro expansion Changed label text to match the

Christian Theune ct at gocept.com
Fri Dec 2 15:41:17 EST 2005 

Log message for revision 40507:
  Improved bug 199: ZPTPage macro expansion Changed label text to match the
  corresponding label in Zope 2 and activated the name spaces for macro expansion
  in read().
  

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/en/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.mo
  U   Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.po
  U   Zope3/trunk/src/zope/app/locales/zope.pot
  U   Zope3/trunk/src/zope/app/zptpage/interfaces.py
  U   Zope3/trunk/src/zope/pagetemplate/pagetemplate.py

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/doc/CHANGES.txt	2005-12-02 20:41:16 UTC (rev 40507)
@@ -162,6 +162,10 @@
 
     Bug Fixes
 
+      - Improved bug 199: ZPTPage macro expansion
+        Changed label text to match the corresponding label in Zope 2 and
+        activated the name spaces for macro expansion in read().
+
       - Fixed bug 489: Template Parse Errors Do Not Report the Filename
 
       - Fixed bug 485: ServerControlForm.html / Restart, Shutdown does not

Modified: Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/de/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -6317,12 +6317,12 @@
 msgstr "Der Quelltext der Schablone."
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr "Makros anzeigen"
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
-msgstr "Makros aufklappen, so dass alle im Code angezeigt werden."
+msgid "Expand macros so that they all are shown in the code."
+msgstr "Makros beim Bearbeiten im Code anzeigen."
 
 #: src/zope/app/zptpage/interfaces.py:48
 msgid "Evaluate Inline Code"

Modified: Zope3/trunk/src/zope/app/locales/en/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/es/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -6057,11 +6057,11 @@
 msgstr "El codigo fuente de la plantilla de página."
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr "Ampliar macros"
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
+msgid "Expand macros so that they all are shown in the code."
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:48

Modified: Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/fr/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -6291,12 +6291,12 @@
 msgstr "La source de la Page Formatée."
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr "Etendre Macros"
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
-msgstr "Etendre des Macros afin qu'elles soient toutes affichées dans le code."
+msgid "Expand macros so that they all are shown in the code."
+msgstr "Etendre des macros afin qu'elles soient toutes affichées dans le code."
 
 #: src/zope/app/zptpage/interfaces.py:48
 msgid "Evaluate Inline Code"

Modified: Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/it/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -6351,12 +6351,12 @@
 msgstr "Sorgente della Page Template"
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr "Espandi le macro"
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
-msgstr "Espandi le Macro cosi che siano mostrate interamente nel codice."
+msgid "Expand macros so that they all are shown in the code."
+msgstr "Espandi le macro cosi che siano mostrate interamente nel codice."
 
 #: src/zope/app/zptpage/interfaces.py:48
 msgid "Evaluate Inline Code"

Modified: Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/pt_BR/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -5978,11 +5978,11 @@
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
+msgid "Expand macros so that they all are shown in the code."
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:48

Modified: Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.mo
===================================================================
(Binary files differ)

Modified: Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.po
===================================================================
--- Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.po	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/ru/LC_MESSAGES/zope.po	2005-12-02 20:41:16 UTC (rev 40507)
@@ -6238,11 +6238,11 @@
 msgstr "Исходный текст шаблона страницы."
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr "Подставлять макро-определения"
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
+msgid "Expand macros so that they all are shown in the code."
 msgstr "Подставлять макро-определения показывая их в коде."
 
 #: src/zope/app/zptpage/interfaces.py:48

Modified: Zope3/trunk/src/zope/app/locales/zope.pot
===================================================================
--- Zope3/trunk/src/zope/app/locales/zope.pot	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/locales/zope.pot	2005-12-02 20:41:16 UTC (rev 40507)
@@ -5820,11 +5820,11 @@
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:41
-msgid "Expand macros"
+msgid "Expand macros when editing"
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:42
-msgid "Expand Macros so that they all are shown in the code."
+msgid "Expand macros so that they all are shown in the code."
 msgstr ""
 
 #: src/zope/app/zptpage/interfaces.py:48

Modified: Zope3/trunk/src/zope/app/zptpage/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/interfaces.py	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/app/zptpage/interfaces.py	2005-12-02 20:41:16 UTC (rev 40507)
@@ -38,8 +38,8 @@
         required=True)
 
     expand = Bool(
-        title=_("Expand macros"),
-        description=_("Expand Macros so that they all are shown in the "
+        title=_("Expand macros when editing"),
+        description=_("Expand macros so that they all are shown in the "
                       "code."),
         default=False,
         required=True)

Modified: Zope3/trunk/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- Zope3/trunk/src/zope/pagetemplate/pagetemplate.py	2005-12-02 20:35:44 UTC (rev 40506)
+++ Zope3/trunk/src/zope/pagetemplate/pagetemplate.py	2005-12-02 20:41:16 UTC (rev 40507)
@@ -160,7 +160,7 @@
                 # This gets called, if macro expansion is turned on.
                 # Note that an empty dictionary is fine for the context at
                 # this point, since we are not evaluating the template. 
-                return self.pt_render({}, source=1)
+                return self.pt_render(self.pt_getContext(self, None), source=1)
             except:
                 return ('%s\n Macro expansion failed\n %s\n-->\n%s' %
                         (_error_start, "%s: %s" % sys.exc_info()[:2],

More information about the Zope3-Checkins mailing list