1140204 - Rename "Encoding" to "Text Encoding" in Page Info labels (Toolkit bug 951695)

Status: RESOLVED FIXED

(SeaMonkey :: Page Info, defect)

Description

[rsx11m]

+++ This bug was initially created as a clone of Bug #1139004 +++

+++ This bug was initially created as a clone of Bug #951695 +++

> Chrome and Internet Explorer name this entry "Encoding". Alternatively we
> could align with Safari which names it "Text Encoding".

Toolkit has changed to "Text Encoding" in toolkit/locales/en-US/chrome/global/charsetMenu.dtd which breaks suite/common/charsetOverlay.xul and thus at least needs to be changed here. Either we fork charsetMenu.dtd and its two entities to retain the old labels, or have to modify the workding throughout preference panes and Help content.

(Quoting rsx11m from bug 1139004 comment #2)
> (In reply to [e-mail] from bug 1138964 comment #10)
> > (There's also the Page Info change...)
> 
> Neil, comm-central changeset ecc95ada09d1 didn't address generalEncoding and
> formEncoding in suite/locales/en-US/chrome/browser/pageInfo.dtd, thus I'll
> change those as drive-by fix here (unless there is a reason not to change
> those labels).

On a second thought, that may be better suited in its own bug given that we have a dedicated bugzilla component for that.

Comment 1

[rsx11m]

Attachment: Simple fix

This is trivial, but if you think that IanN should review this as well, please direct the r? request to him instead.

Comment 2

[rsx11m]

Thanks, push for comm-central please.

Comment 3

[Philip Chee]

http://hg.mozilla.org/comm-central/rev/b4fe8053c541

Comment 4

[Alexander L. Slovesnik]

-<!ENTITY  formEncoding          "Encoding:">
+<!ENTITY  formEncoding2         "Text Encoding:">

Is this change really correct? Values of form's encoding are MIME encodings like "application/x-www-form-urlencoded", but not text encodings.

Comment 5

[rsx11m]

I assume that the Firefox people know what they are doing, that's were this was motivated from - https://bugzilla.mozilla.org/attachment.cgi?id=8570598&action=diff#a/browser/locales/en-US/chrome/browser/pageInfo.dtd_sec2

Comment 6

[[e-mail]]

(In reply to rsx11m from comment #5)
> I assume that the Firefox people know what they are doing, that's were this
> was motivated from -
> https://bugzilla.mozilla.org/attachment.cgi?id=8570598&action=diff#a/browser/
> locales/en-US/chrome/browser/pageInfo.dtd_sec2

No, they only changed generalEncoding, and changing formEncoding was an error, which I missed. Sorry about that.

Comment 7

[rsx11m]

Comment on attachment 8573637 [details] [diff] [review]
Simple fix

Oh, now I get it. We keep this change:

>-              <label control="encodingtext" value="&generalEncoding;"/>
>+              <label control="encodingtext" value="&generalEncoding2;"/>

but revert that one:

>-                <label control="formenctype" value="&formEncoding;"/>
>+                <label control="formenctype" value="&formEncoding2;"/>

right?

Comment 8

[rsx11m]

(probably yes, as you explicitly mentioned the entity names in comment #6...)

Comment 9

[rsx11m]

Attachment: Revert formEncoding label

Comment 10

[rsx11m]

Thanks Neil for the quick review, and to Alexander for catching this!
Sorry for the glitch...

Push to comm-central, please.

Comment 11

[Ian Neal]

a=me for CLOSED TREE

Comment 12

[Philip Chee]

Comment on attachment 8594551 [details] [diff] [review]
Revert formEncoding label

Pushed to comm-central a=IanN CLOSED TREE
http://hg.mozilla.org/comm-central/rev/97d4ae243c36