gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into release-v0.14.0

This commit is contained in:
David Baker 2018-03-19 14:56:33 +00:00
parent d7c0e3ddc9 b4020bb715
commit d7fd2cc483
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/copy-res.js
View File

@ -7,20 +7,22 @@
// a translation in the app (because having a translation with only // a translation in the app (because having a translation with only
// 3 strings translated is just frustrating) // 3 strings translated is just frustrating)
// This could readily be automated, but it's nice to explicitly // This could readily be automated, but it's nice to explicitly
// control when we languages are available. // control when new languages are available.
const INCLUDE_LANGS = [ const INCLUDE_LANGS = [
{'value': 'bg', 'label': 'Български'}, {'value': 'bg', 'label': 'Български'},
{'value': 'ca', 'label': 'Català'}, {'value': 'ca', 'label': 'Català'},
{'value': 'cs', 'label': 'čeština'},
{'value': 'da', 'label': 'Dansk'}, {'value': 'da', 'label': 'Dansk'},
{'value': 'de_DE', 'label': 'Deutsch'}, {'value': 'de_DE', 'label': 'Deutsch'},
{'value': 'el', 'label': 'Ελληνικά'},
{'value': 'en_EN', 'label': 'English'}, {'value': 'en_EN', 'label': 'English'},
{'value': 'en_US', 'label': 'English (US)'}, {'value': 'en_US', 'label': 'English (US)'},
{'value': 'el', 'label': 'Ελληνικά'},
{'value': 'eo', 'label': 'Esperanto'}, {'value': 'eo', 'label': 'Esperanto'},
{'value': 'es', 'label': 'Español'}, {'value': 'es', 'label': 'Español'},
{'value': 'eu', 'label': 'Euskara'}, {'value': 'eu', 'label': 'Euskara'},
{'value': 'fi', 'label': 'Suomi'}, {'value': 'fi', 'label': 'Suomi'},
{'value': 'fr', 'label': 'Français'}, {'value': 'fr', 'label': 'Français'},
{'value': 'gl', 'label': 'Galego'},
{'value': 'hu', 'label': 'Magyar'}, {'value': 'hu', 'label': 'Magyar'},
{'value': 'ko', 'label': '한국어'}, {'value': 'ko', 'label': '한국어'},
{'value': 'lv', 'label': 'Latviešu'}, {'value': 'lv', 'label': 'Latviešu'},
@ -30,10 +32,11 @@ const INCLUDE_LANGS = [
{'value': 'pt', 'label': 'Português'}, {'value': 'pt', 'label': 'Português'},
{'value': 'pt_BR', 'label': 'Português do Brasil'}, {'value': 'pt_BR', 'label': 'Português do Brasil'},
{'value': 'ru', 'label': 'Русский'}, {'value': 'ru', 'label': 'Русский'},
{'value': 'sv', 'label': 'Svenska'},
{'value': 'sk', 'label': 'Slovenčina'}, {'value': 'sk', 'label': 'Slovenčina'},
{'value': 'th', 'label': 'ไทย'}, {'value': 'sr', 'label': 'српски'},
{'value': 'sv', 'label': 'Svenska'},
{'value': 'te', 'label': 'తెలుగు'}, {'value': 'te', 'label': 'తెలుగు'},
{'value': 'th', 'label': 'ไทย'},
{'value': 'tr', 'label': 'Türk'}, {'value': 'tr', 'label': 'Türk'},
{'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
{'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese

4
src/components/structures/LeftPanel.js
View File

@ -193,9 +193,7 @@ var LeftPanel = React.createClass({
}, },
); );
const tagPanelEnabled = const tagPanelEnabled = !SettingsStore.getValue("TagPanel.disableTagPanel");
SettingsStore.isFeatureEnabled("feature_tag_panel") &&
!SettingsStore.getValue("TagPanel.disableTagPanel");
const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />; const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
const containerClasses = classNames( const containerClasses = classNames(