Cannot translate "%(radio)s Show" in diff_options.html

[Jun Omae]

The following html is in source:/trunk/trac/templates/diff_options.html@15484:36,39#L24​:

<label>
  <input type="radio" name="contextall" value="0" checked="checked"/>
  Show
</label>
<label>
  <input type="text" name="contextlines" id="contextlines" size=" maxlength=" value="2"/>
  lines around each change
</label>

%(radio)s Show and %(text)s lines around each change are extracted as separated messages. I cannot translate those messages due to separating.

I'd like to be extracted one message:

trac/templates/diff_options.html

@@ -23 +23 @@
 </select>
 <div class="field">
   # set input_radio
-  <input type="radio" name="contextall" value="0"
+  <input id="contextall-0" type="radio" name="contextall" value="0"
          ${{"checked": not diff.options.contextall}|htmlattr}/>
   # endset
   # set input_text
@@ -32 +32 @@
          value="${'all' if diff.options.contextlines is lessthan(0) else
                 diff.options.contextlines}"/>
   # endset
-  # set n_context_lines
-  <label>${tag_("%(text)s lines around each change", text=input_text)}</label>
-  # endset
-  # set radio_button_show
-  <label>${tag_("%(radio)s Show", radio=input_radio)}</label>
-  # endset
-  # trans radio_button_show, n_context_lines
-
-  ${radio_button_show} ${n_context_lines}
-
-  # endtrans
+  <label for="contextall-0">
+    ${tag_("%(radio)s Show %(text)s lines around each change",
+           radio=input_radio, text=input_text)}
+  </label>
   <br/>
   <label><input type="radio" name="contextall" value="1"
                 ${{"checked": diff.options.contextall}|htmlattr}/>

[Ryan J Ollos]

I'd like to do the 1.3.2 release this weekend. Would it be possible to push the fix in the next day or so?

[Jun Omae]

I'm going to push the changes.

[Jun Omae]

Committed in [16134] revised with trans block rather than tag_.