Message ID | 1501055354-43092-1-git-send-email-akhilesh.k@samsung.com |
---|---|
State | New |
Headers | show |
Akhilesh Kumar <akhilesh.k@samsung.com> wrote: > [BZ #21836] > * locales/ar_IN (LC_MONETARY) : Edit > * locales/as_IN (LC_MONETARY) : Edit > * locales/bhb_IN (LC_MONETARY): Edit > * locales/bn_IN (LC_MONETARY) : Edit > * locales/en_IN (LC_MONETARY) : Edit > * locales/gu_IN (LC_MONETARY) : Edit > * locales/kn_IN (LC_MONETARY) : Edit > * locales/kok_IN(LC_MONETARY) : Edit > * locales/ks_IN (LC_MONETARY) : Edit > * locales/ml_IN (LC_MONETARY) : Edit > * locales/mr_IN (LC_MONETARY) : Edit > * locales/or_IN (LC_MONETARY) : Edit > * locales/pa_IN (LC_MONETARY) : Edit > * locales/sa_IN (LC_MONETARY) : Edit > * locales/sd_IN (LC_MONETARY) : Edit > * locales/ta_IN (LC_MONETARY) : Edit > * locales/tcy_IN(LC_MONETARY) : Edit > * locales/te_IN (LC_MONETARY) : Edit > * locales/ur_IN (LC_MONETARY) : Edit [...] > diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN > index 094f2cd..94c2834 100644 > --- a/localedata/locales/ks_IN > +++ b/localedata/locales/ks_IN > @@ -56,29 +56,7 @@ copy "iso14651_t1" > > END LC_COLLATE > > - > -LC_MONETARY You removed the LC_MONETARY opening tag here. > -% This is the POSIX Locale definition the LC_MONETARY category > -% generated by IBM Basic CountryPack Transformer. > -% These are generated based on XML base Locale defintion file > -% for IBM Class for Unicode. > -% > -int_curr_symbol "<U0049><U004E><U0052><U0020>" > -currency_symbol "<U20B9>" > -mon_decimal_point "<U002E>" > -mon_thousands_sep "<U002C>" > -mon_grouping 3 > -positive_sign "" > -negative_sign "<U002D>" > -int_frac_digits 2 > -frac_digits 2 > -p_cs_precedes 1 > -p_sep_by_space 1 > -n_cs_precedes 1 > -n_sep_by_space 1 > -p_sign_posn 1 > -n_sign_posn 1 > -% > +copy "hi_IN" > END LC_MONETARY
Akhilesh Kumar <akhilesh.k@samsung.com> wrote: > [BZ #21836] > * locales/ar_IN (LC_MONETARY) : Edit > * locales/as_IN (LC_MONETARY) : Edit > * locales/bhb_IN (LC_MONETARY): Edit > * locales/bn_IN (LC_MONETARY) : Edit > * locales/en_IN (LC_MONETARY) : Edit > * locales/gu_IN (LC_MONETARY) : Edit > * locales/kn_IN (LC_MONETARY) : Edit > * locales/kok_IN(LC_MONETARY) : Edit > * locales/ks_IN (LC_MONETARY) : Edit > * locales/ml_IN (LC_MONETARY) : Edit > * locales/mr_IN (LC_MONETARY) : Edit > * locales/or_IN (LC_MONETARY) : Edit > * locales/pa_IN (LC_MONETARY) : Edit > * locales/sa_IN (LC_MONETARY) : Edit > * locales/sd_IN (LC_MONETARY) : Edit > * locales/ta_IN (LC_MONETARY) : Edit > * locales/tcy_IN(LC_MONETARY) : Edit > * locales/te_IN (LC_MONETARY) : Edit > * locales/ur_IN (LC_MONETARY) : Edit committed.
On Wed, Jul 26, 2017 at 3:15 AM, Mike FABIAN <mfabian@redhat.com> wrote: > Akhilesh Kumar <akhilesh.k@samsung.com> wrote: > >> [BZ #21836] >> * locales/ar_IN (LC_MONETARY) : Edit >> * locales/as_IN (LC_MONETARY) : Edit >> * locales/bhb_IN (LC_MONETARY): Edit >> * locales/bn_IN (LC_MONETARY) : Edit >> * locales/en_IN (LC_MONETARY) : Edit >> * locales/gu_IN (LC_MONETARY) : Edit >> * locales/kn_IN (LC_MONETARY) : Edit >> * locales/kok_IN(LC_MONETARY) : Edit >> * locales/ks_IN (LC_MONETARY) : Edit >> * locales/ml_IN (LC_MONETARY) : Edit >> * locales/mr_IN (LC_MONETARY) : Edit >> * locales/or_IN (LC_MONETARY) : Edit >> * locales/pa_IN (LC_MONETARY) : Edit >> * locales/sa_IN (LC_MONETARY) : Edit >> * locales/sd_IN (LC_MONETARY) : Edit >> * locales/ta_IN (LC_MONETARY) : Edit >> * locales/tcy_IN(LC_MONETARY) : Edit >> * locales/te_IN (LC_MONETARY) : Edit >> * locales/ur_IN (LC_MONETARY) : Edit > > committed. > On Fedora/26, this caused: FAIL: stdlib/tst-strfmon_l error: locale te_IN.UTF-8, format "%i", value 1.23457e+06: mismatch error: expected: "INR12,34,567.89" error: actual: "INR 1,234,567.89" error: locale te_IN.UTF-8, format "%n", value 1.23457e+06: mismatch error: expected: "₹12,34,567.89" error: actual: "₹ 1,234,567.89" error: locale te_IN.UTF-8, format "%^i", value 1.23457e+06: mismatch error: expected: "INR1234567.89" error: actual: "INR 1234567.89" error: locale te_IN.UTF-8, format "%^n", value 1.23457e+06: mismatch error: expected: "₹1234567.89" error: actual: "₹ 1234567.89" error: locale te_IN.UTF-8, format "%i", value -1.23457e+06: mismatch error: expected: "-INR12,34,567.89" error: actual: "-INR 1,234,567.89" error: locale te_IN.UTF-8, format "%n", value -1.23457e+06: mismatch error: expected: "-₹12,34,567.89" error: actual: "-₹ 1,234,567.89" error: locale te_IN.UTF-8, format "%^i", value -1.23457e+06: mismatch error: expected: "-INR1234567.89" error: actual: "-INR 1234567.89" error: locale te_IN.UTF-8, format "%^n", value -1.23457e+06: mismatch error: expected: "-₹1234567.89" error: actual: "-₹ 1234567.89" error: locale bn_IN.UTF-8, format "%i", value 1.23457e+06: mismatch error: expected: "INR 12,345,67.89" error: actual: "INR 1,234,567.89" error: locale bn_IN.UTF-8, format "%n", value 1.23457e+06: mismatch error: expected: "₹ 12,345,67.89" error: actual: "₹ 1,234,567.89" error: locale bn_IN.UTF-8, format "%i", value -1.23457e+06: mismatch error: expected: "-INR 12,345,67.89" error: actual: "-INR 1,234,567.89" error: locale bn_IN.UTF-8, format "%n", value -1.23457e+06: mismatch error: expected: "-₹ 12,345,67.89" error: actual: "-₹ 1,234,567.89"
Akhilesh Kumar <akhilesh.k@samsung.com> writes: > diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN > index b27af12..f8074b5 100644 > --- a/localedata/locales/bn_IN > +++ b/localedata/locales/bn_IN > @@ -54,27 +54,7 @@ END LC_COLLATE > > > LC_MONETARY > -% This is the POSIX Locale definition the LC_MONETARY category > -% generated by IBM Basic CountryPack Transformer. > -% These are generated based on XML base Locale defintion file > -% for IBM Class for Unicode. > -% > -int_curr_symbol "<U0049><U004E><U0052><U0020>" > -currency_symbol "<U20B9>" > -mon_decimal_point "<U002E>" > -mon_thousands_sep "<U002C>" > -mon_grouping 2;3 mon_grouping is different than what hi_IN defines. > diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN > index e8c6424..a1f10e1 100644 > --- a/localedata/locales/te_IN > +++ b/localedata/locales/te_IN > @@ -75,27 +75,7 @@ END LC_COLLATE > > > LC_MONETARY > -% This is the POSIX Locale definition the LC_MONETARY category > -% generated by IBM Basic CountryPack Transformer. > -% These are generated based on XML base Locale defintion file > -% for IBM Class for Unicode. > -% > -int_curr_symbol "<U0049><U004E><U0052><U0020>" > -currency_symbol "<U20B9>" > -mon_decimal_point "<U002E>" > -mon_thousands_sep "<U002C>" > -mon_grouping 3;2 > -positive_sign "" > -negative_sign "<U002D>" > -int_frac_digits 2 > -frac_digits 2 > -p_cs_precedes 1 > -p_sep_by_space 0 > -n_cs_precedes 1 > -n_sep_by_space 0 Both p_sep_by_space and n_sep_by_space values were different than what hi_IN defines. These changes are causing errors at stdlib/tst-strfmon_l. Are these changes really expected?
On Wed, Jul 26, 2017 at 11:04 AM, Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> wrote: > Akhilesh Kumar <akhilesh.k@samsung.com> writes: > >> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN >> index b27af12..f8074b5 100644 >> --- a/localedata/locales/bn_IN >> +++ b/localedata/locales/bn_IN >> @@ -54,27 +54,7 @@ END LC_COLLATE >> >> >> LC_MONETARY >> -% This is the POSIX Locale definition the LC_MONETARY category >> -% generated by IBM Basic CountryPack Transformer. >> -% These are generated based on XML base Locale defintion file >> -% for IBM Class for Unicode. >> -% >> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> -currency_symbol "<U20B9>" >> -mon_decimal_point "<U002E>" >> -mon_thousands_sep "<U002C>" >> -mon_grouping 2;3 > > mon_grouping is different than what hi_IN defines. > >> diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN >> index e8c6424..a1f10e1 100644 >> --- a/localedata/locales/te_IN >> +++ b/localedata/locales/te_IN >> @@ -75,27 +75,7 @@ END LC_COLLATE >> >> >> LC_MONETARY >> -% This is the POSIX Locale definition the LC_MONETARY category >> -% generated by IBM Basic CountryPack Transformer. >> -% These are generated based on XML base Locale defintion file >> -% for IBM Class for Unicode. >> -% >> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> -currency_symbol "<U20B9>" >> -mon_decimal_point "<U002E>" >> -mon_thousands_sep "<U002C>" >> -mon_grouping 3;2 >> -positive_sign "" >> -negative_sign "<U002D>" >> -int_frac_digits 2 >> -frac_digits 2 >> -p_cs_precedes 1 >> -p_sep_by_space 0 >> -n_cs_precedes 1 >> -n_sep_by_space 0 > > Both p_sep_by_space and n_sep_by_space values were different than what > hi_IN defines. > > These changes are causing errors at stdlib/tst-strfmon_l. > > Are these changes really expected? > Should the commit be reverted for now?
On 07/26/2017 01:01 PM, H.J. Lu wrote: > On Wed, Jul 26, 2017 at 3:15 AM, Mike FABIAN <mfabian@redhat.com> wrote: >> Akhilesh Kumar <akhilesh.k@samsung.com> wrote: >> >>> [BZ #21836] >>> * locales/ar_IN (LC_MONETARY) : Edit >>> * locales/as_IN (LC_MONETARY) : Edit >>> * locales/bhb_IN (LC_MONETARY): Edit >>> * locales/bn_IN (LC_MONETARY) : Edit >>> * locales/en_IN (LC_MONETARY) : Edit >>> * locales/gu_IN (LC_MONETARY) : Edit >>> * locales/kn_IN (LC_MONETARY) : Edit >>> * locales/kok_IN(LC_MONETARY) : Edit >>> * locales/ks_IN (LC_MONETARY) : Edit >>> * locales/ml_IN (LC_MONETARY) : Edit >>> * locales/mr_IN (LC_MONETARY) : Edit >>> * locales/or_IN (LC_MONETARY) : Edit >>> * locales/pa_IN (LC_MONETARY) : Edit >>> * locales/sa_IN (LC_MONETARY) : Edit >>> * locales/sd_IN (LC_MONETARY) : Edit >>> * locales/ta_IN (LC_MONETARY) : Edit >>> * locales/tcy_IN(LC_MONETARY) : Edit >>> * locales/te_IN (LC_MONETARY) : Edit >>> * locales/ur_IN (LC_MONETARY) : Edit >> >> committed. >> > > On Fedora/26, this caused: > > FAIL: stdlib/tst-strfmon_l > > error: locale te_IN.UTF-8, format "%i", value 1.23457e+06: mismatch > error: expected: "INR12,34,567.89" > error: actual: "INR 1,234,567.89" > error: locale te_IN.UTF-8, format "%n", value 1.23457e+06: mismatch > error: expected: "₹12,34,567.89" > error: actual: "₹ 1,234,567.89" > error: locale te_IN.UTF-8, format "%^i", value 1.23457e+06: mismatch > error: expected: "INR1234567.89" > error: actual: "INR 1234567.89" > error: locale te_IN.UTF-8, format "%^n", value 1.23457e+06: mismatch > error: expected: "₹1234567.89" > error: actual: "₹ 1234567.89" > error: locale te_IN.UTF-8, format "%i", value -1.23457e+06: mismatch > error: expected: "-INR12,34,567.89" > error: actual: "-INR 1,234,567.89" > error: locale te_IN.UTF-8, format "%n", value -1.23457e+06: mismatch > error: expected: "-₹12,34,567.89" > error: actual: "-₹ 1,234,567.89" > error: locale te_IN.UTF-8, format "%^i", value -1.23457e+06: mismatch > error: expected: "-INR1234567.89" > error: actual: "-INR 1234567.89" > error: locale te_IN.UTF-8, format "%^n", value -1.23457e+06: mismatch > error: expected: "-₹1234567.89" > error: actual: "-₹ 1234567.89" > error: locale bn_IN.UTF-8, format "%i", value 1.23457e+06: mismatch > error: expected: "INR 12,345,67.89" > error: actual: "INR 1,234,567.89" > error: locale bn_IN.UTF-8, format "%n", value 1.23457e+06: mismatch > error: expected: "₹ 12,345,67.89" > error: actual: "₹ 1,234,567.89" > error: locale bn_IN.UTF-8, format "%i", value -1.23457e+06: mismatch > error: expected: "-INR 12,345,67.89" > error: actual: "-INR 1,234,567.89" > error: locale bn_IN.UTF-8, format "%n", value -1.23457e+06: mismatch > error: expected: "-₹ 12,345,67.89" > error: actual: "-₹ 1,234,567.89" Mike, Can you confirm that you see these failures? For avoidance of doubt we should be running the full glibc testsuite to make sure the locales get tested with the associated APIs that use them and thus catch errors like those above (or adjust test data for the changes).
Carlos O'Donell <carlos@redhat.com> さんはかきました: > On 07/26/2017 01:01 PM, H.J. Lu wrote: >> On Wed, Jul 26, 2017 at 3:15 AM, Mike FABIAN <mfabian@redhat.com> wrote: >>> Akhilesh Kumar <akhilesh.k@samsung.com> wrote: >>> >>>> [BZ #21836] >>>> * locales/ar_IN (LC_MONETARY) : Edit >>>> * locales/as_IN (LC_MONETARY) : Edit >>>> * locales/bhb_IN (LC_MONETARY): Edit >>>> * locales/bn_IN (LC_MONETARY) : Edit >>>> * locales/en_IN (LC_MONETARY) : Edit >>>> * locales/gu_IN (LC_MONETARY) : Edit >>>> * locales/kn_IN (LC_MONETARY) : Edit >>>> * locales/kok_IN(LC_MONETARY) : Edit >>>> * locales/ks_IN (LC_MONETARY) : Edit >>>> * locales/ml_IN (LC_MONETARY) : Edit >>>> * locales/mr_IN (LC_MONETARY) : Edit >>>> * locales/or_IN (LC_MONETARY) : Edit >>>> * locales/pa_IN (LC_MONETARY) : Edit >>>> * locales/sa_IN (LC_MONETARY) : Edit >>>> * locales/sd_IN (LC_MONETARY) : Edit >>>> * locales/ta_IN (LC_MONETARY) : Edit >>>> * locales/tcy_IN(LC_MONETARY) : Edit >>>> * locales/te_IN (LC_MONETARY) : Edit >>>> * locales/ur_IN (LC_MONETARY) : Edit >>> >>> committed. >>> >> >> On Fedora/26, this caused: >> >> FAIL: stdlib/tst-strfmon_l >> >> error: locale te_IN.UTF-8, format "%i", value 1.23457e+06: mismatch >> error: expected: "INR12,34,567.89" >> error: actual: "INR 1,234,567.89" >> error: locale te_IN.UTF-8, format "%n", value 1.23457e+06: mismatch >> error: expected: "₹12,34,567.89" >> error: actual: "₹ 1,234,567.89" >> error: locale te_IN.UTF-8, format "%^i", value 1.23457e+06: mismatch >> error: expected: "INR1234567.89" >> error: actual: "INR 1234567.89" >> error: locale te_IN.UTF-8, format "%^n", value 1.23457e+06: mismatch >> error: expected: "₹1234567.89" >> error: actual: "₹ 1234567.89" >> error: locale te_IN.UTF-8, format "%i", value -1.23457e+06: mismatch >> error: expected: "-INR12,34,567.89" >> error: actual: "-INR 1,234,567.89" >> error: locale te_IN.UTF-8, format "%n", value -1.23457e+06: mismatch >> error: expected: "-₹12,34,567.89" >> error: actual: "-₹ 1,234,567.89" >> error: locale te_IN.UTF-8, format "%^i", value -1.23457e+06: mismatch >> error: expected: "-INR1234567.89" >> error: actual: "-INR 1234567.89" >> error: locale te_IN.UTF-8, format "%^n", value -1.23457e+06: mismatch >> error: expected: "-₹1234567.89" >> error: actual: "-₹ 1234567.89" >> error: locale bn_IN.UTF-8, format "%i", value 1.23457e+06: mismatch >> error: expected: "INR 12,345,67.89" >> error: actual: "INR 1,234,567.89" >> error: locale bn_IN.UTF-8, format "%n", value 1.23457e+06: mismatch >> error: expected: "₹ 12,345,67.89" >> error: actual: "₹ 1,234,567.89" >> error: locale bn_IN.UTF-8, format "%i", value -1.23457e+06: mismatch >> error: expected: "-INR 12,345,67.89" >> error: actual: "-INR 1,234,567.89" >> error: locale bn_IN.UTF-8, format "%n", value -1.23457e+06: mismatch >> error: expected: "-₹ 12,345,67.89" >> error: actual: "-₹ 1,234,567.89" > > Mike, > > Can you confirm that you see these failures? > > For avoidance of doubt we should be running the full glibc testsuite > to make sure the locales get tested with the associated APIs that use > them and thus catch errors like those above (or adjust test data for > the changes). Yes, checking it.
"H.J. Lu" <hjl.tools@gmail.com> wrote: > On Wed, Jul 26, 2017 at 11:04 AM, Tulio Magno Quites Machado Filho > <tuliom@linux.vnet.ibm.com> wrote: >> Akhilesh Kumar <akhilesh.k@samsung.com> writes: >> >>> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN >>> index b27af12..f8074b5 100644 >>> --- a/localedata/locales/bn_IN >>> +++ b/localedata/locales/bn_IN >>> @@ -54,27 +54,7 @@ END LC_COLLATE >>> >>> >>> LC_MONETARY >>> -% This is the POSIX Locale definition the LC_MONETARY category >>> -% generated by IBM Basic CountryPack Transformer. >>> -% These are generated based on XML base Locale defintion file >>> -% for IBM Class for Unicode. >>> -% >>> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >>> -currency_symbol "<U20B9>" >>> -mon_decimal_point "<U002E>" >>> -mon_thousands_sep "<U002C>" >>> -mon_grouping 2;3 >> >> mon_grouping is different than what hi_IN defines. >> >>> diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN >>> index e8c6424..a1f10e1 100644 >>> --- a/localedata/locales/te_IN >>> +++ b/localedata/locales/te_IN >>> @@ -75,27 +75,7 @@ END LC_COLLATE >>> >>> >>> LC_MONETARY >>> -% This is the POSIX Locale definition the LC_MONETARY category >>> -% generated by IBM Basic CountryPack Transformer. >>> -% These are generated based on XML base Locale defintion file >>> -% for IBM Class for Unicode. >>> -% >>> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >>> -currency_symbol "<U20B9>" >>> -mon_decimal_point "<U002E>" >>> -mon_thousands_sep "<U002C>" >>> -mon_grouping 3;2 >>> -positive_sign "" >>> -negative_sign "<U002D>" >>> -int_frac_digits 2 >>> -frac_digits 2 >>> -p_cs_precedes 1 >>> -p_sep_by_space 0 >>> -n_cs_precedes 1 >>> -n_sep_by_space 0 >> >> Both p_sep_by_space and n_sep_by_space values were different than what >> hi_IN defines. >> >> These changes are causing errors at stdlib/tst-strfmon_l. >> >> Are these changes really expected? >> > > Should the commit be reverted for now? Yes, I reverted it.
* Tulio Magno Quites Machado Filho: > mon_grouping is different than what hi_IN defines. > Both p_sep_by_space and n_sep_by_space values were different than what > hi_IN defines. > > These changes are causing errors at stdlib/tst-strfmon_l. And to be absolutely clear: This test does not test these locales, but it verifies that certain aspects of thread-local locales are properly isolated from the process-wide locale object. If the locales no longer have this property, we can pick another locale, or maybe write our own locale for testing purposes.
> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN > index b27af12..f8074b5 100644 > --- a/localedata/locales/bn_IN > > +++ b/localedata/locales/bn_IN > > @@ -54,27 +54,7 @@ END LC_COLLATE > > > > > > LC_MONETARY >> -% This is the POSIX Locale definition the LC_MONETARY category >> -% generated by IBM Basic CountryPack Transformer. > > -% These are generated based on XML base Locale defintion file > > -% for IBM Class for Unicode. > > -% > > -int_curr_symbol "<U0049><U004E><U0052><U0020>" > > -currency_symbol "<U20B9>" > > -mon_decimal_point "<U002E>" > > -mon_thousands_sep "<U002C>" > > -mon_grouping 2;3 > > mon_grouping is different than what hi_IN defines. > > > diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN > > index e8c6424..a1f10e1 100644 > > --- a/localedata/locales/te_IN > > +++ b/localedata/locales/te_IN > > @@ -75,27 +75,7 @@ END LC_COLLATE > > > > > > LC_MONETARY > -% This is the POSIX Locale definition the LC_MONETARY category > -% generated by IBM Basic CountryPack Transformer. > -% These are generated based on XML base Locale defintion file > -% for IBM Class for Unicode. > -% > -int_curr_symbol "<U0049><U004E><U0052><U0020>" > -currency_symbol "<U20B9>" > -mon_decimal_point "<U002E>" > -mon_thousands_sep "<U002C>" > -mon_grouping 3;2 > -positive_sign "" > -negative_sign "<U002D>" > -int_frac_digits 2 > -frac_digits 2 > -p_cs_precedes 1 > -p_sep_by_space 0 > -n_cs_precedes 1 > -n_sep_by_space 0 > > Both p_sep_by_space and n_sep_by_space values were different than what > hi_IN defines. > > These changes are causing errors at stdlib/tst-strfmon_l. > >Are these changes really expected? I believe LC_MONETARY to be uniform across the country. Also In LC_MONETARY "mon_grouping" field in nation language “Hindi” seems wrong it could be 3;2 I will check other field (p_sep_by_space and n_sep_by_space) and Share Fix patch soon
Florian Weimer <fw@deneb.enyo.de> さんはかきました: > * Tulio Magno Quites Machado Filho: > >> mon_grouping is different than what hi_IN defines. > >> Both p_sep_by_space and n_sep_by_space values were different than what >> hi_IN defines. >> >> These changes are causing errors at stdlib/tst-strfmon_l. > > And to be absolutely clear: This test does not test these locales, but > it verifies that certain aspects of thread-local locales are properly > isolated from the process-wide locale object. > > If the locales no longer have this property, we can pick another > locale, or maybe write our own locale for testing purposes. Thank you, I thought so. My guess is that these monetary formatting values should be the same all over India and in that case we should pick another locale to test the above. First I am trying to confirm now whether the monetary formatting is really the same for all of India.
AKHILESH KUMAR <akhilesh.k@samsung.com> wrote: >> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN >> index b27af12..f8074b5 100644 >> --- a/localedata/locales/bn_IN >> > +++ b/localedata/locales/bn_IN >> > @@ -54,27 +54,7 @@ END LC_COLLATE >> > >> > >> > LC_MONETARY >>> -% This is the POSIX Locale definition the LC_MONETARY category >>> -% generated by IBM Basic CountryPack Transformer. >> > -% These are generated based on XML base Locale defintion file >> > -% for IBM Class for Unicode. >> > -% >> > -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> > -currency_symbol "<U20B9>" >> > -mon_decimal_point "<U002E>" >> > -mon_thousands_sep "<U002C>" >> > -mon_grouping 2;3 >> >> mon_grouping is different than what hi_IN defines. >> >> > diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN >> > index e8c6424..a1f10e1 100644 >> > --- a/localedata/locales/te_IN >> > +++ b/localedata/locales/te_IN >> > @@ -75,27 +75,7 @@ END LC_COLLATE >> > >> > >> > LC_MONETARY >> -% This is the POSIX Locale definition the LC_MONETARY category >> -% generated by IBM Basic CountryPack Transformer. >> -% These are generated based on XML base Locale defintion file >> -% for IBM Class for Unicode. >> -% >> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> -currency_symbol "<U20B9>" >> -mon_decimal_point "<U002E>" >> -mon_thousands_sep "<U002C>" >> -mon_grouping 3;2 >> -positive_sign "" >> -negative_sign "<U002D>" >> -int_frac_digits 2 >> -frac_digits 2 >> -p_cs_precedes 1 >> -p_sep_by_space 0 >> -n_cs_precedes 1 >> -n_sep_by_space 0 >> >> Both p_sep_by_space and n_sep_by_space values were different than what >> hi_IN defines. >> >> These changes are causing errors at stdlib/tst-strfmon_l. >> >>Are these changes really expected? > > > I believe LC_MONETARY to be uniform across the country. > > Also In LC_MONETARY "mon_grouping" field in nation language “Hindi” seems wrong > it could be 3;2 > > I will check other field (p_sep_by_space and n_sep_by_space) > and Share Fix patch soon Please add some proof whether LC_MONETARY is uniform all over India, if possible. I also guess that it is like that, but please make sure. Also for the mon_grouping field, please make really sure what the true value should be.
AKHILESH KUMAR <akhilesh.k@samsung.com> さんはかきました: >> diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN >> index b27af12..f8074b5 100644 >> --- a/localedata/locales/bn_IN >> > +++ b/localedata/locales/bn_IN >> > @@ -54,27 +54,7 @@ END LC_COLLATE >> > >> > >> > LC_MONETARY >>> -% This is the POSIX Locale definition the LC_MONETARY category >>> -% generated by IBM Basic CountryPack Transformer. >> > -% These are generated based on XML base Locale defintion file >> > -% for IBM Class for Unicode. >> > -% >> > -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> > -currency_symbol "<U20B9>" >> > -mon_decimal_point "<U002E>" >> > -mon_thousands_sep "<U002C>" >> > -mon_grouping 2;3 >> >> mon_grouping is different than what hi_IN defines. >> >> > diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN >> > index e8c6424..a1f10e1 100644 >> > --- a/localedata/locales/te_IN >> > +++ b/localedata/locales/te_IN >> > @@ -75,27 +75,7 @@ END LC_COLLATE >> > >> > >> > LC_MONETARY >> -% This is the POSIX Locale definition the LC_MONETARY category >> -% generated by IBM Basic CountryPack Transformer. >> -% These are generated based on XML base Locale defintion file >> -% for IBM Class for Unicode. >> -% >> -int_curr_symbol "<U0049><U004E><U0052><U0020>" >> -currency_symbol "<U20B9>" >> -mon_decimal_point "<U002E>" >> -mon_thousands_sep "<U002C>" >> -mon_grouping 3;2 >> -positive_sign "" >> -negative_sign "<U002D>" >> -int_frac_digits 2 >> -frac_digits 2 >> -p_cs_precedes 1 >> -p_sep_by_space 0 >> -n_cs_precedes 1 >> -n_sep_by_space 0 >> >> Both p_sep_by_space and n_sep_by_space values were different than what >> hi_IN defines. >> >> These changes are causing errors at stdlib/tst-strfmon_l. >> >>Are these changes really expected? > > > I believe LC_MONETARY to be uniform across the country. > > Also In LC_MONETARY "mon_grouping" field in nation language “Hindi” seems wrong > it could be 3;2 > > I will check other field (p_sep_by_space and n_sep_by_space) > and Share Fix patch soon Did you check these other fields for hi_IN already?
diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN index 791e63c..0f313c9 100644 --- a/localedata/locales/ar_IN +++ b/localedata/locales/ar_IN @@ -53,27 +53,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN index 028efd3..a95014a 100644 --- a/localedata/locales/as_IN +++ b/localedata/locales/as_IN @@ -58,27 +58,7 @@ END LC_NUMERIC %%%%%%%%%%%%% LC_MONETARY -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -int_p_cs_precedes 1 -int_p_sep_by_space 1 -int_n_cs_precedes 1 -int_n_sep_by_space 1 -int_p_sign_posn 1 -int_n_sign_posn 1 +copy "hi_IN" END LC_MONETARY %%%%%%%%%%%%% diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN index 49b1cbe..3be0f8f 100644 --- a/localedata/locales/bhb_IN +++ b/localedata/locales/bhb_IN @@ -39,7 +39,7 @@ category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE -copy "ks_IN" +copy "hi_IN" END LC_CTYPE LC_COLLATE diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN index b27af12..f8074b5 100644 --- a/localedata/locales/bn_IN +++ b/localedata/locales/bn_IN @@ -54,27 +54,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 2;3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN index 933a41c..7a4a27e 100644 --- a/localedata/locales/en_IN +++ b/localedata/locales/en_IN @@ -53,27 +53,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN index c0114ed..f690436 100644 --- a/localedata/locales/gu_IN +++ b/localedata/locales/gu_IN @@ -74,26 +74,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category. -% These are generated based on XML base Locale definition file -% for IBM Class for Unicode/Java -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "<U002B>" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN index 8a62305..1398efb 100644 --- a/localedata/locales/kn_IN +++ b/localedata/locales/kn_IN @@ -78,21 +78,7 @@ LC_MONETARY % These are generated based on XML base Locale definition file % for IBM Class for Unicode/Java % -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 +copy "hi_IN" % END LC_MONETARY diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN index 095e97b..2f23200 100644 --- a/localedata/locales/kok_IN +++ b/localedata/locales/kok_IN @@ -51,27 +51,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN index 094f2cd..94c2834 100644 --- a/localedata/locales/ks_IN +++ b/localedata/locales/ks_IN @@ -56,29 +56,7 @@ copy "iso14651_t1" END LC_COLLATE - -LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN index af11c75..4711cc2 100644 --- a/localedata/locales/ml_IN +++ b/localedata/locales/ml_IN @@ -65,33 +65,12 @@ END LC_CTYPE % % LC_COLLATE - % Copy the template from ISO/IEC 14651 copy "iso14651_t1" - END LC_COLLATE -LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 % +LC_MONETARY +copy "hi_IN" END LC_MONETARY % LC_NUMERIC diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN index d69a0d1..3945a76 100644 --- a/localedata/locales/mr_IN +++ b/localedata/locales/mr_IN @@ -71,27 +71,7 @@ reorder-end END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN index a1b5bad..a7cc6ac 100644 --- a/localedata/locales/or_IN +++ b/localedata/locales/or_IN @@ -614,27 +614,7 @@ END LC_NUMERIC %%%%%%%%%%%%% LC_MONETARY -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -int_p_cs_precedes 1 -int_p_sep_by_space 1 -int_n_cs_precedes 1 -int_n_sep_by_space 1 -int_p_sign_posn 1 -int_n_sign_posn 1 +copy "hi_IN" END LC_MONETARY %%%%%%%%%%%%% diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN index 487133b..5b9baea 100644 --- a/localedata/locales/pa_IN +++ b/localedata/locales/pa_IN @@ -72,23 +72,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category. -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN index c0ccdec..7ca0317 100644 --- a/localedata/locales/sa_IN +++ b/localedata/locales/sa_IN @@ -55,26 +55,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category. -% These are generated based on XML base Locale definition file -% for IBM Class for Unicode/Java -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN index bc9d681..f0c653e 100644 --- a/localedata/locales/sd_IN +++ b/localedata/locales/sd_IN @@ -58,27 +58,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN index 425e042..bb49031 100644 --- a/localedata/locales/ta_IN +++ b/localedata/locales/ta_IN @@ -75,27 +75,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN index 9f021c5..01d66ff 100644 --- a/localedata/locales/tcy_IN +++ b/localedata/locales/tcy_IN @@ -52,7 +52,7 @@ copy "iso14651_t1" END LC_COLLATE LC_MONETARY -copy "kn_IN" +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN index e8c6424..a1f10e1 100644 --- a/localedata/locales/te_IN +++ b/localedata/locales/te_IN @@ -75,27 +75,7 @@ END LC_COLLATE LC_MONETARY -% This is the POSIX Locale definition the LC_MONETARY category -% generated by IBM Basic CountryPack Transformer. -% These are generated based on XML base Locale defintion file -% for IBM Class for Unicode. -% -int_curr_symbol "<U0049><U004E><U0052><U0020>" -currency_symbol "<U20B9>" -mon_decimal_point "<U002E>" -mon_thousands_sep "<U002C>" -mon_grouping 3;2 -positive_sign "" -negative_sign "<U002D>" -int_frac_digits 2 -frac_digits 2 -p_cs_precedes 1 -p_sep_by_space 0 -n_cs_precedes 1 -n_sep_by_space 0 -p_sign_posn 1 -n_sign_posn 1 -% +copy "hi_IN" END LC_MONETARY diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN index 1af10ed..ae775d4 100644 --- a/localedata/locales/ur_IN +++ b/localedata/locales/ur_IN @@ -58,7 +58,7 @@ END LC_COLLATE LC_MONETARY -copy "ar_IN" +copy "hi_IN" END LC_MONETARY
[BZ #21836] * locales/ar_IN (LC_MONETARY) : Edit * locales/as_IN (LC_MONETARY) : Edit * locales/bhb_IN (LC_MONETARY): Edit * locales/bn_IN (LC_MONETARY) : Edit * locales/en_IN (LC_MONETARY) : Edit * locales/gu_IN (LC_MONETARY) : Edit * locales/kn_IN (LC_MONETARY) : Edit * locales/kok_IN(LC_MONETARY) : Edit * locales/ks_IN (LC_MONETARY) : Edit * locales/ml_IN (LC_MONETARY) : Edit * locales/mr_IN (LC_MONETARY) : Edit * locales/or_IN (LC_MONETARY) : Edit * locales/pa_IN (LC_MONETARY) : Edit * locales/sa_IN (LC_MONETARY) : Edit * locales/sd_IN (LC_MONETARY) : Edit * locales/ta_IN (LC_MONETARY) : Edit * locales/tcy_IN(LC_MONETARY) : Edit * locales/te_IN (LC_MONETARY) : Edit * locales/ur_IN (LC_MONETARY) : Edit Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com> --- localedata/locales/ar_IN | 22 +--------------------- localedata/locales/as_IN | 22 +--------------------- localedata/locales/bhb_IN | 2 +- localedata/locales/bn_IN | 22 +--------------------- localedata/locales/en_IN | 22 +--------------------- localedata/locales/gu_IN | 21 +-------------------- localedata/locales/kn_IN | 16 +--------------- localedata/locales/kok_IN | 22 +--------------------- localedata/locales/ks_IN | 24 +----------------------- localedata/locales/ml_IN | 25 ++----------------------- localedata/locales/mr_IN | 22 +--------------------- localedata/locales/or_IN | 22 +--------------------- localedata/locales/pa_IN | 18 +----------------- localedata/locales/sa_IN | 21 +-------------------- localedata/locales/sd_IN | 22 +--------------------- localedata/locales/ta_IN | 22 +--------------------- localedata/locales/tcy_IN | 2 +- localedata/locales/te_IN | 22 +--------------------- localedata/locales/ur_IN | 2 +- 19 files changed, 20 insertions(+), 331 deletions(-)