Changeset 9456

Timestamp:

Apr 10, 2010, 10:22:40 PM (13 years ago)

Author:

Christian Boos

Message:

Follow-up to r9454, Genshi extraction of gettext expressions won't work when those calls are located within an i18n:msg. The obvious workaround of moving these calls outside within a py:with won't work either (​#G380).

Fortunately, when using a <?python ?> PI, it works…

Location:

trunk/trac

Files:

• locale/messages.pot (modified) (3 diffs)
• wiki/templates/wiki_view.html (modified) (1 diff)

trunk/trac/locale/messages.pot

@@ -9 +9 @@
 "Project-Id-Version: Trac 0.12\n"
 "Report-Msgid-Bugs-To: trac-dev@googlegroups.com\n"
-"POT-Creation-Date: 2010-04-10 19:44+0200\n"
+"POT-Creation-Date: 2010-04-10 22:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -5168 +5168 @@
 
 #: trac/wiki/templates/wiki_rename.html:32
-#: trac/wiki/templates/wiki_view.html:105
+#: trac/wiki/templates/wiki_view.html:108
 msgid "Rename page"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:14 trac/wiki/templates/wiki_view.html:81
+#: trac/wiki/templates/wiki_view.html:14 trac/wiki/templates/wiki_view.html:84
 msgid "Edit this page"
 msgstr ""
@@ -5185 +5185 @@
 #: trac/wiki/templates/wiki_view.html:47
 #, python-format
-msgid ""
-"[1:\n"
-"              Last modified] %(reldate)s ago"
-msgstr ""
-
-#: trac/wiki/templates/wiki_view.html:58
+msgid "Version %(version)s by %(author)s: %(comment)s"
+msgstr ""
+
+#: trac/wiki/templates/wiki_view.html:47
+#, python-format
+msgid "Version %(version)s by %(author)s"
+msgstr ""
+
+#: trac/wiki/templates/wiki_view.html:54
+#, python-format
+msgid "[1:Last modified] %(reldate)s ago"
+msgstr ""
+
+#: trac/wiki/templates/wiki_view.html:61
 msgid "The page"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:58
+#: trac/wiki/templates/wiki_view.html:61
 msgid "does not exist. You can create it here."
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:60
+#: trac/wiki/templates/wiki_view.html:63
 msgid "You could also create the same page higher in the hierarchy:"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:84
+#: trac/wiki/templates/wiki_view.html:87
 msgid "Create this page"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:86
+#: trac/wiki/templates/wiki_view.html:89
 msgid "Using the template:"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:89
+#: trac/wiki/templates/wiki_view.html:92
 msgid "(blank page)"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:114
+#: trac/wiki/templates/wiki_view.html:117
 msgid "Delete this version"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:116
+#: trac/wiki/templates/wiki_view.html:119
 msgid "Delete page"
 msgstr ""
 
-#: trac/wiki/templates/wiki_view.html:125
+#: trac/wiki/templates/wiki_view.html:128
 msgid "The following pages have a name similar to this page, and may be related:"
 msgstr ""

trunk/trac/wiki/templates/wiki_view.html

@@ -45 +45 @@
       <div class="wikipage searchable" py:choose="" xml:space="preserve">
         <py:when test="page.exists">
+          <?python
+            last_modification = (page.comment and 
+                 _('Version %(version)s by %(author)s: %(comment)s',
+                   version=page.version, author=format_author(page.author), comment=page.comment) or
+                 _('Version %(version)s by %(author)s',
+                   version=page.version, author=format_author(page.author)))
+          ?>
           <div py:if="not version" class="trac-modifiedby" i18n:msg="reldate">
             <a href="${href.wiki(page.name, action='diff', version=page.version)}"
-               title="${page.comment and _('Version %(version)s by %(author)s: %(comment)s',
-                                           version=page.version, author=format_author(page.author), comment=page.comment)
-                                     or _('Version %(version)s by %(author)s',
-                                          version=page.version, author=format_author(page.author))}">
-              Last modified</a> ${dateinfo(page.time)} ago
+               title="$last_modification">Last modified</a> ${dateinfo(page.time)} ago
           </div>
           <div id="wikipage" py:content="wiki_to_html(context, text)" />