diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-12-28 17:35:04 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-12-28 17:35:04 +0100 |
| commit | b10a11cc341499745c0495406bd207db4982b322 (patch) | |
| tree | 25a572c760e8de08a23470c67109dd29059a6cf9 /template/en | |
| parent | b300c83e7b907f14c9f94a50370aab6f8fb3d1a7 (diff) | |
| parent | fc18ef1ad344a14174332cd04a04d8182ab85d4b (diff) | |
| download | bugzilla-b10a11cc341499745c0495406bd207db4982b322.tar.gz bugzilla-b10a11cc341499745c0495406bd207db4982b322.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/bug/field-events.js.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/bug/field-help.none.tmpl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/template/en/default/bug/field-events.js.tmpl b/template/en/default/bug/field-events.js.tmpl index f1d5afd32..3133c159b 100644 --- a/template/en/default/bug/field-events.js.tmpl +++ b/template/en/default/bug/field-events.js.tmpl @@ -55,6 +55,7 @@ [% FOREACH controlled_field = legal_value.controlled_values.keys %] [% SET cont_ids = [] %] [% FOREACH val = legal_value.controlled_values.$controlled_field %] + [% NEXT IF !val.is_active %] [% cont_ids.push(val.id) %] [% END %] [% NEXT IF !cont_ids.size %] diff --git a/template/en/default/bug/field-help.none.tmpl b/template/en/default/bug/field-help.none.tmpl index 7ae9991ec..a9449fbcd 100644 --- a/template/en/default/bug/field-help.none.tmpl +++ b/template/en/default/bug/field-help.none.tmpl @@ -91,7 +91,7 @@ estimated_time => keywords => "You can add keywords from a defined list to $terms.bugs, in order" - _ " to tag and group them.", + _ " to easily identify and group them.", longdesc => "$terms.Bugs have comments added to them by $terms.Bugzilla users." |