Commit e18efaae authored by Romain Bioteau's avatar Romain Bioteau

Merge remote-tracking branch 'origin/master' into dev

parents f3531166 01bab2a1
......@@ -112,6 +112,7 @@ public class LocaleUtil {
if (split.length == 2) {
language = split[1];
} else if (split.length == 3) {
language = split[1];
country = split[2];
}
if (language != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment