Add missing i18n and fix some typos

2019-08-27 16:43:57 +02:00 · 2019-08-27 16:43:57 +02:00 · 01001dc7b2
commit 01001dc7b2
parent b4e6ab80d2
11 changed files with 112 additions and 38 deletions
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@ -143,6 +143,26 @@
    "description": "Table column in manager",
    "message": "Speed"
  },
+  "conflict-overwrite": {
+    "description": "Option text; prefs/general",
+    "message": "Overwrite"
+  },
+  "conflict-prompt": {
+    "description": "Option text; prefs/general",
+    "message": "Prompt"
+  },
+  "conflict-rename": {
+    "description": "Option text; prefs/general",
+    "message": "Rename"
+  },
+  "create-filter": {
+    "description": "Button text; Create filter dialog; prefs/filters",
+    "message": "Create Filter"
+  },
+  "custom-filename": {
+    "description": "Label text; single window",
+    "message": "Custom Filename"
+  },
  "deffilter-all": {
    "description": "Filter label for the All files filter",
    "message": "All files"
@ -245,28 +265,28 @@
  },
  "dta.turbo.image": {
    "description": "Menu text",
-    "message": "Save Image with One Click!"
+    "message": "Save Image with OneClick!"
  },
  "dta.turbo.link": {
    "description": "Menu text",
-    "message": "Save Link with One Click!"
+    "message": "Save Link with OneClick!"
  },
  "dta.turbo.media": {
    "description": "Menu text",
-    "message": "Save Media with One Click!"
+    "message": "Save Media with OneClick!"
  },
  "dta.turbo.selection": {
    "description": "Menu text",
-    "message": "Save Selection with One Click!"
-  },
-  "error.invalidReferrer": {
-    "description": "Error message; single window",
-    "message": "Invalid Referrer"
+    "message": "Save Selection with OneClick!"
  },
  "error.invalidMask": {
    "description": "Error message; single/select window",
    "message": "Invalid Renaming Mask"
  },
+  "error.invalidReferrer": {
+    "description": "Error message; single window",
+    "message": "Invalid Referrer"
+  },
  "error.invalidURL": {
    "description": "Error message; single window",
    "message": "Invalid URL"
@ -335,6 +355,34 @@
    "description": "Menu text",
    "message": "Invert selection"
  },
+  "key-alt": {
+    "description": "Short for Alt-Key",
+    "message": "Alt"
+  },
+  "key-ctrl": {
+    "description": "Short for Ctrl-Key",
+    "message": "Ctrl"
+  },
+  "key-delete": {
+    "description": "Short for Delete-key",
+    "message": "Del"
+  },
+  "key-end": {
+    "description": "Short for End-key",
+    "message": "End"
+  },
+  "key-home": {
+    "description": "Short for home key",
+    "message": "Home"
+  },
+  "key-pagedown": {
+    "description": "Short for pagedown-key",
+    "message": "PageDown"
+  },
+  "key-pageup": {
+    "description": "Short for PageUp-key",
+    "message": "PageUp"
+  },
  "language": {
    "description": "Lanuage Name in your language",
    "message": "English (US)"
@ -344,8 +392,8 @@
    "message": "en"
  },
  "limited-to": {
-    "description": "Label text; used in ",
-    "message": "Limited to; prefs/network"
+    "description": "Label text; used in prefs/network",
+    "message": "Limited to"
  },
  "links": {
    "description": "Links tab label (short); select window",
@ -457,6 +505,10 @@
    "description": "Menu text; manager context",
    "message": "Open File"
  },
+  "open-link": {
+    "description": "Menu text; select window",
+    "message": "Open Link"
+  },
  "options-filters": {
    "description": "Pref tab text",
    "message": "Filters"
@ -721,7 +773,7 @@
  },
  "renamer-d": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Day"
+    "message": "Date Added - Day"
  },
  "renamer-date": {
    "description": "Mask text; see mask button",
@ -737,7 +789,7 @@
  },
  "renamer-hh": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Hour"
+    "message": "Date Added - Hour"
  },
  "renamer-host": {
    "description": "Mask text; see mask button",
@ -753,11 +805,11 @@
  },
  "renamer-m": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Month"
