Closes #82, closes #84.

3 files changed, 39 insertions, 40 deletions

diff --git a/pages/options/options.html b/pages/options/options.html
index f5947bc9..0f38ff0a 100644
--- a/pages/options/options.html
+++ b/pages/options/options.html
@@ -13,21 +13,21 @@
       <button
         class="tablinks"
         id="general-tab"
-        data-localize="__MSG_generalTab__"
+        data-localise="__MSG_generalTab__"
       >
         General
       </button>
       <button
         class="tablinks"
         id="advanced-tab"
-        data-localize="__MSG_advancedTab__"
+        data-localise="__MSG_advancedTab__"
       >
         Advanced
       </button>
       <button
         class="tablinks"
         id="exceptions-tab"
-        data-localize="__MSG_exceptionsTab__"
+        data-localise="__MSG_exceptionsTab__"
       >
         Exceptions
       </button>
@@ -39,7 +39,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_disableNitter__">Nitter Redirects</h1>
+                <h1 data-localise="__MSG_disableNitter__">Nitter Redirects</h1>
               </td>
               <td>
                 <input
@@ -59,7 +59,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_disableInvidious__">
+                <h1 data-localise="__MSG_disableInvidious__">
                   Invidious Redirects
                 </h1>
               </td>
@@ -81,7 +81,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_disableBibliogram__">
+                <h1 data-localise="__MSG_disableBibliogram__">
                   Bibliogram Redirects
                 </h1>
               </td>
@@ -103,7 +103,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_disableOsm__">
+                <h1 data-localise="__MSG_disableOsm__">
                   OpenStreetMap Redirects
                 </h1>
               </td>
@@ -121,7 +121,7 @@
         </table>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_nitterInstance__">Nitter Instance</h1>
+        <h1 data-localise="__MSG_nitterInstance__">Nitter Instance</h1>
         <div class="autocomplete">
           <input
             id="nitter-instance"
@@ -132,7 +132,7 @@
         </div>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_invidiousInstance__">Invidious Instance</h1>
+        <h1 data-localise="__MSG_invidiousInstance__">Invidious Instance</h1>
         <div class="autocomplete">
           <input
             id="invidious-instance"
@@ -142,7 +142,7 @@
         </div>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_bibliogramInstance__">Bibliogram Instance</h1>
+        <h1 data-localise="__MSG_bibliogramInstance__">Bibliogram Instance</h1>
         <div class="autocomplete">
           <input
             id="bibliogram-instance"
@@ -152,7 +152,7 @@
         </div>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_osmInstance__">OpenStreetMap Instance</h1>
+        <h1 data-localise="__MSG_osmInstance__">OpenStreetMap Instance</h1>
         <div class="autocomplete">
           <input
             id="osm-instance"
@@ -162,7 +162,7 @@
         </div>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_theme__">Theme</h1>
+        <h1 data-localise="__MSG_theme__">Theme</h1>
         <select id="theme">
           <option value="">System</option>
           <option value="light-theme">Light</option>
@@ -180,7 +180,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_alwaysProxy__">
+                <h1 data-localise="__MSG_alwaysProxy__">
                   Always proxy videos through Invidious
                 </h1>
               </td>
@@ -205,7 +205,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_onlyEmbeddedVideo__">
+                <h1 data-localise="__MSG_onlyEmbeddedVideo__">
                   Only redirect embedded video to Invidious
                 </h1>
               </td>
@@ -223,7 +223,7 @@
         </table>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_videoQuality__">Invidious Video Quality</h1>
+        <h1 data-localise="__MSG_videoQuality__">Invidious Video Quality</h1>
         <select id="video-quality">
           <option value="">Default</option>
           <option value="hd720">720p</option>
@@ -238,7 +238,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_invidiousDarkMode__">
+                <h1 data-localise="__MSG_invidiousDarkMode__">
                   Invidious dark mode always on
                 </h1>
               </td>
@@ -257,7 +257,7 @@
         </table>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_invidiousVolume__">Invidious Volume</h1>
+        <h1 data-localise="__MSG_invidiousVolume__">Invidious Volume</h1>
         <input
           id="invidious-volume"
           name="invidious-volume"
@@ -268,7 +268,7 @@
         />
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_invidiousPlayerStyle__">
+        <h1 data-localise="__MSG_invidiousPlayerStyle__">
           Invidious Player Style
         </h1>
         <select id="invidious-player-style">
@@ -277,7 +277,7 @@
         </select>
       </section>
       <section class="settings-block">
-        <h1 data-localize="__MSG_invidiousSubtitles__">
+        <h1 data-localise="__MSG_invidiousSubtitles__">
           Invidious Subtitles - language codes (comma-separated)
         </h1>
         <input
