459156 - zhCN beta 1 builds show different search plugins per OS

Status: VERIFIED FIXED

(Mozilla Localizations :: zh-CN / Chinese (Simplified), defect)

Description

[Tony Chung [:tchung]]

Attachment: Linux screenshot

The zhCN builds for Fx3.1 beta 1 show different search plugins on default

Mac builds: Amazon.cn
Linux builds: Creative commons

Which is it?   attaching screenshots for both

Comment 1

[Tony Chung [:tchung]]

Attachment: Mac screenshot

Mac screenshot

Comment 2

[Shaohua Wen]

File region.properties was wrongly overwriten.
Sorry for that.

Comment 3

[Shaohua Wen]

changeset:  18:2e463ab52bc3
branch:     GECKO191b1_20081007_RELBRANCH
user/date:  [e-mail]	2008-10-09 01:55:24
parent:     17:0b35bbe4c11f Added tag FIREFOX_3_1b1_RELEASE for changeset 5d7295a2e778
tags:       tip

Comment 4

[Nick Thomas [:nthomas] (UTC+12)]

To clarify comment #3, 
* the FIREFOX_3_1b1_RELEASE tag hasn't moved from revision 5d7295a2e778, the revision given in http://hg.mozilla.org/build/buildbot-configs/file/bcade30e050b/mozilla2/l10n-changesets - Release Engineering would ask localizers to not move (or attempt to move) release tags around 
* the revert to Google default engine, http://hg.mozilla.org/l10n-central/zh-CN/rev/2e463ab52bc3, has landed on the correct release branch. IIRC these sort of changes normally require a r+ and approval

Comment 5

[chris hofmann]

I think gen was saying the default should be creative commons, not google...  ccing him

Comment 6

[Shaohua Wen]

(In reply to comment #4)
> http://hg.mozilla.org/l10n-central/zh-CN/rev/2e463ab52bc3, has landed on the
> correct release branch. IIRC these sort of changes normally require a r+ and
> approval
  Yes I remember, but now is a beta release, and there are too many changes
from 3.0 to 3.1 so we did not check for every exported dtd/properties files.
  The upgrade from Mozilla translator 5.22 to 5.23 also created a lot of files
with just some blank changes or end of line format changes, but HG cannot
ignore these kind of changes like cvs when I diff with tortoiseHG.Anybody have
some good suggestion on this?
  Next time we'll do better anyway.

Comment 7

[chris hofmann]

oops. misread gen's message.  

sounds like no change from previous releases where google was default, so the patch should be good if it gets us back to google as default on all platforms.

Comment 8

[Axel Hecht [:Pike]]

HolyWen, please submit a patch for review. This is still broken going forward.

Please make sure that your current local clone is working on the default branch again, too.

Comment 9

[Shaohua Wen]

Attachment: patch to fix this.

Comment 10

[Shaohua Wen]

Attachment: patch to fix this.

Comment 11

[Shaohua Wen]

Attachment: graph

Is the default branch "GECKO191b1_20081007_RELBRANCH
" correct?

Comment 12

[Axel Hecht [:Pike]]

Attachment: tortoise revision log with default branch on

No, the GECKO RELBRANCH is only for the Beta 1 release. You want the default branch which is literally named "default". I don't see where the "default" branch would be in your graph, but on http://hg.mozilla.org/l10n-central/zh-CN/pushloghtml, the head of "default" branch is http://hg.mozilla.org/l10n-central/zh-CN/rev/8a319490933d.

I just installed tortoisehg here, and here's a screenshot of how it's supposed to look. Note that the Home icon is on 15 instead of 18. Might be that the yellow blob is indicating the default branch. I guess you should "update to revision" and then pick the 8a319490933d head. It's not the tip head 1, at least for me locally, but the head 2, without any indication of goodness, sadly.

Comment 13

[Shaohua Wen]

Attachment: new patch graph

not commited yet, is this correct now?

Comment 14

[Axel Hecht [:Pike]]

Comment on attachment 342406 [details] [diff] [review]
patch to fix this.

r=me. Please fix this on the "default" branch as indicated in attachment 342412 [details]. Please use a new commit, though (possibly have to use a new clone), to add my review to the check-in comment.

Comment 15

[Tony Chung [:tchung]]

Can we just relnote this for beta 1?   Or is it urgent enough that we need to stop and respin existing builds for this?  

Flagging the blocker flag for triage.

Comment 16

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(In reply to comment #15)
> Can we just relnote this for beta 1?   Or is it urgent enough that we need to
> stop and respin existing builds for this?  
...or can we drop zh-CN from the list of locales in beta1, and add it back in beta2?


> Flagging the blocker flag for triage.
100% agree. Good idea.

Comment 17

[Shaohua Wen]

commited.

hangeset:  21:93811c300d0e
user/date:  [e-mail]	2008-10-10 01:33:13
parent:     15:8a319490933d tag l10n-central zh-CN for Thunderbird 3_0a3
tags:       tip

Comment 18

[Tony Chung [:tchung]]

Verified fixes on respin of beta1 zhCN builds.
- Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1b1) Gecko/20081007 Firefox/3.1b1 
- Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; zh-CN; rv:1.9.1b1) Gecko/20081007 Firefox/3.1b1 
- Mozilla/5.0 (X11; U; Linux i686; zh-CN; rv:1.9.1b1) Gecko/20081007 Firefox/3.1b1 

Google is now the default search plugin.