Skip to content

Commit 81498b4

Browse files
authored
Merge pull request #1532 from codeWithPunith/fix-1501-5.4
Fixes #1501
2 parents 0b7b07c + bd3ace2 commit 81498b4

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/pat/select2/select2.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,14 @@ export default Base.extend({
111111
// Don't load "en" which is the default where no separate language file exists.
112112
if (this.options.language && this.options.language !== "en" && !this.options.language.startsWith("en")) {
113113
let lang = this.options.language.split("-");
114-
// Fix for country specific languages
115-
lang = (lang.length > 1) ? `${lang[0]}-${lang[1]}` : lang[0];
114+
// Fix for country specific languages — only for supported combined locales
115+
const supportedCombined = new Set(["pt-BR", "pt-PT", "ug-CN", "zh-CN", "zh-TW"]);
116+
if(lang.length>1){
117+
const combined =`${lang[0]}-${lang[1].toUpperCase()}`;
118+
lang = supportedCombined.has(combined) ? combined : lang[0];
119+
}else{
120+
lang = lang[0];
121+
}
116122
await import(`select2/select2_locale_${lang}`);
117123
}
118124
} catch {

0 commit comments

Comments
 (0)