Test failure with trac.wiki.tests.functional.TestWikiDelete

[Ryan J Ollos]

Failure seen on ​AppVeyor and ​Travis CI.

======================================================================
FAIL: runTest (trac.wiki.tests.functional.TestWikiDelete)
Delete a wiki page.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/travis/build/edgewall/trac/trac/wiki/tests/functional.py", line 76, in runTest
    r'version=2">all 2 versions</a>\s+of the page' % name)
  File "/home/travis/build/edgewall/trac/trac/tests/functional/better_twill.py", line 224, in better_find
    (to_unicode(e), filename))
TwillAssertionError: no match to 'Removing\s+<a href="/wiki/BagpipeTongue\?action=history&amp;version=2">all 2 versions</a>\s+of the page' at file:///home/travis/build/edgewall/trac/testenv/trac/log/TestWikiDelete.html
----------------------------------------------------------------------
Ran 222 tests in 677.196s
FAILED (failures=1)
make: *** [functional-test] Error 1

[Jun Omae]

ngettext() is used in wiki_delete.html like this:

 73           # set num_versions
 74           <a href="${history_href}">${
 75             ngettext("%(num)d version", "%(num)d versions", num=num_versions)
 76           }</a>
 77           # endset
...
131           #   set num_versions
132           <a href="${history_href}">${
133             ngettext("%(num)d version", "all %(num)d versions", num=num_versions)
134             }</a>
135           #   endset

extract_messages command extracts "%(num)d version" and "%(num)d versions" from the above but "all %(num)d versions" is not extracted.

#: trac/wiki/templates/wiki_delete.html:75
#: trac/wiki/templates/wiki_delete.html:133
#, python-format
msgid "%(num)d version"
msgid_plural "%(num)d versions"
msgstr[0] ""
msgstr[1] ""

[Jun Omae]

extract_messages command's behavior is right. msgid_plural is used only when messages catalog is not found for active language. msgid is used as a key and must be unique without msgid_plural. Therefore, usage of ngettext in wiki_delete.html is wrong.

trac/wiki/templates/wiki_delete.html

@@ -130 +130 @@
           # else:
           #   set num_versions
           <a href="${history_href}">${
-            ngettext("%(num)d version", "all %(num)d versions", num=num_versions)
+            ngettext("%(num)d version", "%(num)d versions", num=num_versions)
             }</a>
           #   endset
           #   trans num_versions, created = first_modified, modified = last_modified
 
-          Removing ${num_versions} of the page, which was created
+          Removing all ${num_versions} of the page, which was created
           ${created} and last modified ${modified}.
 
           #   endtrans

trac/wiki/tests/functional.py

@@ -72 +72 @@
         tc.formvalue('delete', 'action', 'delete')
         tc.submit('delete_page')
         tc.find("Are you sure you want to completely delete this page?")
-        tc.find(r'Removing\s+<a href="/wiki/%s\?action=history&amp;'
-                r'version=2">all 2 versions</a>\s+of the page' % name)
+        tc.find(r'Removing all\s+<a href="/wiki/%s\?action=history&amp;'
+                r'version=2">2 versions</a>\s+of the page' % name)
         tc.notfind("The following attachments will also be deleted:")
         tc.submit('delete', 'delete-confirm')
         tc.find("The page %s has been deleted." % name)

[Jun Omae]

Committed in [16076].