Open Bug 653386 Opened 9 years ago Updated 4 years ago

Consider overriding netErrorApp.dtd rather than netError.dtd

Categories

(Thunderbird :: General, defect)

defect
Not set

Tracking

(Not tracked)

ASSIGNED

People

(Reporter: standard8, Assigned: iann_bugzilla, NeedInfo)

References

Details

Attachments

(1 file, 1 obsolete file)

As per bug 651486 comment 2:

> Alternatively you could consider overriding netErrorApp.dtd instead which
> allows you to pick and choose which strings to override (as long as you include
> the securityOverride strings) and won't break when new strings are added.

We should consider this to make things easier for ourselves.
Flags: wanted-thunderbird+
Version: unspecified → Trunk
Blocks: 694793
Assignee: nobody → mbanner
No longer blocks: 694793
Assignee: mbanner → nobody
> http://mxr.mozilla.org/comm-central/source/mail/locales/jar.mn?rev=274371a1c41f#11
% override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd

1. Change to:
% override chrome://global/locale/netErrorApp.dtd chrome://messenger/locale/netError.dtd
2. (Optional) rename chrome://messenger/locale/netError.dtd to chrome://messenger/locale/netErrorApp.dtd

Revisit: Bug 1158179 Bug 1103373 bug 1014282 Bug 973368 etc and remove any duplication that are exact copies of mozilla/dom/locales/en-US/chrome/netError.dtd

> http://hg.mozilla.org/comm-central/filelog/ab6c50b76ed3/mail/locales/en-US/chrome/overrides/netError.dtd
Depends on: 403800
Assignee: nobody → iann_bugzilla
Status: NEW → ASSIGNED
Attachment #8648770 - Flags: review?(mkmelin+mozilla)
Attachment #8648770 - Flags: feedback?(philip.chee)
Comment on attachment 8648770 [details] [diff] [review]
Make use of netErrorApp functionality

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

Seems ok to me, r=mkmelin
Attachment #8648770 - Flags: review?(mkmelin+mozilla) → review+
Remind me how to get this to show up in Thunderbird? ISTR a content tab
Flags: needinfo?(iann_bugzilla)
I think that has been answered.
Flags: needinfo?(iann_bugzilla)
Comment on attachment 8648770 [details] [diff] [review]
Make use of netErrorApp functionality

> -<!ENTITY corruptedContentError.longDesc "<p>The content you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the owners to inform them of this problem.</li></ul>">
Revert because otherwise you will regress Thunderbird Bug 663608.

> -<!ENTITY contentEncodingError.title "Content encoding error">
> -<!ENTITY contentEncodingError.longDesc "
> -<ul>
> -  <li>Please contact the website owners to inform them of this problem.</li>
> -</ul>
The generic version also talks about "website". Perhaps Thunderbird needs a bit of rewrite rather than falling back to netError.dtd

> <!ENTITY netReset.title "The connection was reset">
Perhaps change to:
<!ENTITY netReset.title "The connection was interrupted">

--------------------------------------------------------------------------
>  <!ENTITY securityOverride.linkText "Or you can add an exception…">
>  <!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
>  <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
 
>  <!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
>  contents of the <button> tags. It uses strings already defined above. The
>  button is included here (instead of netError.xhtml) because it exposes
>  functionality specific to thunderbird. -->
 
>  <!ENTITY securityOverride.warningContent "
>  <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 
>  <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
>  <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
>  ">
Replace all this with:

> <!ENTITY securityOverride.linkText "Or you can add an exception…">
> <!ENTITY securityOverride.warningContent "
> <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
> <p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
> ">

See: http://mxr.mozilla.org/comm-central/source/mozilla/dom/locales/en-US/chrome/netErrorApp.dtd#9
Attachment #8648770 - Flags: feedback?(philip.chee) → feedback+
I've opened a discussion in m.d.a.thunderbird about whether this will actually work. Please don't check this in until we are sure it works. :P
Depends on: 1204338
Taking on board Ratty's comments:
* Reverted removal of corruptedContentError.longDesc
* Tweaked netReset.title as suggested

Did not change contentEncodingError.longDesc or securityOverride.* as they are outside the scope of this bug.

Carrying forward r+/f+
Attachment #8648770 - Attachment is obsolete: true
Attachment #8660501 - Flags: review+
Attachment #8660501 - Flags: feedback+
Aside from fixing bit rot is there anything else to do here?
Flags: needinfo?(iann_bugzilla)
See Also: → 1259922
You need to log in before you can comment on or make changes to this bug.