462598 - about:rights text in nightlies is showing text for branded builds

Status: RESOLVED FIXED

Description

[Justin Dolske [:Dolske]]

The about:rights page in nightly builds is showing the text that is intended for branded builds (ie, things called "Firefox"). I'm guessing the nightly build environment sets OFFICIAL_BUILD (or MOZILLA_BUILD).

Maybe nightlies shouldn't set that flag (although they are "official", in some sense). Or maybe the checks in the about:rights code should also be checking for the presence of --enable-official-branding.

Beltzner had earlier noted that at some point we may want to have a version of about:rights for nightly builds that has Web Services Terms and a Privacy Policy (unlike the generic unbranded page), but which is different than the branded Firefox text (eg, add some flavor of "but hey, it's a development snapshot, so we might screw up"). Might need to account for that in the process of fixing this bug.

See also bug 462477 (about combining --enable-official-branding and OFFICIAL_BUILD).

Comment 1

[:Gavin Sharp [email: [e-mail]]]

I think we should just fix bug 462477 by having these things depend on --enable-official-branding and not the envvars.

Comment 2

[Justin Dolske [:Dolske]]

I don't think it's quite that simple. It appears that at least some of the existing usage of MOZILLA_OFFICIAL is for things that are desired to be on for builds coming from MoCo, even if they're not Firefox branded release builds.

For example, browser/app/application.ini uses this to enable Crash Reporter, and browser/components/safebrowsing/content/globalstore.js for the client name for the safebrowsing service.

Seems like we should have two flags -- one to indicate if it's an official Mozilla build, and a separate flag to indicate official branding. Firefox releases would have both flags set, personal developer builds would have neither, and things like nightlies would be official, but unbranded. That's 3 states, should the 4th (personal build w/ official branding) also be supported as a separate config? I guess it's plausible, eg, some service that's contractually limited to official MoCo usage?

Comment 3

[Justin Wood (:Callek)]

I'd like to think the 4th state should be possible. If nothing else than to let *personal* builds contain the branding as it would appear from MoCo.  I at least never distribute my builds but prefer to have branding on locally. So I can catch cases where branding issues break things (rare, but have happend; such as the icon changes in the past)

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

On latest nightly this is now WFM, isn't it? Did something happen?

Comment 5

[Justin Dolske [:Dolske]]

Not WFM. The major differences are that the top text on about:rights has 4 bullets instead of 3 (trademark point shouldn't be there), and the Website Services section shouldn't have 7 terms.

Comment 6

[Mike Beltzner [:beltzner, not reading bugmail]]

Wait: this is a nightly issue, so I don't think it blocks Firefox 3.1 ...

Comment 7

[:Gavin Sharp [email: [e-mail]]]

Created attachment 398993 [details] [diff] [review]
use new OFFICIAL_BRANDING

I think this does what we want (see blocking bug)... doesn't address the larger issue, but fixes the bug as summarized.

Comment 8

[:Gavin Sharp [email: [e-mail]]]

that patch should use MOZ_OFFICIAL_BRANDING rather than OFFICIAL_BRANDING

Comment 9

[:Gavin Sharp [email: [e-mail]]]

Created attachment 400806 [details] [diff] [review]
patch

Comment 10

[Dão Gottwald [::dao]]

http://hg.mozilla.org/mozilla-central/rev/e743bbf71b2d