352922 - Override some generic strings in netError.dtd and config.dtd with "Camino"

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Because of bug 302309 (embedding apps don't ship branding), some Gecko strings that would have used brand.dtd references were shipped with generic "[Tt]he browser" or "this application" strings.  Firefox has overridden them (in netError.dtd) with "Firefox" so the stings don't suck so much, and we should do the same.

There are two ways we can do this:
1) Check modified files into mozilla/camino/embed-replacements (easier)
2) Do a "live replacement" of the strings from embed.jar (more robust in the face of changing strings) and repack using embed-replacements.

Option 1 is very simple to do, and I have a mostly-working solution for Option 2 (thanks to my failed pipnss.properties replacement efforts) which will need a tiny bit of build system loving, if we go that route.

Note that bug 339720 (config.dtd changes) hasn't landed on the branch yet, but CTho is in the process of getting it landed there.

Comment 1

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: embed-replacements/locale/en-US/global/config.dtd

Here's the change in config.dtd (the new about:config will fubar your app warning)

Because the embed-replacements/locale hierarchy doesn't exist, I can't create a patch (and none of the "tricks" to add files work when adding directories, especially not a directory hierarchy).

Whoever checks this in will have to cvs add each directory in the hierarchy and then cvs add the files.

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: embed-replacements/locale/en-US/global/netError.dtd

netError.dtd

This does

s/The browser/Camino/
s/the browser/Camino/

Comment 3

[froodian (Ian Leue)]

Comment on attachment 239110 [details]
embed-replacements/locale/en-US/global/netError.dtd

These both work as expected.

Comment 4

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Manual diff to aid reviewing (not for anything else!)

To aid reviewing, here is a manual diff of the original source files with the files sitting in embed-replacements (because I've already built since putting files in embed-replacements, I can't diff to embed.jar!foo without doing a full rebuild :P)

Comment 5

[Stuart Morgan]

So how often do the files these are based on change, and is there some kind of process in place whereby we'll notice and upgrade the corresponding overrides accordingly?

Comment 6

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

netError.dtd hasn't changed in a year, and config.dtd hadn't changed in two years before CTho's checkin last week to add the string we're modifying.  They won't change at all on the 1.8 branch because it's string frozen.

Sam believes that the next change that happens will be fixing these strings to use branding because the Core will have fixed branding and he'll be working to make that happen ;)  Baring that, we'll check cvs log before milestone releases and ensure things are up-to-date on unfrozen branches.

We could, of course, do option 2 which is more robust here, but the decision at the meeting was to do option 1.

Comment 7

[Mark Mentovai]

Comment on attachment 239109 [details]
embed-replacements/locale/en-US/global/config.dtd

Nice.  Thanks for the diff.

Comment 8

[froodian (Ian Leue)]

Checked in on 1.8branch and trunk.