451804 - The word "Platform" is hard coded; not all pages use field_descs.rep_platform

Status: RESOLVED FIXED

(Bugzilla :: User Interface, defect)

Description

[Craig Sebenik]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.10) Gecko/20070223 CentOS/1.5.0.10-0.1.el4.centos Firefox/1.5.0.10
Build Identifier: 

Several files have "Platform" hard coded in the HTML:

/en/default/list/edit-multiple.html.tmpl
/en/default/pages/fields.html.tmpl
/en/default/pages/quicksearchhack.html.tmpl
/en/default/bug/create/create.html.tmpl
/en/default/bug/create/create-guided.html.tmpl
/en/default/bug/edit.html.tmpl

All references to "Platform" should be replaced with:
    [% field_descs.rep_platform FILTER html %]




Reproducible: Always

Steps to Reproduce:
1.
2.
3.

Comment 1

[Craig Sebenik]

The following file has already been fixed:
  /en/default/bug/create/create.html.tmpl

That leaves these to be modified:
  /en/default/list/edit-multiple.html.tmpl
  /en/default/pages/fields.html.tmpl
  /en/default/pages/quicksearchhack.html.tmpl
  /en/default/bug/create/create-guided.html.tmpl
  /en/default/bug/edit.html.tmpl

Comment 2

[Craig Sebenik]

Attachment: v1

The word "Platform" (or sometimes "Hardware") has been replaced with "field_descs.rep_platform".

This is the simplest way to fix the bug. Other, more involved methods could easily be used, but I am trying to change as few things at once as possible. :)

Comment 3

[Max Kanat-Alexander]

Comment on attachment 356843 [details] [diff] [review]
v1

>Index: template/en/default/bug/create/create-guided.html.tmpl
> [% PROCESS global/variables.none.tmpl %]
>+[% PROCESS "global/field-descs.none.tmpl" %]

  Remove variables.none.

>Index: template/en/default/global/field-descs.none.tmpl
>+                   "rep_platform"            => "NEW Hardware",

  Looks like you left in some debugging code.

Comment 4

[A. Shimono [:himorin]]

Attachment: patch for 3.5/trunk

Comment 5

[Frédéric Buclin]

Comment on attachment 394550 [details] [diff] [review]
patch for 3.5/trunk

Works fine. Only a few things to fix:


>Index: search/form.html.tmpl

>+            <label for="rep_platform" accesskey="h">[% field_descs.rep_platform FILTER html %] (<u>H</u>)</label>:

Don't write (<u>H</u>).



>Index: whine/mail.txt.tmpl

>+  [% field_descs.rep_platform FILTER html %]: [%+ bug.rep_platform %]

Two things:
- It's a txt file, so you shouldn't use FILTER html here. No filtering at all.
- The directive must start with [%+ , else it's appended to the previous line (run ./whine.pl and see yourself).


Also, when you display the Hardware column in buglist, "Plt" for "Platform" is displayed. We should replace it by "HW" I'd say (similar to OS).

Comment 7

[Matt Selsky [:selsky]]

Attachment: Patch for trunk

Patch updated as per comments and to match trunk.

Should I add another variable to deal with the plural form of platform in template/en/default/pages/bug-writing.html.tmpl?

Comment 8

[Frédéric Buclin]

Comment on attachment 536248 [details] [diff] [review]
Patch for trunk

Your patch doesn't apply cleanly on top of Bugzilla 4.1.3. Also, [% field_descs.foo %] no longer requires [% PROCESS global/field-descs.none.tmpl %]; field_descs is now a variable defined in Template.pm. (Also, FYI only, you must quote the path to the template, because it contains a dash.)

Comment 9

[Frédéric Buclin]

(In reply to Frédéric Buclin from comment #8)
> Your patch doesn't apply cleanly on top of Bugzilla 4.1.3.

Err... I meant Bugzilla 4.3. :)

Comment 10

[Francisco Donalisio]

Attachment: Patch updated

Comment 11

[Matt Selsky [:selsky]]

Comment on attachment 568020 [details] [diff] [review]
Patch updated

Review of attachment 568020 [details] [diff] [review]:
-----------------------------------------------------------------

What about the instances of Platform at http://mxr.mozilla.org/mozilla/source/webtools/bugzilla/template/en/default/pages/bug-writing.html.tmpl#151 ?

::: template/en/default/pages/release-notes.html.tmpl
@@ +1271,4 @@
>    <li>Searching the Priority field if you typed something that exactly
>      matched the name of a priority. You can explicitly search the
>      Priority field if you want to find [% terms.bugs %] by priority.</li>
> +  <li>Searching the [% field_descsc.rep_platform FILTER html %] and OS fields

This should be field_descs.

@@ +1273,5 @@
>      Priority field if you want to find [% terms.bugs %] by priority.</li>
> +  <li>Searching the [% field_descsc.rep_platform FILTER html %] and OS fields
> +    if you typed in one of a certain hard-coded list of strings (like "pc",
> +    "windows", etc.). You can explicitly search these fields, instead, if you want
> +    to find [% terms.bugs %] with a specific [% field_descsc.rep_platform

Same here.

Comment 12

[Tiago Mello [:timello]]

(In reply to Matt Selsky from comment #11)
 
> What about the instances of Platform at
> http://mxr.mozilla.org/mozilla/source/webtools/bugzilla/template/en/default/
> pages/bug-writing.html.tmpl#151 ?

Those words are plural so we should not change them to field_descs.rep_platform. That's what we have agreed upon this topic for other cases too.

Comment 13

[Francisco Donalisio]

Attachment: Fixes according to comments

Thanks Matt!

Comment 14

[Tiago Mello [:timello]]

Comment on attachment 568035 [details] [diff] [review]
Fixes according to comments

Review of attachment 568035 [details] [diff] [review]:
-----------------------------------------------------------------

The nits can be fixed on the checkin.

Otherwise, it applies cleanly in trunk and pass in all tests.

Thanks Matt for the patch and Francisco for the update!

::: template/en/default/bug/edit.html.tmpl
@@ +297,4 @@
>      [%############%]    
>      <tr>
>        <td class="field_label">
> +        <label for="rep_platform" accesskey="h"><b>[% field_descs.rep_platform FILTER html %]</b></label>:

Nit: I think this line is too long and we can break it.

::: template/en/default/list/edit-multiple.html.tmpl
@@ +95,4 @@
>  
>      <th>
>        <label for="rep_platform">
> +        <a href="page.cgi?id=fields.html#rep_platform">[% field_descs.rep_platform FILTER html %]</a>:

Same here.

Comment 15

[Tiago Mello [:timello]]

Committing to: bzr+ssh://[e-mail]/bugzilla/trunk/                                                                                                           
modified template/en/default/bug/edit.html.tmpl
modified template/en/default/bug/create/create-guided.html.tmpl                                                                                                                        
modified template/en/default/list/edit-multiple.html.tmpl
modified template/en/default/list/table.html.tmpl
modified template/en/default/pages/bug-writing.html.tmpl                                                                                                                               
modified template/en/default/pages/release-notes.html.tmpl
modified template/en/default/whine/mail.html.tmpl
modified template/en/default/whine/mail.txt.tmpl
Committed revision 7988.