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

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[Mark Banner (:standard8)]

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

The about:rights page in nightly builds is showing the text that is intended for branded builds (ie, things called "Thunderbird").

We need to fix this and the best way is to port bug 514954 and do something similar to bug 462598.

I have a patch for this that I'm currently testing.

Comment 1

[Mark Banner (:standard8)]

Attachment: The fix

This seems to fix it - I'm porting bug 514954 and adjusting the aboutRights.xhtml to take account of the better variable to use.

Comment 2

[Justin Wood (:Callek)]

Comment on attachment 434401 [details] [diff] [review]
The fix

Hmm, m-c doesn't do the DEFINES+= part of this anywhere, and they still "seem" to work. So I question our need for it (not-tested). But it doesn't hurt us either, so looks good enough to land.

Comment 3

[Mark Banner (:standard8)]

(In reply to comment #2)
> (From update of attachment 434401 [details] [diff] [review])
> Hmm, m-c doesn't do the DEFINES+= part of this anywhere, and they still "seem"
> to work. So I question our need for it (not-tested). But it doesn't hurt us
> either, so looks good enough to land.

Looks like you're correct, so I removed it (I think the AC_DEFINE in configure.in does it for us).

http://hg.mozilla.org/comm-central/rev/22a663de7b8f

Comment 4

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

(In reply to comment #3)
> (I think the AC_DEFINE in configure.in does it for us).

Indeed it does.

Comment 5

[Mark Banner (:standard8)]

Oh I forgot to say, I think automated testing for this would be difficult as you're basically checking the right text is displayed. Therefore I'd suggest we write a couple of simple litmus tests one for official builds and one for nightlies.

Comment 6

[Ludovic Hirlimann [:Usul]]

https://litmus.mozilla.org/show_test.cgi?id=11637