Skip to content

[FIX] Usage of subtagged languages #6575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
engelgabriel merged 1 commit into from
Apr 4, 2017
Merged

[FIX] Usage of subtagged languages #6575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion client/startup/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Meteor.startup(function() {
return RocketChat.settings.get('Language') || defaultAppLanguage();
};

const availableLanguages = TAPi18n.getLanguages();
const loadedLanguages = [];

window.setLanguage = function(language) {
Expand All @@ -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();
Expand Down
10 changes: 9 additions & 1 deletion packages/rocketchat-livechat/app/client/views/livechatWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})/;
Expand Down Expand Up @@ -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();
Expand Down