260141 - Some strings in locale files is using "Firefox" - should use &brandShortName; instead

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Alexander L. Slovesnik]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.7.3) Gecko/20040913 Firefox/0.10
Build Identifier: Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.7.3) Gecko/20040913 Firefox/0.10

Some strings in locale files is using "Firefox" - should use &brandShortName;
instead
 

Reproducible: Always
Steps to Reproduce:
1.
2.
3.

Comment 1

[Alexander L. Slovesnik]

Attachment: Replace "Firefox" with &brandShortName;

Comment 2

[Alexander L. Slovesnik]

I've found two more places with hardcoded strings:
http://lxr.mozilla.org/aviarybranch/source/browser/locales/en-US/installer/installer.inc#23

#define SETUP_TYPE_EXISTING The selected directory already contains a Firefox
installation. To delete %s completely, please press the 'Delete Directory'
button. Your Firefox settings should not be affected. Or, please press the
'Cancel' button and choose a different destination directory.

http://lxr.mozilla.org/aviarybranch/source/toolkit/locales/en-US/installer/unix/install.it#16

DEFAULT_TITLE=Mozilla Installer

But it's installer part and I don't know how to fix it.

Comment 3

[Axel Hecht]

Benjamin, confirm/review/own? Pick your favorite ;-)

Comment 4

[u60234]

Comment on attachment 159258 [details] [diff] [review]
Replace "Firefox" with &brandShortName;

>-<!ENTITY  getnew.tooltip          "Close Options and visit Firefox Help's Extensions page">
>+<!ENTITY  getnew.tooltip          "Close Options and visit &brandShortName; Help's Extensions page">
> <!ENTITY  getnew.url              "http://texturizer.net/firefox/extensions/">

>-<!ENTITY  getnew.tooltip          "Close Options and visit Firefox Help's Themes page">
>+<!ENTITY  getnew.tooltip          "Close Options and visit &brandShortName; Help's Themes page">
> <!ENTITY  getnew.url              "http://texturizer.net/firefox/themes/">

But the name of the web site IS Firefox Help and nothing else.

Comment 5

[Alexander L. Slovesnik]

> But the name of the web site IS Firefox Help and nothing else.
Firefox can change it's name one more time. And "Firefox Help web site" would be
"<insert new name> Help web site".
I believe that is purpose of &brandShortName; - don't make developers to go
through all .dtd files after renaming product.

Comment 6

[Benjamin Smedberg]

Comment on attachment 159258 [details] [diff] [review]
Replace "Firefox" with &brandShortName;

Actually the purpose of &brandShortName; is to keep "toolkit" files from having
hardcode product names. This patch is fine to land on the trunk, but please
only fix update.dtd on the aviary branch.

Comment 7

[Alexander L. Slovesnik]

Attachment: Patch for updated.dtd only.

Carrying over r+.
Asking for sr.

Comment 8

[Benjamin Smedberg]

Comment on attachment 159777 [details] [diff] [review]
Patch for updated.dtd only.

It's all good (you don't need sr, and I can self-approve locale changes like
this).

Comment 9

[Benjamin Smedberg]

Update.dtd checked in on the aviary branch. I'm going to leave this bug open for
the extra files on the trunk.

Comment 10

[Alexander L. Slovesnik]

Attachment: Patch for trunk

Patch for trunk

Comment 11

[Benjamin Smedberg]

Comment on attachment 159787 [details] [diff] [review]
Patch for trunk

toolkit/mozapps/update/locale/update.dtd is not the correct file. I think you
want toolkit/locales/en-US/chrome/mozapps/update/update.dtd

Really, everything in toolkit/mozapps/update/locale should be cvs-removed.

Comment 12

[Alexander L. Slovesnik]

Attachment: Patch for trunk (browser part only)

Patch for trunk (browser part only)

Comment 13

[Alexander L. Slovesnik]

Comment on attachment 168354 [details] [diff] [review]
Patch for trunk (browser part only)

Did not apply,cause new Options window has been landed.

Comment 14

[Anbo Motohiko]

*** Bug 258678 has been marked as a duplicate of this bug. ***