PLT-6518 Fixed user's locale not being loaded with redux actions (#6359)

* Stopped ManageLanguages component from mutating user

* Removed obsolete reference to mm_user

* PLT-6518 Fixed user's locale not being loaded with redux actions
Этот коммит содержится в:
Harrison Healey
2017-05-09 16:00:40 -04:00
коммит произвёл Joram Wilander
родитель e52ab9737e
Коммит 0c701cc1d0
7 изменённых файлов: 27 добавлений и 19 удалений

Просмотреть файл

@@ -379,7 +379,7 @@ export function newLocalizationSelected(locale) {
translations: en
});
} else {
const localeInfo = I18n.getLanguageInfo(locale) || I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale);
const localeInfo = I18n.getLanguageInfo(locale);
Client.getTranslations(
localeInfo.url,
@@ -401,13 +401,23 @@ export function newLocalizationSelected(locale) {
}
}
export function loadCurrentLocale() {
const user = UserStore.getCurrentUser();
if (user && user.locale) {
newLocalizationSelected(user.locale);
} else {
loadDefaultLocale();
}
}
export function loadDefaultLocale() {
const defaultLocale = global.window.mm_config.DefaultClientLocale;
let locale = global.window.mm_user ? global.window.mm_user.locale || defaultLocale : defaultLocale;
let locale = global.window.mm_config.DefaultClientLocale;
if (!I18n.getLanguageInfo(locale)) {
locale = 'en';
}
return newLocalizationSelected(locale);
}

Просмотреть файл

@@ -9,6 +9,7 @@ import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import {getChannelMembersForUserIds} from 'actions/channel_actions.jsx';
import {loadCurrentLocale} from 'actions/global_actions.jsx';
import {loadStatusesForProfilesList, loadStatusesForProfilesMap} from 'actions/status_actions.jsx';
import {getDirectChannelName, getUserIdFromChannelName} from 'utils/utils.jsx';
@@ -51,6 +52,8 @@ import {getTeamMembersByIds, getMyTeamMembers} from 'mattermost-redux/actions/te
export function loadMe(callback) {
loadMeRedux()(dispatch, getState).then(
() => {
loadCurrentLocale();
if (callback) {
callback();
}