1096820 - Set Baidu as default search engine on Desktop, add higher resolution images

Status: RESOLVED FIXED

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

Description

[Jing Zhang]

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

As discussed in bug 614883, Beijing office would like to change the built-in search engines and their orders in zh-CN version. The main reason is that Google service is not available in China at all. Besides, some existing search engines are niche now which can be removed.

Here's our latest proposal as below:
 -Baidu(baidu.xml)
 -Bing(bing.xml)
 -Google(google.xml)
 -Amazon(amazondotcn.xml)
 -Wikipedia(wikipedia-zh-CN.xml)

Please see Attachment 8511870 [details] for the xml files.

Comment 2

[Liu Xing]

In my opinion, if we add some new search engines, it is even better.

Comment 3

[Francesco Lodolo [:flod]]

While a decision is made about searchplugins (mconnor?), side notes on the linked attachment:

1) You don't need google.xml and bing.xml in your repository, they will be picked up from en-US

2) Wikipedia is out of date. Eventually I'll be doing or reviewing the landings for this bug, but make sure you don't revert this changeset while updating other files (it landed on both central and aurora)
http://hg.mozilla.org/releases/l10n/mozilla-aurora/zh-CN/rev/fa81e3c859bd

3) Baidu: images look scary big. The 1st one should include a 32px version of the icon, it includes twice a 16px one. 
In general image quality doesn't look great. Do these image come directly from Baidu?

For reference, the current list is

amazondotcn
baidu
baiduzhidao
bing
creativecommons
eachnet
google
paipai
wikipedia-zh-CN

Comment 4

[Jing Zhang]

Hi Francesco, thanks for your reply~ I'll modify and update the xml file asap.

Comment 5

[Francesco Lodolo [:flod]]

