Swap order between Romanian and Turkish (mattermost#1559)

* Swap order between Romanian and Turkish Romanian should be below Portuguese, above Turkish * Update i18n.jsx * reorder and fix tests
Revanth47 · Aug 14, 2018 · 769d307 · 769d307
1 parent 2624f85
commit 769d307
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/i18n/i18n.jsx b/i18n/i18n.jsx
@@ -20,12 +20,12 @@ const pl = require('./pl.json');
 
 const ptBR = require('./pt-BR.json');
 
-const tr = require('./tr.json');
-
 const ro = require('./ro.json');
 
 const ru = require('./ru.json');
 
+const tr = require('./tr.json');
+
 const zhTW = require('./zh-TW.json');
 
 const zhCN = require('./zh-CN.json');
@@ -41,9 +41,9 @@ import koLocaleData from 'react-intl/locale-data/ko';
 import nlLocaleData from 'react-intl/locale-data/nl';
 import plLocaleData from 'react-intl/locale-data/pl';
 import ptLocaleData from 'react-intl/locale-data/pt';
-import trLocaleData from 'react-intl/locale-data/tr';
 import roLocaleData from 'react-intl/locale-data/ro';
 import ruLocaleData from 'react-intl/locale-data/ru';
+import trLocaleData from 'react-intl/locale-data/tr';
 import zhLocaleData from 'react-intl/locale-data/zh';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
@@ -111,24 +111,24 @@ const languages = {
  order: 7,
  url: ptBR,
  },
- tr: {
- value: 'tr',
- name: 'Türkçe',
- order: 8,
- url: tr,
- },
  ro: {
  value: 'ro',
  name: 'Română (Beta)',
- order: 9,
+ order: 8,
  url: ro,
  },
  ru: {
  value: 'ru',
  name: 'Pусский (Alpha)',
- order: 10,
+ order: 9,
  url: ru,
  },
+ tr: {
+ value: 'tr',
+ name: 'Türkçe',
+ order: 10,
+ url: tr,
+ },
  'zh-TW': {
  value: 'zh-TW',
  name: '中文 (繁體)',
@@ -177,9 +177,9 @@ export function safariFix(callback) {
  'intl/locale-data/jsonp/nl.js',
  'intl/locale-data/jsonp/pl.js',
  'intl/locale-data/jsonp/pt.js',
- 'intl/locale-data/jsonp/tr.js',
  'intl/locale-data/jsonp/ro.js',
  'intl/locale-data/jsonp/ru.js',
+ 'intl/locale-data/jsonp/tr.js',
  'intl/locale-data/jsonp/zh.js',
  ], (require) => {
  require('intl');
@@ -193,9 +193,9 @@ export function safariFix(callback) {
  require('intl/locale-data/jsonp/nl.js');
  require('intl/locale-data/jsonp/pl.js');
  require('intl/locale-data/jsonp/pt.js');
- require('intl/locale-data/jsonp/tr.js');
  require('intl/locale-data/jsonp/ro.js');
  require('intl/locale-data/jsonp/ru.js');
+ require('intl/locale-data/jsonp/tr.js');
  require('intl/locale-data/jsonp/zh.js');
  callback();
  });
@@ -212,8 +212,8 @@ export function doAddLocaleData() {
  addLocaleData(nlLocaleData);
  addLocaleData(plLocaleData);
  addLocaleData(ptLocaleData);
- addLocaleData(trLocaleData);
  addLocaleData(roLocaleData);
  addLocaleData(ruLocaleData);
+ addLocaleData(trLocaleData);
  addLocaleData(zhLocaleData);
 }
diff --git a/tests/components/admin_console/__snapshots__/schema_admin_settings.test.jsx.snap b/tests/components/admin_console/__snapshots__/schema_admin_settings.test.jsx.snap
@@ -323,19 +323,19 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
  },
  Object {
  "order": 8,
- "text": "Türkçe",
- "value": "tr",
- },
- Object {
- "order": 9,
  "text": "Română (Beta)",
  "value": "ro",
  },
  Object {
- "order": 10,
+ "order": 9,
  "text": "Pусский (Alpha)",
  "value": "ru",
  },
+ Object {
+ "order": 10,
+ "text": "Türkçe",
+ "value": "tr",
+ },
  Object {
  "order": 11,
  "text": "한국어 (Alpha)",
@@ -432,19 +432,19 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
  },
  Object {
  "order": 8,
- "text": "Türkçe",
- "value": "tr",
- },
- Object {
- "order": 9,
  "text": "Română (Beta)",
  "value": "ro",
  },
  Object {
- "order": 10,
+ "order": 9,
  "text": "Pусский (Alpha)",
  "value": "ru",
  },
+ Object {
+ "order": 10,
+ "text": "Türkçe",
+ "value": "tr",
+ },
  Object {
  "order": 11,
  "text": "한국어 (Alpha)",