From 8560901f80b1768d88e52bb5ce242bd0584e08eb Mon Sep 17 00:00:00 2001
From: Hung Nguyen <viethungax@gmail.com>
Date: Fri, 13 Apr 2018 20:39:17 +0700
Subject: [PATCH 1/3] Edited theme and language init code to avoid code
 repetition

---
 browser/main/Main.js | 70 +++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index 2f431374..ac169565 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -140,45 +140,41 @@ class Main extends React.Component {
   componentDidMount () {
     const { dispatch, config } = this.props
 
-    if (config.ui.theme === 'dark') {
-      document.body.setAttribute('data-theme', 'dark')
-    } else if (config.ui.theme === 'white') {
-      document.body.setAttribute('data-theme', 'white')
-    } else if (config.ui.theme === 'solarized-dark') {
-      document.body.setAttribute('data-theme', 'solarized-dark')
-    } else {
+    const supportedTheme = [
+      'dark',
+      'white',
+      'solarized-dark'
+    ]
+
+    if (supportedTheme.indexOf(config.ui.theme) !== -1) {
+      document.body.setAttribute('data-theme', config.ui.theme)
+    }
+    else {
       document.body.setAttribute('data-theme', 'default')
     }
-    if (config.ui.language === 'sq') {
-      i18n.setLocale('sq')
-    } else if (config.ui.language === 'zh-CN') {
-      i18n.setLocale('zh-CN')
-    } else if (config.ui.language === 'zh-TW') {
-      i18n.setLocale('zh-TW')
-    } else if (config.ui.language === 'da') {
-      i18n.setLocale('da')
-    } else if (config.ui.language === 'fr') {
-      i18n.setLocale('fr')
-    } else if (config.ui.language === 'de') {
-      i18n.setLocale('de')
-    } else if (config.ui.language === 'hu') {
-      i18n.setLocale('hu')
-    } else if (config.ui.language === 'ja') {
-      i18n.setLocale('ja')
-    } else if (config.ui.language === 'ko') {
-      i18n.setLocale('ko')
-    } else if (config.ui.language === 'no') {
-      i18n.setLocale('no')
-    } else if (config.ui.language === 'pl') {
-      i18n.setLocale('pl')
-    } else if (config.ui.language === 'pt') {
-      i18n.setLocale('pt')
-    } else if (config.ui.language === 'ru') {
-      i18n.setLocale('ru')
-    } else if (config.ui.language === 'es-ES') {
-      i18n.setLocale('es-ES')
-    } else {
-      i18n.setLocale('en')
+
+    const supportedLanguages = [
+      'sq',
+      'zh-CN',
+      'zh-TW',
+      'da',
+      'fr',
+      'de',
+      'hu',
+      'ja',
+      'ko',
+      'no',
+      'pl',
+      'pt',
+      'ru',
+      'es-ES'
+    ]
+
+    if (supportedLanguages.indexOf(config.ui.language) !== -1) {
+      i18n.setLocale(config.ui.language)
+    }
+    else {
+      i18n.setLocale('en');
     }
 
     // Reload all data

From f2a4e1d230e2dece3aa2b55adc7598903818fba1 Mon Sep 17 00:00:00 2001
From: Hung Nguyen <viethungax@gmail.com>
Date: Fri, 13 Apr 2018 21:00:01 +0700
Subject: [PATCH 2/3] fixed typo in variable name

---
 browser/main/Main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index ac169565..916ec3d9 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -140,13 +140,13 @@ class Main extends React.Component {
   componentDidMount () {
     const { dispatch, config } = this.props
 
-    const supportedTheme = [
+    const supportedThemes = [
       'dark',
       'white',
       'solarized-dark'
     ]
 
-    if (supportedTheme.indexOf(config.ui.theme) !== -1) {
+    if (supportedThemes.indexOf(config.ui.theme) !== -1) {
       document.body.setAttribute('data-theme', config.ui.theme)
     }
     else {

From a4af77f91eb61ed656233a48552943dec2a67354 Mon Sep 17 00:00:00 2001
From: Hung Nguyen <viethungax@gmail.com>
Date: Fri, 13 Apr 2018 21:46:19 +0700
Subject: [PATCH 3/3] fixed eslint error

---
 browser/main/Main.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index 916ec3d9..14a56225 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -148,8 +148,7 @@ class Main extends React.Component {
 
     if (supportedThemes.indexOf(config.ui.theme) !== -1) {
       document.body.setAttribute('data-theme', config.ui.theme)
-    }
-    else {
+    } else {
       document.body.setAttribute('data-theme', 'default')
     }
 
@@ -172,9 +171,8 @@ class Main extends React.Component {
 
     if (supportedLanguages.indexOf(config.ui.language) !== -1) {
       i18n.setLocale(config.ui.language)
-    }
-    else {
-      i18n.setLocale('en');
+    } else {
+      i18n.setLocale('en')
     }
 
     // Reload all data