"View log starting at <input /> and back to <input />" is separated in extracted messages

[Jun Omae]

In trac/versioncontrol/templates/revisionlog.html, the following is extracted to three messages.

          <label>
            View log starting at <input type="text" id="rev" name="rev" value="..." size="5" />
          </label>
          and
          <label>
            back to <input type="text" id="stop_rev" name="stop_rev" value="" size="5" />
          </label>

#: trac/versioncontrol/templates/revisionlog.html:93
#, python-format
msgid "View log starting at %(start)s"
msgstr ""

#: trac/versioncontrol/templates/revisionlog.html:98
#, python-format
msgid "back to %(end)s"
msgstr ""

#: trac/versioncontrol/templates/revisionlog.html:101
#, python-format
msgid "%(start_label)s and %(end_label)s"
msgstr ""

I think we should avoid to separate messages.

trac/versioncontrol/templates/revisionlog.html

@@ -88 +88 @@
           <input type="text" id="stop_rev" name="stop_rev"
                  value="${stop_rev}" size="5" />
           # endset
-          # set start_label
-          <label>
-            ${tag_("View log starting at %(start)s", start=input_start)}
-          </label>
-          # endset
-          # set end_label
-          <label>
-            ${tag_("back to %(end)s", end=input_end)}
-          </label>
-          # endset
-          # trans start_label, end_label
+          # trans start=input_start, end=input_end
 
-          ${start_label} and ${end_label}
+          <label>View log starting at ${start}</label> and <label>back to ${end}</label>
 
           # endtrans
           <br />

[Ryan J Ollos]

Feel free to target to milestone:1.3.2 if you like. I won't get to the release until next weekend.

[Jun Omae]

Okay. Retargeted to 1.3.2. I'll push the changes tonight.

Also, the same issue exists in timeline.html, 4 messages are extracted from the following.

<label>
  View changes from <input type="text" id="fromdate" class="trac-datepicker" size="10" name="from" value="" />
</label>
<label>
  going back <input type="text" size="3" name="daysback" value="3" />
</label>
<label>
  by author <input type="text" size="16" name="authors" value="" />
</label>

#: trac/timeline/templates/timeline.html:48
#, python-format
msgid "View changes from %(fromdate)s"
msgstr ""

#: trac/timeline/templates/timeline.html:54
#, python-format
msgid "going back %(daysback)s days"
msgstr ""

#: trac/timeline/templates/timeline.html:59
#, python-format
msgid "by author %(authors)s"
msgstr ""

#: trac/timeline/templates/timeline.html:62
#, python-format
msgid "%(view_from_label)s <br /> %(back_to_label)s <br /> %(by_author_label)s"
msgstr ""

Proposed changes:

trac/timeline/templates/timeline.html

@@ -43 +43 @@
           # set authors_input
           <input type="text" size="16" name="authors" value="${authors}" />
           # endset
-          # set view_from_label
-          <label>
-            ${tag_("View changes from %(fromdate)s",
-            fromdate=fromdate_input)}
-          </label>
-          # endset
-          # set back_to_label
-          <label>
-            ${tag_("going back %(daysback)s days", daysback=daysback_input)}
-          </label>
-          # endset
-          # set by_author_label
-          <label>
-            ${tag_("by author %(authors)s", authors=authors_input)}
-          </label>
-          # endset
-          # trans view_from_label, back_to_label, by_author_label
+          # trans fromdate=fromdate_input, daysback=daysback_input, authors=authors_input
 
-          ${view_from_label} <br /> ${back_to_label} <br /> ${by_author_label}
+          <label>View changes from ${fromdate}</label>
+          <br />
+          <label>going back ${daysback} days</label>
+          <br />
+          <label>by author ${authors}</label>
 
           # endtrans
         </div>

[Christian Boos]

Well, I did it that way in order to avoid introducing markup in the catalogs. Obviously, if we start to allow or encourage that, the templates can be simplified, but then we should probably also add some markup validation for messages in the translations, a bit like we did for Genshi nesting of groups (cf. r11230).

[Jun Omae]

Committed in [16138].

Validating messages with markups in translations sounds good. I try to improve check_catalog command.

[Jun Omae]

Proposed changes in [f3e7bbc70/jomae.git] (jomae.git@t12869).

Example:

$ make check-ja
check-ja: python  setup.py  check_catalog -l ja  check_catalog_js -l ja  check_catalog_tracini -l ja
running check_catalog
checking catalog trac/locale/ja/LC_MESSAGES/messages.po
trac/locale/ja/LC_MESSAGES/messages.po:186: mismatched "strong" tag between msgid and msgstr (1 != 0)
trac/locale/ja/LC_MESSAGES/messages.po:186: mismatched "b" tag between msgid and msgstr (0 != 1)
trac/locale/ja/LC_MESSAGES/messages.po:192: mismatched tag: line 2, column 16
running check_catalog_js
checking catalog trac/locale/ja/LC_MESSAGES/messages-js.po
running check_catalog_tracini
checking catalog trac/locale/ja/LC_MESSAGES/tracini.po
msgfmt OK
$ 
$ make check-zh_CN
check-zh_CN: python  setup.py  check_catalog -l zh_CN  check_catalog_js -l zh_CN  check_catalog_tracini -l zh_CN
running check_catalog
checking catalog trac/locale/zh_CN/LC_MESSAGES/messages.po
trac/locale/zh_CN/LC_MESSAGES/messages.po:5763: not well-formed (invalid token): line 2, column 23
trac/locale/zh_CN/LC_MESSAGES/messages.po:6062: mismatched "br" tag between msgid and msgstr (0 != 1)
running check_catalog_js
checking catalog trac/locale/zh_CN/LC_MESSAGES/messages-js.po
running check_catalog_tracini
checking catalog trac/locale/zh_CN/LC_MESSAGES/tracini.po
trac/locale/zh_CN/LC_MESSAGES/messages.po:9: warning: header field 'Language' missing in header
trac/locale/zh_CN/LC_MESSAGES/messages-js.po:7: warning: header field 'Language' missing in header
trac/locale/zh_CN/LC_MESSAGES/tracini.po:7: warning: header field 'Language' missing in header
msgfmt OK

[Ryan J Ollos]

Looks good to me.

[Jun Omae]

Thanks. Committed in [16154].