chore: extract strings from isolation section for translation (#237) (#…

…462)
stoically · Sep 15, 2020 · 2f07a09 · 2f07a09
1 parent aba4a58
commit 2f07a09
Show file tree

Hide file tree

Showing 8 changed files with 252 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@
 /src/.web-extension-id
 /.web-ext-artifacts
 /dist
-/*.todo
+/*.todo
+/.idea
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -2,9 +2,6 @@
   "automaticMode": {
     "message": "Automatic Mode"
   },
-  "optionsSave": {
-    "message": "Save"
-  },
   "optionsNavGeneral": {
     "message": "General"
   },
@@ -157,5 +154,167 @@
   },
   "optionsGeneralToolbarIconColorWhiteSimple": {
     "message": "white (simple)"
+  },
+  "optionsDomainPattern": {
+    "message": "Domain Pattern"
+  },
+  "optionsExclusionPattern": {
+    "message": "Exclusion Pattern"
+  },
+  "optionsIsolationTabGlobal": {
+    "message": "Global"
+  },
+  "optionsIsolationTabPerDomain": {
+    "message": "Per Domain"
+  },
+  "optionsIsolationTabMac": {
+    "message": "Multi-Account Containers"
+  },
+  "optionsIsolationNavigation": {
+    "message": "Navigation"
+  },
+  "optionsIsolationTargetDomain": {
+    "message": "Target Domain"
+  },
+  "optionsIsolationMouseClick": {
+    "message": "Mouse Click"
+  },
+  "optionsIsolationMouseClickLeftMouse": {
+    "message": "Left Mouse",
+    "description": "Left mouse click"
+  },
+  "optionsIsolationMouseClickCtrlLeftMouse": {
+    "message": "Ctrl/Cmd+Left Mouse",
+    "description": "Ctrl or Cmd key + left mouse click"
+  },
+  "optionsIsolationMouseClickMiddleMouse": {
+    "message": "Middle Mouse",
+    "description": "Middle mouse click"
+  },
+  "optionsIsolationExclude": {
+    "message": "Exclude",
+    "description": "verb"
+  },
+  "optionsIsolationDisabled": {
+    "message": "Disabled"
+  },
+  "optionsIsolationEnabled": {
+    "message": "Enabled"
+  },
+  "optionsIsolationGlobalExcludePermanentContainers": {
+    "message": "Exclude Permanent Containers"
+  },
+  "optionsIsolationGlobalExclusionPermanentContainers": {
+    "message": "Permanent Containers to Exclude"
+  },
+  "optionsIsolationGlobalSelectExclusionContainers": {
+    "message": "Select Permanent Containers to Exclude from Isolation"
+  },
+  "optionsIsolationExcludeTargetDomains": {
+    "message": "Exclude Target Domains"
+  },
+  "optionsIsolationNoDomainsExcluded": {
+    "message": "No domains excluded"
+  },
+  "optionsIsolationMacIsolateNonMac": {
+    "message": "Isolate Navigations in Permanent Containers whose Target Domain isn't MAC-\"Always open in\" assigned to that container"
+  },
+  "optionsIsolationPerDomainPatternNoEmpty": {
+    "message": "Domain Pattern can't be empty"
+  },
+  "optionsIsolationPerDomainPatternExists": {
+    "message": "Domain Pattern already exists"
+  },
+  "optionsIsolationPerDomainAlwaysOpenIn": {
+    "message": "Always open in"
+  },
+  "optionsIsolationPerDomainDisableIfNavPermContainer": {
+    "message": "Disable if Navigation in Permanent Containers"
+  },
+  "optionsIsolationPerDomainDisableIfPermContainer": {
+    "message": "Disable in Permanent Containers"
+  },
+  "optionsIsolationPerDomainDisableIfNavTempContainer": {
+    "message": "Disable if Navigation in Temporary Containers"
+  },
+  "optionsIsolationPerDomainDisableIfTempContainer": {
+    "message": "Disable in Temporary Containers"
+  },
+  "optionsIsolationPerDomainSaved": {
+    "message": "Saved"
+  },
+  "optionsIsolationPerDomainAdd": {
+    "message": "Add $PATTERN$",
+    "description": "To finish adding a new domain pattern",
+    "placeholders": {
+      "pattern": {
+        "content": "$1",
+        "example": "Pattern42"
+      }
+    }
+  },
+  "optionsIsolationPerDomainEdit": {
+    "message": "Edit $PATTERN$",
+    "description": "To start editing a domain pattern",
+    "placeholders": {
+      "pattern": {
+        "content": "$1",
+        "example": "TheReallyBeautifulPattern"
+      }
+    }
+  },
+  "optionsIsolationPerDomainDoneEditing": {
+    "message": "Done editing $PATTERN$",
+    "description": "To finish editing a domain pattern",
+    "placeholders": {
+      "pattern": {
+        "content": "$1",
+        "example": "TheWaitWhyArentMyContainersWorkingPattern"
+      }
+    }
+  },
+  "optionsIsolationPerDomainRemove": {
+    "message": "Remove $PATTERN$",
+    "placeholders": {
+      "pattern": {
+        "content": "$1",
+        "example": "TheBestPattern"
+      }
+    }
+  },
+  "optionsIsolationPerDomainRemoveConfirmation": {
+    "message": "Remove $PATTERN$?",
+    "placeholders": {
+      "pattern": {
+        "content": "$1"
+      }
+    }
+  },
+  "optionsIsolationPerDomainNoIsolatedDomainsAdded": {
+    "message": "No Isolated Domains added yet"
+  },
+  "optionsIsolationPerDomainFilterIsolatedDomains": {
+    "message": "Filter Isolated Domains"
+  },
+  "optionsIsolationPerDomainIsolatedDomains": {
+    "message": "Isolated Domains"
+  },
+  "optionsIsolationPerDomainDragTooltip": {
+    "message": "Drag up/down - First in the list matches first"
+  },
+  "optionsIsolationSettingsGlobal": {
+    "message": "Use Global"
+  },
+  "optionsIsolationSettingsNotSameDomain": {
+    "message": "Different from Tab Domain & Subdomains"
+  },
+  "optionsIsolationSettingsNotSameDomainExact": {
+    "message": "Different from Tab Domain"
+  },
+  "optionsIsolationSettingsAlways": {
+    "message": "Always"
+  },
+  "optionsIsolationSettingsNever": {
+    "message": "Never"
   }
 }
diff --git a/src/ui/components/domainpattern.vue b/src/ui/components/domainpattern.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
-import Vue from 'vue';
+import mixins from 'vue-typed-mixins';
+import { mixin } from '~/ui/mixin';
 
-export default Vue.extend({
+export default mixins(mixin).extend({
   props: {
     id: {
       type: String,
@@ -48,11 +49,11 @@ export default Vue.extend({
   >
     <label>
       <span v-if="!exclusion">
-        <span v-if="!glossary">Domain Pattern</span>
+        <span v-if="!glossary">{{ t('optionsDomainPattern') }}</span>
         <span v-else data-glossary="Domain Pattern" />
       </span>
       <span v-else>
-        Exclusion Pattern
+        {{ t('optionsExclusionPattern') }}
       </span>
     </label>
     <input :id="id" v-model="domainPattern" type="text" />

diff --git a/src/ui/components/isolation/global.vue b/src/ui/components/isolation/global.vue
@@ -1,11 +1,11 @@
 <script lang="ts">
-import Vue from 'vue';
-
+import mixins from 'vue-typed-mixins';
+import { mixin } from '~/ui/mixin';
 import DomainPattern from '../domainpattern.vue';
 import Settings from './settings.vue';
 import { App } from '~/ui/root';
 
-export default Vue.extend({
+export default mixins(mixin).extend({
   components: {
     DomainPattern,
     Settings,
@@ -84,8 +84,8 @@ export default Vue.extend({
     });
     $('#isolationGlobalExcludeContainers').dropdown({
       placeholder: !this.popup
-        ? 'Select Permanent Containers to Exclude from Isolation'
-        : 'Permanent Containers to Exclude',
+        ? this.t('optionsIsolationGlobalSelectExclusionContainers')
+        : this.t('optionsIsolationGlobalExclusionPermanentContainers'),
       values: excludeContainers,
       onAdd: (addedContainer) => {
         if (
@@ -141,15 +141,15 @@ export default Vue.extend({
           <div class="title">
             <h4>
               <i class="dropdown icon" />
-              Navigation
+              {{ t('optionsIsolationNavigation') }}
             </h4>
           </div>
           <div
             class="content"
             :class="{ 'ui segment': !popup, 'popup-margin': popup }"
           >
             <settings
-              label="Target Domain"
+              :label="t('optionsIsolationTargetDomain')"
               :action.sync="preferences.isolation.global.navigation.action"
             />
           </div>
@@ -158,27 +158,27 @@ export default Vue.extend({
           <div class="title">
             <h4>
               <i class="dropdown icon" />
-              Mouse Click
+              {{ t('optionsIsolationMouseClick') }}
             </h4>
           </div>
           <div
             class="content"
             :class="{ 'ui segment': !popup, 'popup-margin': popup }"
           >
             <settings
-              label="Middle Mouse"
+              :label="t('optionsIsolationMouseClickMiddleMouse')"
               :action.sync="
                 preferences.isolation.global.mouseClick.middle.action
               "
             />
             <settings
-              label="Ctrl/Cmd+Left Mouse"
+              :label="t('optionsIsolationMouseClickCtrlLeftMouse')"
               :action.sync="
                 preferences.isolation.global.mouseClick.ctrlleft.action
               "
             />
             <settings
-              label="Left Mouse"
+              :label="t('optionsIsolationMouseClickLeftMouse')"
               :action.sync="preferences.isolation.global.mouseClick.left.action"
             />
           </div>
@@ -187,7 +187,7 @@ export default Vue.extend({
           <div class="title">
             <h4>
               <i class="dropdown icon" />
-              Exclude Permanent Containers
+              {{ t('optionsIsolationGlobalExcludePermanentContainers') }}
             </h4>
           </div>
           <div
@@ -210,7 +210,7 @@ export default Vue.extend({
           <div class="title">
             <h4>
               <i class="dropdown icon" />
-              Exclude Target Domains
+              {{ t('optionsIsolationExcludeTargetDomains') }}
             </h4>
           </div>
           <div
@@ -229,7 +229,7 @@ export default Vue.extend({
                 />
                 <div class="field">
                   <button class="ui button primary">
-                    Exclude
+                    {{ t('optionsIsolationExclude') }}
                   </button>
                 </div>
               </form>
@@ -239,7 +239,7 @@ export default Vue.extend({
                     !Object.keys(preferences.isolation.global.excluded).length
                   "
                 >
-                  No domains excluded
+                  {{ t('optionsIsolationNoDomainsExcluded') }}
                 </div>
                 <div v-else>
                   <div
@@ -249,7 +249,12 @@ export default Vue.extend({
                   >
                     <div style="margin-top: 5px;" />
                     <span
-                      :data-tooltip="`Remove ${excludedDomainPattern}`"
+                      :data-tooltip="
+                        t(
+                          'optionsIsolationPerDomainRemove',
+                          excludedDomainPattern
+                        )
+                      "
                       data-position="right center"
                       style="color: red; cursor: pointer;"
                       @click="removeExcludedDomain(excludedDomainPattern)"

diff --git a/src/ui/components/isolation/mac.vue b/src/ui/components/isolation/mac.vue
@@ -1,8 +1,9 @@
 <script lang="ts">
-import Vue from 'vue';
 import { App } from '~/ui/root';
+import mixins from 'vue-typed-mixins';
+import { mixin } from '~/ui/mixin';
 
-export default Vue.extend({
+export default mixins(mixin).extend({
   props: {
     app: {
       type: Object as () => App,
@@ -31,11 +32,10 @@ export default Vue.extend({
         class="ui fluid dropdown"
       >
         <option value="disabled">
-          Disabled
+          {{ t('optionsIsolationDisabled') }}
         </option>
         <option value="enabled">
-          Isolate Navigations in Permanent Containers whose Target Domain isn't
-          MAC-"Always open in" assigned to that container
+          {{ t('optionsIsolationMacIsolateNonMac') }}
         </option>
       </select>
     </div>