+    "message": "Date Added - Month"
  },
  "renamer-mm": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Minute"
+    "message": "Date Added - Minute"
  },
  "renamer-name": {
    "description": "Mask text; see mask button",
@ -805,7 +857,7 @@
  },
  "renamer-ss": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Second"
+    "message": "Date Added - Second"
  },
  "renamer-subdirs": {
    "description": "Mask text; see mask button",
@ -829,7 +881,7 @@
  },
  "renamer-y": {
    "description": "Mask text; see mask button",
-    "message": "Date Added Year"
+    "message": "Date Added - Year"
  },
  "renmask": {
    "description": "Renaming mask (long)",
@ -847,14 +899,14 @@
    "description": "Messagebox text; pref/General",
    "message": "All previously remembered confirmations have been reset!"
  },
-  "reset-layouts.done": {
-    "description": "Messagebox text; pref/General",
-    "message": "All previously remembered layout customizations have been reset! You may need to reload windows/tabs."
-  },
  "reset-layouts": {
    "description": "Button text; pref/General",
    "message": "Reset user interface customizations"
  },
+  "reset-layouts.done": {
+    "description": "Messagebox text; pref/General",
+    "message": "All previously remembered layout customizations have been reset! You may need to reload windows/tabs."
+  },
  "resume-download": {
    "description": "Action for resuming a download",
    "message": "Resume"
--- a/uikit/lib/contextmenu.ts
+++ b/uikit/lib/contextmenu.ts
@ -10,7 +10,7 @@ const MENU_OPEN_BOUNCE = 500;

 let ids = 0;

-const Keys = new Map([
+export const Keys = new Map([
  ["ACCEL", IS_MAC ? "⌘" : "Ctrl"],
  ["CTRL", "Ctrl"],
  ["ALT", IS_MAC ? "⌥" : "Alt"],
--- a/windows/contextmenu.ts
+++ b/windows/contextmenu.ts
@ -0,0 +1,22 @@
+"use strict";
+// License: MIT
+
+export * from "../uikit/lib/contextmenu";
+import { Keys } from "../uikit/lib/contextmenu";
+import { IS_MAC } from "../uikit/lib/util";
+import { locale, _ } from "../lib/i18n";
+
+locale.then(() => {
+  Keys.clear();
+  [
+    ["ACCEL", IS_MAC ? "⌘" : _("key-ctrl")],
+    ["CTRL", _("key-ctrl")],
+    ["ALT", IS_MAC ? "⌥" : _("key-alt")],
+    ["DELETE", _("key-delete")],
+    ["PAGEUP", _("key-pageup")],
+    ["PAGEDOWN", _("key-pagedown")],
+    ["HOME", _("key-home")],
+    ["END", _("key-end")],
+    ["SHIFT", "⇧"],
+  ].forEach(([k, v]) => Keys.set(k, v));
+});
--- a/windows/keys.ts
+++ b/windows/keys.ts
@ -3,7 +3,7 @@

 import {EventEmitter} from "../lib/events";
 // eslint-disable-next-line no-unused-vars
-import { ContextMenu } from "../uikit/lib/contextmenu";
+import { ContextMenu } from "./contextmenu";
 import { runtime } from "../lib/browser";

 export const Keys = new class extends EventEmitter {
--- a/windows/manager/itemfilters.ts
+++ b/windows/manager/itemfilters.ts
@ -10,7 +10,7 @@ import {
  MenuItemBase,
  // eslint-disable-next-line no-unused-vars
  MenuPosition,
-} from "../../uikit/lib/contextmenu";
+} from "../contextmenu";
 import {EventEmitter} from "../../lib/events";
 // eslint-disable-next-line no-unused-vars
 import {filters, Matcher, Filter} from "../../lib/filters";
--- a/windows/manager/table.ts
+++ b/windows/manager/table.ts
@ -7,7 +7,7 @@ import {
  MenuItem,
  // eslint-disable-next-line no-unused-vars
  SubMenuItem
-} from "../../uikit/lib/contextmenu";
+} from "../contextmenu";
 import { iconForPath } from "../../lib/windowutils";
 import { formatSpeed, formatSize, formatTimeDelta } from "../../lib/formatters";
 import { filters } from "../../lib/filters";
--- a/windows/prefs.html
+++ b/windows/prefs.html
@ -65,10 +65,10 @@
      <label><input type="checkbox" id="pref-remove-missing-on-init"> <span data-i18n="pref-remove-missing-on-init"></span></label>
    </fieldset>
    <fieldset id="pref-conflict-action">
-      <legend data-i18="prefs.conflict">When a file exists</legend>
-      <label><input type="radio" name="pref-conflict-action" value="overwrite"> <span>Overwrite</span></label>
-      <label><input type="radio" name="pref-conflict-action" value="uniquify"> <span>Rename</span></label>
-      <!--<label><input type="radio" name="pref-conflict-action" value="prompt"> <span>Prompt</span></label>-->
+      <legend data-i18n="prefs.conflicts">When a file exists</legend>
+      <label><input type="radio" name="pref-conflict-action" value="overwrite"> <span data-i18n="conflict-overwrite">Overwrite</span></label>
+      <label><input type="radio" name="pref-conflict-action" value="uniquify"> <span data-i18n="conflict-rename">Rename</span></label>
+      <!--<label><input type="radio" name="pref-conflict-action" value="prompt"> <span data-i18n="conflict-prompt">Prompt</span></label>-->
    </fieldset>
    <fieldset>
      <legend>Translations</legend>
--- a/windows/prefs.ts
+++ b/windows/prefs.ts
@ -124,7 +124,7 @@ class CreateFilterDialog extends ModalDialog {
  get buttons() {
    return [
      {
-        title: "Create",
+        title: _("create-filter"),
        value: "ok",
        default: true
      },
@ -584,7 +584,7 @@ addEventListener("DOMContentLoaded", () => {
      await Prefs.reset(k);
    }
    await ModalDialog.inform(
-      _("information.title"), _("reset-confirmations.done"), _("ok"));
+      _("information.title"), _("reset-layouts.done"), _("ok"));
  });

  // Filters
--- a/windows/select.html
+++ b/windows/select.html
@ -89,7 +89,7 @@
      <li id="ctx-select-filtered" data-key="ACCEL-KeyF" data-i18n="select-checked">Select Checked</li>
      <li id="ctx-select-invert" data-key="ACCEL-KeyI" data-i18n="invert-selection">Invert Selection</li>
      <li>-</li>
-      <li id="ctx-open-selected" data-icon="icon-launch" data-key="ACCEL-KeyO">Open</li>
+      <li id="ctx-open-selected" data-icon="icon-launch" data-key="ACCEL-KeyO" data-i18n="open-link">Open</li>
    </ul>
  </template>
  <template id="paused-template">
--- a/windows/select.ts
+++ b/windows/select.ts
@ -3,7 +3,7 @@

 import { VirtualTable } from "../uikit/lib/table";
 import ModalDialog from "../uikit/lib/modal";
-import { ContextMenu } from "../uikit/lib/contextmenu";
+import { ContextMenu } from "./contextmenu";
 import { iconForPath } from "../lib/windowutils";
 import { _, localize } from "../lib/i18n";
 import { Prefs } from "../lib/prefs";
--- a/windows/single.html
+++ b/windows/single.html
@ -28,17 +28,17 @@
    <p class="example">../mygallery[0:9]/photo[01:10][03:1:-1].jpg</p>
  </section>
  <section id="options">
-    <h2>Download</h2>
+    <h2 data-i18n="download">Download</h2>
    <input type="text" id="URL">
-    <h2>Custom Filename</h2>
+    <h2 data-i18n="custom-filename">Custom Filename</h2>
    <input type="text" id="filename">
-    <h3>Referring page</h3>
+    <h3 data-i18n="referrer">Referring page</h3>
    <input type="text" id="referrer">
-    <h3>Title</h3>
+    <h3 data-i18n="title">Title</h3>
    <input type="text" id="title">
-    <h3>Description</h3>
+    <h3 data-i18n="description">Description</h3>
    <input type="text" id="description">
-    <h3>Mask</h3>
+    <h3 data-i18n="mask">Mask</h3>
    <div id="maskOptions">
      <input type="text" id="mask">
      <button id="maskButton" class="icon-tags"></button>