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

Commit 31445528 authored by Jungshik Shin's avatar Jungshik Shin
Browse files

Load hyphenator for 22 new languages 

In addition, all English locales other than those explicitly mapped
to en-US are mapped to en-GB.

BUG: 26405413
Change-Id: Ie5b77af164c95a6ed5639da5752ddf21f92181bc
parent 95972768

core/java/android/text/Hyphenator.java

+29 −2
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ public class Hyphenator { 
        {"en-UM", "en-US"}, // English (United States Minor Outlying Islands)

        {"en-VI", "en-US"}, // English (Virgin Islands)



        // All English locales other than those falling back to en-US are mapped to en-GB.

        {"en", "en-GB"},



        // For German, we're assuming the 1996 (and later) orthography by default.

        {"de", "de-1996"},

        // Liechtenstein uses the Swiss hyphenation rules for the 1901 orthography.
@@ -160,6 +163,9 @@ public class Hyphenator { 
        // Norwegian is very probably Norwegian Bokmål.

        {"no", "nb"},



        // Use mn-Cyrl. According to CLDR's likelySubtags.xml, mn is most likely to be mn-Cyrl.

        {"mn", "mn-Cyrl"}, // Mongolian



        // Fall back to Ethiopic script for languages likely to be written in Ethiopic.

        // Data is from CLDR's likelySubtags.xml.

        // TODO: Convert this to a mechanism using ICU4J's ULocale#addLikelySubtags().
@@ -182,15 +188,36 @@ public class Hyphenator { 


        // TODO: replace this with a discovery-based method that looks into /system/usr/hyphen-data

        String[] availableLanguages = {

            "as",

            "bn",

            "cy",

            "da",

            "de-1901", "de-1996", "de-CH-1901",

            "en-US",

            "en-GB", "en-US",

            "es",

            "et",

            "eu",

            "fr",

            "ga",

            "gu",

            "hi",

            "hr",

            "hu",

            "hy",

            "kn",

            "ml",

            "mn-Cyrl",

            "mr",

            "nb",

            "nn",

            "or",

            "pa",

            "pt",

            "und-Ethi"

            "sl",

            "ta",

            "te",

            "tk",

            "und-Ethi",

        };

        for (int i = 0; i < availableLanguages.length; i++) {

            String languageTag = availableLanguages[i];