Updater should use brand name string and not hardcode Thunderbird

RESOLVED FIXED in Thunderbird 3.0b2

Status

Thunderbird
General
RESOLVED FIXED
9 years ago
9 years ago

People

(Reporter: rstrong, Assigned: philor)

Tracking

Trunk
Thunderbird 3.0b2

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

With the landing of the patch in bug 399153 this is now very simple to fix as
can be seen in the patch in bug 324758 that was checked in.
(Assignee)

Comment 1

9 years ago
Created attachment 356300 [details] [diff] [review]
Fix v.1

rs: just looking for an rs+ from you that I'm not confused, and that this is really expected to work for comm-central+mozilla1.9.1, and Firefox isn't doing it for 3.1 only because it missed string freeze there.
Assignee: nobody → philringnalda
Status: NEW → ASSIGNED
Attachment #356300 - Flags: review?(robert.bugzilla)
Attachment #356300 - Flags: review?(bugzilla)
Attachment #356300 - Flags: review?(robert.bugzilla) → review+
Comment on attachment 356300 [details] [diff] [review]
Fix v.1

This will work with 1.9.1 as well since I landed the patch that made this possible there. I'm not going to do the same for Firefox on 1.9.1 due to the string freeze.

btw: I was considering just defining the command in the makefile.in as follows:

ifdef MOZ_UPDATER
CAT_UPDATER_INI = cat $< $(srcdir)/updater_append.ini
ifeq ($(OS_ARCH),WINNT)
CAT_UPDATER_INI += $(srcdir)/../installer/windows/nsis/updater_append.ini
endif
CAT_UPDATER_INI += | \
                   sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" | \
                   sed -e "s/%AB_CD%/$(AB_CD)/" > $(FINAL_TARGET)/updater.ini

libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
	$(CAT_UPDATER_INI)
endif


not sure if it is really any cleaner though
(Assignee)

Comment 3

9 years ago
Not to my eyes, anyway: the repetition's limited enough, and close enough, that it doesn't worry me as much as having to assemble it all in my head (though if you do change Fx that way somewhere down the line, we'd probably port it just to stay in sync).
(In reply to comment #3)
> Not to my eyes
Seriously, thank you for saying that. I do appreciate the input. :)
(Assignee)

Updated

9 years ago
Target Milestone: --- → Thunderbird 3.0b2
Should we be having a localization note in here to state that if localizers change brandShortName then they may wish to drop the %MOZ_APP_DISPLAYNAME% in that string? If they don't use it, then they can just put %MOZ_APP_DISPLAYNAME% where they like.
(In reply to comment #5)
> Should we be having a localization note in here to state that if localizers
> change brandShortName then they may wish to drop the %MOZ_APP_DISPLAYNAME% in
> that string? If they don't use it, then they can just put %MOZ_APP_DISPLAYNAME%
> where they like.
The readstrings implementation relies on line numbers for the first four lines so if you do add a localization note keep that in mind.

btw: as time permits I will try to come up with a decent fix for the readstrings hack.
Attachment #356300 - Flags: review?(bugzilla) → review+
(Assignee)

Comment 7

9 years ago
Heh, I'd never actually looked at readstrings: "this is a hack!" indeed :)

Compared to the undocumented "whatever's after an = on the third line of the file is the title, fourth is the text" not having a note for MOZ_APP_DISPLAYNAME seems pretty tame.
(In reply to comment #7)
> Heh, I'd never actually looked at readstrings: "this is a hack!" indeed :)
> 
> Compared to the undocumented "whatever's after an = on the third line of the
> file is the title, fourth is the text" not having a note for
> MOZ_APP_DISPLAYNAME seems pretty tame.
btw: a fix for the worst parts of the hack is in bug 473417
(Assignee)

Comment 9

9 years ago
http://hg.mozilla.org/comm-central/rev/9fb7643249d9
Status: ASSIGNED → RESOLVED
Last Resolved: 9 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.