Takao Fujiwara - Tokyo S/W Center wrote:
> Evan Yan wrote:
>
>> Takao Fujiwara - Tokyo S/W Center wrote:
>>
>>
>>> Evan Yan wrote:
>>>
>>>
>>>
>>>> Mozilla community doesn't officially provide multiple language
>>>> Firefox/Thunderbird binaries. They only provide single language version.
>>>> If the preference matchOS is set as default. It could cause wrong
>>>> behavior when a Firefox/Thunderbird binary runs on a OS version that is
>>>> in a different language than the installed Firefox/Thunderbird. That's
>>>> why those patches are OS dependent.
>>>>
>>>>
>>> Is the matchOS able to be determined with the configure option preparing
>>> mozilla.in.in file ?
>>> ./configure --enable-matchos
>>> The default can be the disable matchOS.
>>>
>>>
>> I didn't find such configuration option in Mozilla Build Configurator
>> http://webtools.mozilla.org/build/config.cgi
>>
>> intl.locale.matchOS is a preference item. I think we should patch it in
>> user.js, shouldn't we?
>>
>
> OK, it makes sense to modify all.js only as the vendor patches.
>
Yes, I meant all.js when I said user.js. Sorry for my typo.
> I meant to modify configure.in and push the option in community.
> mozilla/configure.in:
> + MATCH_OS=1
> + MOZ_ARG_ENABLE_BOOL(matchos,
> + [ --enable-matchos Enable matchOS.],
> + MATCH_OS=1,
> + MATCH_OS=0 )
> +
> + AC_SUBST(MATCH_OS)
>
> mozilla/modules/libpref/src/init/Makefile.in:
> + all.js:: all.js.in
> + cat $< | sed -e "s|%MATCH_OS%|$(MATCH_OS)|" > $@
> +
>
> --- mozilla/modules/libpref/src/init/all.js
> +++ mozilla/modules/libpref/src/init/all.js.in
> @@ -782,7 +782,7 @@ pref("intl.charsetmenu.browser.cache.siz
> pref("intl.charset.detector",
> "chrome://navigator/locale/navigator.properties");
> pref("intl.charset.default",
> "chrome://navigator-platform/locale/navigator.properties");
> pref("intl.content.langcode",
> "chrome://communicator-region/locale/region.properties");
> -pref("intl.locale.matchOS", false);
> +pref("intl.locale.matchOS", %MATCH_OS%);
> // fallback charset list for Unicode conversion (converting from Unicode)
> // currently used for mail send only to handle symbol characters (e.g Euro,
> trademark, smartquotes)
> // for ISO-8859-1
>
> or
>
> +++ mozilla/modules/libpref/src/init/all.js
> #ifdef SOLARIS
> pref("intl.locale.matchOS", true);
> #else
> pref("intl.locale.matchOS", false);
> #endif
>
I'm not sure whether we should make it default for all OpenSolaris
platform. Because we can't tell what languages are installed in a
distribution and what languages will be built into Firefox/Thunderbird
packages.
For the same reason, we should just set matchOS for our bundled
Firefox/Thunderbird, but don't set it for contribute build.
Thanks,
Evan
>
>>
>>> My point is, if the patches of mozilla.in, firefox.in and thunderbird.in
>>> files are not accepted by community, other solutions would be worth
>>> consideration with bugzilla 331779 .
>>>
>>>
>>>
>> Sorry, it seems I made some confusion here. Let me make it more clear.
>>
>> I didn't patch mozilla.in, firefox.in or thunderbird.in. I patched user.js.
>> There are three patches in my original mail. The one named
>> mozilla-09-local.diff is what I created to patch user.js to set matchOS.
>> After we do this, we just obsolete the old way of patching
>> mozilla.in.in. That is, removing firefox-06-local.diff and
>> thunderbird-08-locale.diff. I attached those two patches for convenient
>> review. They are not to be added to spec file, but to be removed.
>>
>
> Thanks for your explanation. I misunderstood your patches.
> I agree setting matchOS is better than modifying mozilla.in.
>
>
>> I'm glad you mentioned bugzilla 331779 (I should have mentioned it
>> earlier :) ). This solution is just the same solution as the one in
>> bugzilla 331779. You can see that I proposed the same patch in that bug
>> months ago. Because of the reason I mentioned in my former mail,
>> community doesn't want to set matchOS as default. Setting the preference
>> matchOS is a OS dependent thing.
>>
>
> The internal patch is ok with me since you're removing the previous patches
> and I concerned to keep those patches.
>
>
>>
>>>> Those patches are OK for OS distributions which have multiple language
>>>> support. Actually openSUSE did the same thing.
>>>>
>>>>
>>> Yes, those patches are ok since they have already been applied to S10.
>>> I checked the SuSE SRPM but I could not find the similar implementation in
>>> mozilla/xulrunner/app/mozilla.in .
>>> http://download.opensuse.org/distribution/openSUSE-current/repo/src-oss/suse/src/mozilla-xulrunner181-1.8.1.4-30.src.rpm
>>>
>>>
>> Check out the file locale.patch in its firefox package.
>> http://download.opensuse.org/repositories/mozilla/openSUSE_10.3/src/MozillaFirefox-2.0.0.9-2.2.src.rpm
>>
>
> Thanks for this pointer.
> I confirmed locale.patch.
>
> Thanks,
> fujiwara
>
>
>> Thanks,
>> Evan
>>
>>
>>
>>> Thanks,
>>> fujiwara
>>>
>>>
>>>
>>>
>>>> Thanks,
>>>> Evan
>>>>
>>>> Takao Fujiwara wrote:
>>>>
>>>>
>>>>
>>>>
>>>>> The patch integration is ok for vermillion.
>>>>> However it seems those patches don't have OS dependencies so I think this
>>>>> kind of patches should be upstreamed in community instead of keeping the
>>>>> internal patches.
>>>>>
>>>>> Thanks,
>>>>> fujiwara
>>>>>
>>>>> Evan Yan ????????:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> The patch is to setting pref intl.locale.matchOS to support
>>>>>> multi-language. It will replace firefox-06-locale.diff and
>>>>>> thunderbird-08-locale.diff with a new patch mozilla-09-locale.diff.
>>>>>>
>>>>>> Thanks,
>>>>>> -Evan
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>
>>>
>>
>
>
>
