MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

properties: do not add redundant "_" to suffix

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-12-21 16:40:51 +03:00
parent 687b087733
commit bc917088bf
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java
+10 -1
View File
@@ -152,7 +152,16 @@ public class PropertiesUtil {
final String language = splitRawLocale[1];
final String country = splitRawLocale.length > 2 ? splitRawLocale[2] : "";
final String variant = splitRawLocale.length > 3 ? splitRawLocale[3] : "";
return Pair.create(new Locale(language, country, variant), language + "_" + country + "_" + variant);
StringBuilder trimmedSuffix = new StringBuilder(language);
if (!country.isEmpty()) {
trimmedSuffix.append("_").append(country);
}
if (!variant.isEmpty()) {
trimmedSuffix.append("_").append(variant);
}
return Pair.create(new Locale(language, country, variant), trimmedSuffix.toString());
}
}
return Pair.create(DEFAULT_LOCALE, "");