(In reply to Jing Zhang from comment #4)
> Hi Francesco, thanks for your reply~ I'll modify and update the xml file
> asap.

I'd wait until we get a clear answer about the searchplugins. 
Just to be sure: don't land anything without an approved patch in this bug.

Comment 6

[Mike Connor [:mconnor]]

+1 to not landing anything without clearance.  There's a few things this will depend on, should be able to figure out the right approach within a week.

Comment 7

[Shaohua Wen]

Do we have some documented process and the tech specificaiton for a searchplugin file?

Comment 8

[Francesco Lodolo [:flod]]

Not that I'm aware of, especially considering how fast they're evolving in the last period (only on desktop added resultdomain, removed searchform and added it as an attribute, multiple image sizes).

Comment 9

[Francesco Lodolo [:flod]]

Attachment: bug1096820.patch

This patch simply sets Baidu as default on desktop (it's already the default on mobile). Mike, should we land this and fix the other requests later?

Comment 10

[Mike Connor [:mconnor]]

Comment on attachment 8526139 [details] [diff] [review]
bug1096820.patch

Yep, let's ship this for now, we can trim the list in Fx35.

Comment 11

[Mike Connor [:mconnor]]

Note: rev codes are all confirmed, and we're good to move from here.

Comment 12

[Francesco Lodolo [:flod]]

Pushed
http://hg.mozilla.org/releases/l10n/mozilla-beta/zh-CN/rev/fcaa5dbf7860
http://hg.mozilla.org/releases/l10n/mozilla-aurora/zh-CN/rev/fcaa5dbf7860
http://hg.mozilla.org/l10n-central/zh-CN/rev/fcaa5dbf7860

@mconnor
Can we get assets from Baidu for the images to properly fix images on desktop?

Comment 13

[Jing Zhang]

Attachment: baidu-images.zip

Comment 14

[Jing Zhang]

(In reply to Francesco Lodolo [:flod] from comment #12)
> @mconnor
> Can we get assets from Baidu for the images to properly fix images on
> desktop?

@flod
I updated images for Baidu. Pls see if it's okay. Thanks~

Comment 15

[Francesco Lodolo [:flod]]

They look good to me.

At this point the change to set Baidu as default as landed, we can discuss the order change/clean up with a bit more calm.

Comment 16

[hc5023295]

Baidu is now enabling https. 
Shall we use https for Baidu?

Comment 17

[Liu Xing]

(In reply to hc5023295 from comment #16)
> Baidu is now enabling https. 
> Shall we use https for Baidu?

I think we do not need https for baidu now.
Baidu have not offical announce https for all its website. It is just in beta test now.
http://www.cnbeta.com/articles/345817.htm
> 据悉，百度HTTPS目前正在进行小流量测试，年底有望在全网实现覆盖。

Comment 18

[Liu Xing]

(In reply to Liu Xing from comment #17)
> (In reply to hc5023295 from comment #16)
> > Baidu is now enabling https. 
> > Shall we use https for Baidu?
> 
> I think we do not need https for baidu now.
> Baidu have not offical announce https for all its website. It is just in
> beta test now.
> http://www.cnbeta.com/articles/345817.htm
> > 据悉，百度HTTPS目前正在进行小流量测试，年底有望在全网实现覆盖。
offical -> official

Comment 19

[Jing Zhang]

(In reply to Liu Xing from comment #17)
> (In reply to hc5023295 from comment #16)
> > Baidu is now enabling https. 
> > Shall we use https for Baidu?
> 
> I think we do not need https for baidu now.
> Baidu have not offical announce https for all its website. It is just in
> beta test now.
> http://www.cnbeta.com/articles/345817.htm
> > 据悉，百度HTTPS目前正在进行小流量测试，年底有望在全网实现覆盖。

Yes, we have not received any official request from Baidu to use https. Let's keep http for now. And we will file a new bug once Baidu requests using https in the future.

Comment 20

[Francesco Lodolo [:flod]]

Attachment: baidu_images.patch

Per email discussion, since Baidu is now default better to add the extra images for Firefox 34.
* added updated images
* remove unnecessary xml declaration
* added rel="searchform" attribute, remove searchform element, fixed padding.

Tested locally and it works fine, but I prefer a second set of eyes.

Comment 21

[Francesco Lodolo [:flod]]

Side notes on Mercurial: 
* It looks like you do a lot of merges on repositories, you should remember to update your local copy before starting to work or make local commits.
* Since you work on mozilla-aurora, you should not land in l10n-central the same changesets, but simply pull the changesets from mozilla-aurora to l10n-central (I thought we agreed on this, and it definitely worked for a bit)

Comment 22

[Shaohua Wen]

Thanks Francesco. I believe I have updated my local copy first (hg pull -u), but it's strange that it still tell me that it creates new head after I pull change sets from aurora (you can see the changesets id are the same),this seems to be the first time I met this kind of situation.

Comment 23

[Francesco Lodolo [:flod]]

(In reply to Shaohua Wen from comment #22)
> Thanks Francesco. I believe I have updated my local copy first (hg pull -u),
> but it's strange that it still tell me that it creates new head after I pull
> change sets from aurora (you can see the changesets id are the same),this
> seems to be the first time I met this kind of situation.

That's because there was a commit on l10n-central. I merged and pushed to both branches again, so it should work (I'll verify it as soon as I get the pending patch reviewed).

Comment 24

[Francesco Lodolo [:flod]]

Attachment: Baidu (images, update structure)

As Pike noted, we can't drop <searchform> since the template search uses a different URL (baidu.com vs baidu.com/baidu).

Same patch as before, this time leaving <searchform>

Comment 25

[Francesco Lodolo [:flod]]

Landed in Beta
http://hg.mozilla.org/releases/l10n/mozilla-beta/zh-CN/rev/9d4cd26fe094

Transplanted in Aurora (too many merge conflicts when I tried a merge)
http://hg.mozilla.org/releases/l10n/mozilla-aurora/zh-CN/rev/ff104561593e

Pulled into l10n-central (no need to merge as expected)
http://hg.mozilla.org/l10n-central/zh-CN/rev/ff104561593e

Comment 26

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

So is this status-firefox34: fixed, then?

Comment 27

[Francesco Lodolo [:flod]]

Yes, the relevant part landed on all branches, so it's actually fixed on all of them.

Not sure if it makes things clearer to move the rest of the stuff in a different bug, and keeps this one just for Baidu as default+updated images.

Comment 28

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

Definitely would be clearer to move other fixes to a new bug.

Comment 29

[Francesco Lodolo [:flod]]

OK (sorry zh-CN team for yet another bug move).

Updated subject, marked as fixed also on Fx35 and Fx36.