fix available language check for locale prefix

restrict spellcheck and themecolor content script to main frame
auditors: @bbondy
related #3904

app/extensions.js

@@ -54,30 +54,33 @@ let generateBraveManifest = () => {
           'content/scripts/adInsertion.js',
           'content/scripts/passwordManager.js',
           'content/scripts/flashListener.js',
-          'content/scripts/themeColor.js',
           'content/scripts/pageInformation.js'
         ]
       },
       {
         run_at: 'document_end',
+        all_frames: false,
         matches: ['<all_urls>'],
         include_globs: [
-          'http://*/*', 'https://*/*', 'file://*', 'data:*', 'about:srcdoc'
+          'http://*/*', 'https://*/*', 'file://*', 'data:*', 'about:srcdoc',
+          getIndexHTML(),
+          getAppUrl('about-*.html'),
+          getAppUrl('about-*.html') + '#*'
         ],
         exclude_globs: [
-          getIndexHTML()
+          getAppUrl('about-blank.html'),
+          getAppUrl('about-blank.html') + '#*'
         ],
         js: [
-          'content/scripts/spellCheck.js'
+          'content/scripts/spellCheck.js',
+          'content/scripts/themeColor.js'
         ]
       },
       {
         run_at: 'document_start',
         js: [
           'content/scripts/util.js',
-          'content/scripts/spellCheck.js',
-          'content/scripts/inputHandler.js',
-          'content/scripts/themeColor.js'
+          'content/scripts/inputHandler.js'
         ],
         matches: [
           '<all_urls>'
@@ -88,7 +91,8 @@ let generateBraveManifest = () => {
           getAppUrl('about-*.html') + '#*'
         ],
         exclude_globs: [
-          getAppUrl('about-blank.html')
+          getAppUrl('about-blank.html'),
+          getAppUrl('about-blank.html') + '#*'
         ]
       }
     ],

app/spellCheck.js

@@ -72,12 +72,12 @@ module.exports.init = () => {
   contractions.forEach((word) => contractionSet.add(word.replace(/'.*/, '')))
 
   const availableDictionaries = spellchecker.getAvailableDictionaries()
-  let dict = getSetting(settings.LANGUAGE) || app.getLocale().replace('-', '_')
+  let dict = (getSetting(settings.LANGUAGE) || app.getLocale()).replace('-', '_')
   if (availableDictionaries.includes(dict)) {
     dictionaryLocale = dict
     spellchecker.setDictionary(dict)
   } else {
-    dict = dict.split('-')[0]
+    dict = dict.split('_')[0]
     if (availableDictionaries.includes(dict)) {
       dictionaryLocale = dict
       spellchecker.setDictionary(dict)