From e4b57846e7fd16262451f26cf06f4e35eb63a2f2 Mon Sep 17 00:00:00 2001 From: Mars Lan Date: Tue, 23 Jun 2020 14:59:14 -0700 Subject: [PATCH] Fix zh_* locale parsing By properly searching for the first undescore --- .../src/main/java/com/henninghall/date_picker/LocaleUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/henninghall/date_picker/LocaleUtils.java b/android/src/main/java/com/henninghall/date_picker/LocaleUtils.java index 596ce91..1c8fabf 100644 --- a/android/src/main/java/com/henninghall/date_picker/LocaleUtils.java +++ b/android/src/main/java/com/henninghall/date_picker/LocaleUtils.java @@ -43,7 +43,7 @@ public class LocaleUtils { locale = org.apache.commons.lang3.LocaleUtils.toLocale(languageTag); } catch (Exception e ){ // Some locales can only be interpreted from country string (for instance zh_Hans_CN ) - String firstPartOfLanguageTag = languageTag.substring(0, languageTag.indexOf("")); + String firstPartOfLanguageTag = languageTag.substring(0, languageTag.indexOf("_")); locale = org.apache.commons.lang3.LocaleUtils.toLocale(firstPartOfLanguageTag); } return locale;