@@ -294,7 +294,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_invidiousAutoplay__">
+                <h1 data-localise="__MSG_invidiousAutoplay__">
                   Invidious automatically play video on load
                 </h1>
               </td>
@@ -316,7 +316,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_persistInvidiousPrefs__">
+                <h1 data-localise="__MSG_persistInvidiousPrefs__">
                   Persist Invidious preferences (as cookie)
                 </h1>
               </td>
@@ -342,7 +342,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_removeTwitterSW__">
+                <h1 data-localise="__MSG_removeTwitterSW__">
                   Proactively remove Twitter service worker
                 </h1>
               </td>
@@ -362,19 +362,16 @@
     </div>
 
     <div id="exceptions" class="tabcontent">
-      <section
-        class="settings-block"
-        data-localize="__MSG_exceptionsDescription__"
-      >
-        <p>
+      <section class="settings-block">
+        <p data-localise="__MSG_exceptionsDescriptionP1__">
           Enter a URL or Regular Expression to be excluded from redirects.
         </p>
-        <p>
+        <p data-localise="__MSG_exceptionsDescriptionP2__">
           All requests for or initiating from a URL that matches your exception
           will be excluded from redirects.
         </p>
-        <p>
-          <b>Note -</b> Supports JavaScript regular expressions, excluding the
+        <p data-localise="__MSG_exceptionsDescriptionP3__">
+          Note - Supports JavaScript regular expressions, excluding the
           enclosing forward slashes.
         </p>
       </section>
@@ -383,7 +380,7 @@
           <tbody>
             <tr>
               <td>
-                <h1 data-localize="__MSG_addException__">Add Exception</h1>
+                <h1 data-localise="__MSG_addException__">Add Exception</h1>
               </td>
             </tr>
             <tr>
diff --git a/pages/popup/popup.html b/pages/popup/popup.html
index 9fa324a0..e06159a5 100644
--- a/pages/popup/popup.html
+++ b/pages/popup/popup.html
@@ -15,12 +15,14 @@
           alt="Privacy Redirect logo"
         />
         <h1>
-          <span data-localize="__MSG_privacy__" class="privacy">Privacy</span
-          ><br /><span data-localize="__MSG_redirect__">Redirect</span>
+          <span data-localise="__MSG_privacy__" class="privacy">Privacy</span
+          ><br /><span data-localise="__MSG_redirect__">Redirect</span>
         </h1>
       </div>
       <div class="version">
-        <span>Version:&nbsp;<span id="version"></span></span>
+        <span data-localise="__MSG_version__">Version</span>:&nbsp;<span
+          id="version"
+        ></span>
       </div>
     </header>
 
@@ -29,7 +31,7 @@
         <tbody>
           <tr>
             <td>
-              <h1 data-localize="__MSG_disableNitter__">Nitter Redirects</h1>
+              <h1 data-localise="__MSG_disableNitter__">Nitter Redirects</h1>
             </td>
             <td>
               <input
@@ -50,7 +52,7 @@
         <tbody>
           <tr>
             <td>
-              <h1 data-localize="__MSG_disableInvidious__">
+              <h1 data-localise="__MSG_disableInvidious__">
                 Invidious Redirects
               </h1>
             </td>
@@ -73,7 +75,7 @@
         <tbody>
           <tr>
             <td>
-              <h1 data-localize="__MSG_disableBibliogram__">
+              <h1 data-localise="__MSG_disableBibliogram__">
                 Bibliogram Redirects
               </h1>
             </td>
@@ -96,7 +98,7 @@
         <tbody>
           <tr>
             <td>
-              <h1 data-localize="__MSG_disableOsm__">
+              <h1 data-localise="__MSG_disableOsm__">
                 OpenStreetMap Redirects
               </h1>
             </td>
@@ -118,7 +120,7 @@
 
     <footer>
       <a class="button" id="more-options">
-        <span data-localize="__MSG_moreOptions__">More Options&nbsp;</span>
+        <span data-localise="__MSG_moreOptions__">More Options&nbsp;</span>
         <svg
           xmlns="http://www.w3.org/2000/svg"
           width="512"
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index ece04384..54eae408 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -17,7 +17,7 @@ browser.storage.sync.get(
     "theme",
   ],
   (result) => {
-    document.body.classList.add(result.theme);
+    if (result.theme) document.body.classList.add(result.theme);
     disableNitter.checked = !result.disableNitter;
     disableInvidious.checked = !result.disableInvidious;
     disableBibliogram.checked = !result.disableBibliogram;