Revert "PLT-1800 Load server side locale from the config.json" (matte…

…rmost#3201)

actions/global_actions.jsx

@@ -392,10 +392,8 @@ export function newLocalizationSelected(locale) {
  translations: en
  });
  } else {
- const localeInfo = I18n.getLanguageInfo(locale) || I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale);
-
  Client.getTranslations(
- localeInfo.url,
+ I18n.getLanguageInfo(locale).url,
  (data, res) => {
  let translations = data;
  if (!data && res.text) {
@@ -414,11 +412,16 @@ export function newLocalizationSelected(locale) {
  }
 }
 
-export function loadDefaultLocale() {
- const defaultLocale = global.window.mm_config.DefaultClientLocale;
- let locale = global.window.mm_user ? global.window.mm_user.locale || defaultLocale : defaultLocale;
+export function loadBrowserLocale() {
+ let locale = (navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] :
+ (navigator.language || navigator.userLanguage)).split('-')[0];
+
+ const user = UserStore.getCurrentUser();
+ if (user) {
+ locale = user.locale || locale;
+ }
 
- if (!I18n.getLanguageInfo(locale)) {
+ if (!I18n.getLanguages()[locale]) {
  locale = 'en';
  }
  return newLocalizationSelected(locale);

components/admin_console/admin_sidebar.jsx

@@ -292,15 +292,6 @@ export default class AdminSidebar extends React.Component {
  />
  }
  />
- <AdminSidebarSection
- name='localization'
- title={
- <FormattedMessage
- id='admin.sidebar.localization'
- defaultMessage='Localization'
- />
- }
- />
  <AdminSidebarSection
  name='users_and_teams'
  title={

components/root.jsx

@@ -6,7 +6,6 @@
 
 import * as GlobalActions from 'actions/global_actions.jsx';
 import LocalizationStore from 'stores/localization_store.jsx';
-import Client from 'utils/web_client.jsx';
 
 import {IntlProvider} from 'react-intl';
 
@@ -42,10 +41,7 @@ export default class Root extends React.Component {
  FastClick.attach(document.body);
  }
  localizationChanged() {
- const locale = LocalizationStore.getLocale();
-
- Client.setAcceptLanguage(locale);
- this.setState({locale, translations: LocalizationStore.getTranslations()});
+ this.setState({locale: LocalizationStore.getLocale(), translations: LocalizationStore.getTranslations()});
  }
 
  redirectIfNecessary(props) {
@@ -71,7 +67,7 @@ export default class Root extends React.Component {
  LocalizationStore.addChangeListener(this.localizationChanged);
 
  // Get our localizaiton
- GlobalActions.loadDefaultLocale();
+ GlobalActions.loadBrowserLocale();
  }
  componentWillUnmount() {
  LocalizationStore.removeChangeListener(this.localizationChanged);

components/user_settings/user_settings_display.jsx

@@ -641,11 +641,7 @@ export default class UserSettingsDisplay extends React.Component {
  );
  }
 
- const userLocale = this.props.user.locale;
  if (this.props.activeSection === 'languages') {
- if (!I18n.isLanguageAvailable(userLocale)) {
- this.props.user.locale = global.window.mm_config.DefaultClientLocale;
- }
  languagesSection = (
  <ManageLanguages
  user={this.props.user}
@@ -656,12 +652,7 @@ export default class UserSettingsDisplay extends React.Component {
  />
  );
  } else {
- let locale;
- if (I18n.isLanguageAvailable(userLocale)) {
- locale = I18n.getLanguageInfo(userLocale).name;
- } else {
- locale = I18n.getLanguageInfo(global.window.mm_config.DefaultClientLocale).name;
- }
+ var locale = I18n.getLanguageInfo(this.props.user.locale).name;
 
  languagesSection = (
  <SettingItemMin

i18n/i18n.jsx

@@ -4,7 +4,7 @@
 const es = require('!!file?name=i18n/[name].[ext]!./es.json');
 const fr = require('!!file?name=i18n/[name].[ext]!./fr.json');
 const ja = require('!!file?name=i18n/[name].[ext]!./ja.json');
-const pt_BR = require('!!file?name=i18n/[name].[ext]!./pt-BR.json'); //eslint-disable-line camelcase
+const pt = require('!!file?name=i18n/[name].[ext]!./pt.json');
 
 import {addLocaleData} from 'react-intl';
 import enLocaleData from 'react-intl/locale-data/en';
@@ -34,47 +34,19 @@ const languages = {
  name: '日本語 (Beta)',
  url: ja
  },
- 'pt-BR': {
- value: 'pt-BR',
+ pt: {
+ value: 'pt',
  name: 'Portugues (Beta)',
- url: pt_BR
+ url: pt
  }
 };
 
-let availableLanguages = null;
-
-function setAvailableLanguages() {
- const available = global.window.mm_config.AvailableLocales.split(',');
-
- availableLanguages = {};
-
- available.forEach((l) => {
- if (languages[l]) {
- availableLanguages[l] = languages[l];
- }
- });
-}
-
-export function getAllLanguages() {
- return languages;
-}
-
 export function getLanguages() {
- if (!availableLanguages) {
- setAvailableLanguages();
- }
- return availableLanguages;
+ return languages;
 }
 
 export function getLanguageInfo(locale) {
- if (!availableLanguages) {
- setAvailableLanguages();
- }
- return availableLanguages[locale];
-}
-
-export function isLanguageAvailable(locale) {
- return !!availableLanguages[locale];
+ return languages[locale];
 }
 
 export function safariFix(callback) {