OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't fail on nullable locale (currently not forbidden) (#886) 

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
pull/893/head
Markus Rathgeb 2019-06-20 21:34:18 +02:00 committed by Kai Kreuzer
parent 2ed5110668
commit 7d7f8d044d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.core.voice/src/main/java/org/eclipse/smarthome/core/voice/text/AbstractRuleBasedInterpreter.java
View File

@ -585,16 +585,17 @@ public abstract class AbstractRuleBasedInterpreter implements HumanLanguageInter
* @return resulting tokens * @return resulting tokens
*/ */
protected ArrayList<String> tokenize(Locale locale, String text) { protected ArrayList<String> tokenize(Locale locale, String text) {
final Locale localeSafe = locale != null ? locale : Locale.getDefault();
ArrayList<String> parts = new ArrayList<String>(); ArrayList<String> parts = new ArrayList<String>();
if (text == null) { if (text == null) {
return parts; return parts;
} }
String[] split; String[] split;
if ((locale != null) && locale.getLanguage().equalsIgnoreCase(Locale.FRENCH.getLanguage())) { if (localeSafe.getLanguage().equalsIgnoreCase(Locale.FRENCH.getLanguage())) {
split = text.toLowerCase(locale).replaceAll("[\\']", " ").replaceAll("[^\\w\\sàâäçéèêëîïôùûü]", " ") split = text.toLowerCase(localeSafe).replaceAll("[\\']", " ").replaceAll("[^\\w\\sàâäçéèêëîïôùûü]", " ")
.split("\\s"); .split("\\s");
} else { } else {
split = text.toLowerCase(locale).replaceAll("[\\']", "").replaceAll("[^\\w\\s]", " ").split("\\s"); split = text.toLowerCase(localeSafe).replaceAll("[\\']", "").replaceAll("[^\\w\\s]", " ").split("\\s");
} }
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
String part = split[i].trim(); String part = split[i].trim();