equal
deleted
inserted
replaced
62 } |
62 } |
63 } |
63 } |
64 |
64 |
65 public static BaseLocale getInstance(String language, String script, String region, String variant) { |
65 public static BaseLocale getInstance(String language, String script, String region, String variant) { |
66 // JDK uses deprecated ISO639.1 language codes for he, yi and id |
66 // JDK uses deprecated ISO639.1 language codes for he, yi and id |
67 if (AsciiUtil.caseIgnoreMatch(language, "he")) { |
67 if (language != null) { |
68 language = "iw"; |
68 if (AsciiUtil.caseIgnoreMatch(language, "he")) { |
69 } else if (AsciiUtil.caseIgnoreMatch(language, "yi")) { |
69 language = "iw"; |
70 language = "ji"; |
70 } else if (AsciiUtil.caseIgnoreMatch(language, "yi")) { |
71 } else if (AsciiUtil.caseIgnoreMatch(language, "id")) { |
71 language = "ji"; |
72 language = "in"; |
72 } else if (AsciiUtil.caseIgnoreMatch(language, "id")) { |
|
73 language = "in"; |
|
74 } |
73 } |
75 } |
74 |
76 |
75 Key key = new Key(language, script, region, variant); |
77 Key key = new Key(language, script, region, variant); |
76 BaseLocale baseLocale = CACHE.get(key); |
78 BaseLocale baseLocale = CACHE.get(key); |
77 return baseLocale; |
79 return baseLocale; |