Merge pull request #6575 from RocketChat/fix-not-loaging-language-sub…

…tags [FIX] Usage of subtagged languages
RocketChat · Apr 4, 2017 · d327724 · d327724
2 parents 890c4a2 + 6aa70d7
commit d327724
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/client/startup/startup.js b/client/startup/startup.js
@@ -44,6 +44,7 @@ Meteor.startup(function() {
 		return RocketChat.settings.get('Language') || defaultAppLanguage();
 	};
 
+	const availableLanguages = TAPi18n.getLanguages();
 	const loadedLanguages = [];
 
 	window.setLanguage = function(language) {
@@ -63,7 +64,10 @@ Meteor.startup(function() {
 			$('html').removeClass('rtl');
 		}
 
-		language = language.split('-').shift();
+		if (!availableLanguages[language]) {
+			language = language.split('-').shift();
+		}
+
 		TAPi18n.setLanguage(language);
 
 		language = language.toLowerCase();

diff --git a/packages/rocketchat-livechat/app/client/views/livechatWindow.js b/packages/rocketchat-livechat/app/client/views/livechatWindow.js
@@ -70,6 +70,8 @@ Template.livechatWindow.events({
 Template.livechatWindow.onCreated(function() {
 	Session.set({sound: true});
 
+	const availableLanguages = TAPi18n.getLanguages();
+
 	const defaultAppLanguage = () => {
 		let lng = window.navigator.userLanguage || window.navigator.language || 'en';
 		const regexp = /([a-z]{2}-)([a-z]{2})/;
@@ -118,7 +120,13 @@ Template.livechatWindow.onCreated(function() {
 				Livechat.agent = result.agentData;
 			}
 
-			TAPi18n.setLanguage((result.language || defaultAppLanguage()).split('-').shift());
+			let language = result.language || defaultAppLanguage();
+
+			if (!availableLanguages[language]) {
+				language = language.split('-').shift();
+			}
+
+			TAPi18n.setLanguage(language);
 
 			Triggers.setTriggers(result.triggers);
 			Triggers.init();