Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc4a34a authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Don't say "Arabic (Egypt)" in Settings. 

Nexus devices only ship one Arabic locale: ar_EG. This should probably be
changed to ar_001 in a later release (and, really, we should let users
choose _all_ of the Arabic-speaking countries), but there's no time for L.

This adds ar_EG to the list of special cases for LocalePicker so that
we'll show "Arabic" instead of "Arabic (Egypt)" (the actual change uses
the Arabic for "Arabic", obviously).

If you're an OEM trying to ship multiple Arabic locales, please accept
my apologies for making your lives slightly harder and, yes, this is the
patch you want to revert so that ar_EG shows up as "Arabic (Egypt)" again.

Bug: 17150708
Change-Id: Iea2fdf813bf3d7758e667bb1a8134a612ee0317b
parent 730e9bce

core/res/res/values/arrays.xml

+12 −0
Original line number Diff line number Diff line
@@ -506,12 +506,24 @@ 


    <!-- Used in LocalePicker -->

    <string-array translatable="false" name="special_locale_codes">

        <!-- http://b/17150708 - ensure that the list of languages says "Arabic"

             rather than "Arabic (Egypt)". If you're an OEM supporting multiple

             Arabic locales, you should remove this entry so that ar_EG is shown

             as "Arabic (Egypt)" in Settings. -->

        <item>ar_EG</item>



        <item>zh_CN</item>

        <item>zh_TW</item>

    </string-array>



    <!-- Used in LocalePicker -->

    <string-array translatable="false" name="special_locale_names">

        <!-- http://b/17150708 - ensure that the list of languages says "Arabic"

             rather than "Arabic (Egypt)". If you're an OEM supporting multiple

             Arabic locales, you should remove this entry so that ar_EG is shown

             as "Arabic (Egypt)" in Settings. -->

        <item>العربية</item>



        <item>中文 (简体)</item>

        <item>中文 (繁體)</item>

    </string-array>