From 8b5d766d1ea5ebef3b3f1e2dc69bb007c67ed51b Mon Sep 17 00:00:00 2001
From: Mike Fix <mrfix84@gmail.com>
Date: Sat, 10 Aug 2019 18:16:14 -0700
Subject: [PATCH] improve searchLanguage

---
 components/Carbon.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/components/Carbon.js b/components/Carbon.js
index 11f463a..b300db9 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -9,12 +9,12 @@ import SpinnerWrapper from './SpinnerWrapper'
 import WindowControls from './WindowControls'
 import {
   COLORS,
+  LANGUAGES,
   LANGUAGE_MODE_HASH,
   LANGUAGE_NAME_HASH,
   LANGUAGE_MIME_HASH,
   DEFAULT_SETTINGS,
-  THEMES_HASH,
-  LANGUAGES
+  THEMES_HASH
 } from '../lib/constants'
 
 const Watermark = dynamic(() => import('./svg/Watermark'), {
@@ -22,11 +22,7 @@ const Watermark = dynamic(() => import('./svg/Watermark'), {
 })
 
 function searchLanguage(l) {
-  const config = LANGUAGE_NAME_HASH[l] || LANGUAGE_MODE_HASH[l] || LANGUAGE_MIME_HASH[l]
-
-  if (config) {
-    return config.mime || config.mode
-  }
+  return LANGUAGE_NAME_HASH[l] || LANGUAGE_MODE_HASH[l] || LANGUAGE_MIME_HASH[l]
 }
 
 class Carbon extends React.PureComponent {
@@ -42,14 +38,14 @@ class Carbon extends React.PureComponent {
         const languageMode = searchLanguage(detectedLanguage)
 
         if (languageMode) {
-          return languageMode
+          return languageMode.mime || languageMode.mode
         }
       }
 
       const languageMode = searchLanguage(language)
 
       if (languageMode) {
-        return languageMode
+        return languageMode.mime || languageMode.mode
       }
 
       return language