PLT-1800 Load server side locale from the config.json (#3202)
* PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics * Fix localization on served locale file as plain/text * Remove github.com/cloudfoundry/jibber_jabber as vendor dependency * Fix get locale on login_controller
Этот коммит содержится в:
@@ -53,6 +53,7 @@ const ActionTypes = Constants.ActionTypes;
|
||||
import AdminConsole from 'components/admin_console/admin_console.jsx';
|
||||
import SystemAnalytics from 'components/analytics/system_analytics.jsx';
|
||||
import ConfigurationSettings from 'components/admin_console/configuration_settings.jsx';
|
||||
import LocalizationSettings from 'components/admin_console/localization_settings.jsx';
|
||||
import UsersAndTeamsSettings from 'components/admin_console/users_and_teams_settings.jsx';
|
||||
import PrivacySettings from 'components/admin_console/privacy_settings.jsx';
|
||||
import LogSettings from 'components/admin_console/log_settings.jsx';
|
||||
@@ -142,8 +143,8 @@ function preRenderSetup(callwhendone) {
|
||||
);
|
||||
|
||||
function afterIntl() {
|
||||
I18n.doAddLocaleData();
|
||||
$.when(d1).done(() => {
|
||||
I18n.doAddLocaleData();
|
||||
callwhendone();
|
||||
});
|
||||
}
|
||||
@@ -362,6 +363,10 @@ function renderRootComponent() {
|
||||
path='configuration'
|
||||
component={ConfigurationSettings}
|
||||
/>
|
||||
<Route
|
||||
path='localization'
|
||||
component={LocalizationSettings}
|
||||
/>
|
||||
<Route
|
||||
path='users_and_teams'
|
||||
component={UsersAndTeamsSettings}
|
||||
|
||||
Ссылка в новой задаче
Block a user