From 68f9f1606feefa7eab38b6877b91e1e5d98f4bb8 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Tue, 29 Jun 2021 17:12:01 -0500
Subject: [PATCH] Fixup some missing l10n

---
 src/locales/en.json                 | 1 +
 src/locales/index.js                | 5 +++++
 src/packager/P4.svelte              | 4 ++--
 src/packager/PackagerOptions.svelte | 4 ++--
 src/packager/index.js               | 5 ++++-
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 src/locales/index.js

diff --git a/src/locales/en.json b/src/locales/en.json
index c6e1ab6..c84b6b0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -47,6 +47,7 @@
     "playerOptions": "Player Options",
     "pageTitle": "Page Title",
     "loadingScreenText": "Loading Screen Text",
+    "loadingScreenTextPlaceholder": "(Nothing)",
     "icon": "Icon",
     "controls": "Controls",
     "showFlag": "Show green flag button in controls",
diff --git a/src/locales/index.js b/src/locales/index.js
new file mode 100644
index 0000000..eb9fec7
--- /dev/null
+++ b/src/locales/index.js
@@ -0,0 +1,5 @@
+import en from './en.json';
+
+export default {
+  en
+};
diff --git a/src/packager/P4.svelte b/src/packager/P4.svelte
index acd8871..b87beb4 100644
--- a/src/packager/P4.svelte
+++ b/src/packager/P4.svelte
@@ -96,7 +96,7 @@
   <Section accent="#ff4c4c">
     <!-- don't translate "TurboWarp Packager" -->
     <h1>TurboWarp Packager</h1>
-    <p>Converts Scratch projects into standalone files.</p>
+    <p>{$_('p4.description1')}</p>
     <p>If you just want an easy way to embed a TurboWarp project into your website, you may be interested in <a href="https://github.com/TurboWarp/scratch-gui/wiki/Embedding">Embedding</a>.</p>
     <p>Report bugs, give feedback, and suggest ideas <a href="https://scratch.mit.edu/users/GarboMuffin/#comments">on Scratch</a> or <a href="https://github.com/TurboWarp/packager/issues">on GitHub</a>.</p>
   </Section>
@@ -129,7 +129,7 @@
           <p>
             {$_('p4.errorMessage', {
               values: {
-                error: $error
+                error: `${$error}`
               }
             })}
           </p>
diff --git a/src/packager/PackagerOptions.svelte b/src/packager/PackagerOptions.svelte
index c9437dc..5d366b1 100644
--- a/src/packager/PackagerOptions.svelte
+++ b/src/packager/PackagerOptions.svelte
@@ -222,7 +222,7 @@
   </label>
   <label>
     {$_('options.loadingScreenText')}
-    <input type="text" bind:value={$options.loadingScreen.text} placeholder="(Nothing)">
+    <input type="text" bind:value={$options.loadingScreen.text} placeholder={$_('options.loadingScreenTextPlaceholder')}>
   </label>
   <label>
     {$_('options.icon')}
@@ -271,7 +271,7 @@
   <Section accent="#FF8C1A">
     <h2>{$_('options.cloudVariables')}</h2>
     <label>
-      Mode
+      {$_('options.mode')}
       <select bind:value={$options.cloudVariables.mode}>
         {#if canUseCloudVariableServer}
           <option value="ws">{$_('options.cloudVariables-ws')}</option>
diff --git a/src/packager/index.js b/src/packager/index.js
index 2008c34..e0fbd4c 100644
--- a/src/packager/index.js
+++ b/src/packager/index.js
@@ -1,8 +1,11 @@
 import {addMessages, getLocaleFromNavigator, init} from 'svelte-i18n';
+import messages from '../locales/index';
 import P4 from './P4.svelte';
 import './analytics';
 
-addMessages('en', require('../locales/en.json'));
+for (const language of Object.keys(messages)) {
+  addMessages(language, messages[language]);
+}
 init({
   fallbackLocale: 'en',
   initialLocale: getLocaleFromNavigator()