1198525 - about:rights in Nightly and Developer Edition about:rights has incorrect text

Status: VERIFIED FIXED

(Firefox :: General, defect)

Description

[Elvin Lee [:ellee] (no longer with Mozilla)]

The about:rights dialogue shown in Firefox Dev. Edition has some placeholders where it ought to have full text (as seen in Firefox general release). This is probably just an incorrect config for the build that needs updating.

Comment 1

[Elvin Lee [:ellee] (no longer with Mozilla)]

Trying to find the right product/component for this one. :)

Comment 2

[Elvin Lee [:ellee] (no longer with Mozilla)]

Was advised dtownsend may be able to assist. Do you mind taking a look, Dave? Thanks!

Comment 3

[Dave Townsend [:mossop]]

I'm probably not the person to help with build config issues but I'm also not sure what the problem is. I looked at about:rights on both developer and nightly and they both look the same. What should I be looking for?

Comment 4

[Elvin Lee [:ellee] (no longer with Mozilla)]

Sounds like nightly has the same problem then. :) Branded versions of Firefox should have the full text of our about:rights (as seen in general).

Comment 5

[Dave Townsend [:mossop]]

The choice of which rights page is displayed is based on MOZ_OFFICIAL_BRANDING: https://dxr.mozilla.org/mozilla-central/source/browser/components/about/AboutRedirector.cpp#69

Comment 6

[Elvin Lee [:ellee] (no longer with Mozilla)]

Thanks. Do you know if the build config for dev and nightly #define MOZ_OFFICIAL_BRANDING ? Or is it left undefined?

Comment 7

[Dave Townsend [:mossop]]

It looks like the beta and release mozconfigs set it: https://dxr.mozilla.org/mozilla-central/search?q=%22--enable-official-branding%22&redirect=false&case=false

Comment 8

[Brian Grinstead [:bgrins]]

Maybe we could use MOZILLA_OFFICIAL for this? https://dxr.mozilla.org/mozilla-central/source/toolkit/modules/AppConstants.jsm#38-40.

I will ask on dev-build about what the right directive is to target 'unbranded' builds (non nightly/Dev Edition/Beta/Release) so that other vendors can keep their own privacy policies as in: https://dxr.mozilla.org/mozilla-central/source/toolkit/content/aboutRights-unbranded.xhtml?offset=1000#30-32

Comment 9

[Mike Hommey [:glandium]]

MOZILLA_OFFICIAL sounds about right. (note that switching the two about:rights in AboutRedirector.cpp is kind of gross, why isn't there only one file, preprocessed? Also, about:rights is Firefox specific, yet registered for anything using Gecko)

Comment 10

[Dave Townsend [:mossop]]

(In reply to Mike Hommey [:glandium] from comment #9)
> MOZILLA_OFFICIAL sounds about right. (note that switching the two
> about:rights in AboutRedirector.cpp is kind of gross, why isn't there only
> one file, preprocessed?

We should just preprocess the jar.mn that adds it

> Also, about:rights is Firefox specific, yet registered for anything using Gecko)

It's only registered in Firefox's AboutRedirector

Comment 11

[Justin Dolske [:Dolske]]

Hmm, it actually was OFFICIAL_BUILD eons ago, until I changed it in bug 462598 for Firefox 3.5. I don't recall the exact reasoning (other that the "Firefox" trademark bits not really being applicable to Nightly), and it's doesn't seem very relevant, as that was pre-Rapid-Release and our channel usage is much different now. I think all the Mozilla-provided builds should contain basically the same text. 

This will also fix the mistake noted in bug 1171693 comment 15. :/

Comment 12

[Justin Dolske [:Dolske]]

Attachment: Patch v.1

Changed to use MOZILLA_OFFICIAL instead of branding, and used the jar preprocessing like Mossop suggested. Kind of silly we shipped both versions.

Note that the existing content specifically uses "Firefox" instead of "&brandShortName;" when talking about trademarks, so we don't have to worry about that talking about Nightly instead of Firefox. (see http://mxr.mozilla.org/mozilla-central/source/toolkit/locales/en-US/chrome/global/aboutRights.dtd).

Comment 13

[Justin Dolske [:Dolske]]

Comment on attachment 8658340 [details] [diff] [review]
Patch v.1

+mfinkle for the trivial mobile change.

Oh, and I looked at comm-central, but didn't see any references to -unbranded there, so should be fine.

Comment 14

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 8658340 [details] [diff] [review]
Patch v.1

LGTM

Comment 15

[Justin Dolske [:Dolske]]

Between this being filed by legal, and a fairly obvious change, I think it's ready to land.

Comment 16

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/a8a074a2ee89

Comment 17

[Nigel Babu [:nigelb]]

Dolske, can you add an hg patch next time? I had to write your commit message for you (which I got wrong and then spent 10 minutes learning how to fix..)

Comment 18

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/a8a074a2ee89

Comment 19

[Khalid Syfullah Zaman [:khalid32]]

I have reproduced this bug on Nightly 43.0a1 (2015-08-25) on ubuntu 14.04 LTS, 32 bit!

Also reproduced this bug on Aurora 42.0a2 (2015-08-25)!

The bug's fix is now verified on Latest Beta 43.0b1!

Build ID: 20151103023037
User Agent: Mozilla/5.0 (X11; Linux i686; rv:43.0) Gecko/20100101 Firefox/43.0

[bugday-20151104]