add i18n for console logs

src/lib/account.js

@@ -1,6 +1,9 @@
 import { server } from '$lib/client/server.js';
 import { parseEmoji, renderEmoji } from '$lib/emoji.js';
 import { get, writable } from 'svelte/store';
+import Lang from '$lib/lang';
+
+const lang = Lang('en_GB');
 
 const cache = writable({});
 
@@ -11,7 +14,7 @@ const cache = writable({});
  */
 export function parseAccount(data) {
     if (!data) {
-        console.error("Attempted to parse account data but no data was provided");
+        console.error(lang.string('logs.account_data_empty'));
         return null;
     }
     let account = get(cache)[data.id];
@@ -20,7 +23,7 @@ export function parseAccount(data) {
 
     account = {};
     account.id = data.id;
-    account.nickname = data.display_name.trim();
+    account.nickname = data.display_name.trim().replaceAll('<', '&lt;').replaceAll('>', '&gt;');
     account.username = data.username;
     account.name = account.nickname || account.username;
     account.avatar_url = data.avatar;

src/lib/client/server.js

@@ -35,11 +35,11 @@ server.subscribe(server => {
  */
 export async function createServer(host) {
     if (!host) {
-        console.error("Attempted to create server without providing a hostname");
+        console.error(lang.string('logs.no_hostname'));
         return false;
     }
     if (host.startsWith("http://")) {
-        console.error("Cowardly refusing to connect to an insecure server");
+        console.error(lang.string('logs.no_https'));
         return false;
     }
 
@@ -49,7 +49,7 @@ export async function createServer(host) {
     if (host.startsWith("https://")) host = host.substring(8);
     const data = await api.getInstance(host);
     if (!data) {
-        console.error(`Failed to connect to ${host}`);
+        console.error(lang.string('logs.connection_failed', host));
         return false;
     }
 
@@ -58,9 +58,9 @@ export async function createServer(host) {
     server.capabilities = getCapabilities(server.type);
 
     if (server.type === server_types.UNSUPPORTED) {
-        console.warn(`Server ${host} is unsupported (${server.version}). Things may break, or not work as expected`);
+        console.warn(lang.string('logs.server_unsupported', host, server.version));
     } else {
-        console.log(`Server detected as "${server.type}" (${server.version}) with capabilities: {${server.capabilities.join(', ')}}`);
+        console.log(lang.string('logs.server_detected', server.type, server.version, server.capabilities.join(', ')));
     }
 
     return server;

src/lib/lang.js

@@ -19,7 +19,7 @@ export default function init(lang) {
 
     i18n.lang = language;
     i18n.lang_code = lang;
-    i18n.string = function(/* @type string */ key) {
+    i18n.string = function(/* @type string */ key, ...args) {
         const tokens = key.split('.');
         
         let i = 0;
@@ -32,10 +32,20 @@ export default function init(lang) {
                 return key;
             }
             if (typeof res === 'string' || res instanceof String)
-                return res;
+                break;
             i++;
             token = tokens[i];
         }
+
+        i = 1;
+        while (true) {
+            if (args.length < i || !res.includes('%' + i))
+                break;
+            res = res.replaceAll('%' + i, args[i - 1]);
+            i++;
+        }
+
+        return res;
     }
     i18n.stringArray = function(/* @type string */ key) {
         const tokens = key.split('.');

src/lib/sound.js

@@ -1,3 +1,7 @@
+import Lang from '$lib/lang';
+
+const lang = Lang('en_GB');
+
 import sound_log from '../sound/log.ogg';
 import sound_hello from '../sound/hello.ogg';
 import sound_success from '../sound/success.ogg';
@@ -16,7 +20,7 @@ export function playSound(name) {
     if (!name) name = "default";
     const sound = sounds[name];
     if (!sound) {
-        console.warn(`Attempted to play sound "${name}", which does not exist!`);
+        console.warn(lang.string('lang.sound_does_not_exist', name));
         return;
     }
     sound.pause();

src/lib/time.js

@@ -21,6 +21,6 @@ export function shorthand(date) {
         unit = denoms[index].unit;
     }
     if (value > 0)
-        return lang.string('post.time').replaceAll('%1', Math.floor(value) + unit);
+        return lang.string('post.time', Math.floor(value) + unit);
     return "in " + Math.floor(value) + unit;
 }

src/lib/timeline.js

@@ -3,9 +3,12 @@ import { server } from '$lib/client/server.js';
 import { app } from '$lib/client/app.js';
 import { get, writable } from 'svelte/store';
 import { parsePost } from '$lib/post.js';
+import Lang from '$lib/lang';
 
 export const timeline = writable([]);
 
+const lang = Lang('en_GB');
+
 let loading = false;
 
 export async function getTimeline(clean) {
@@ -24,7 +27,7 @@ export async function getTimeline(clean) {
     );
 
     if (!timeline_data) {
-        console.error(`Failed to retrieve timeline.`);
+        console.error(lang.string('logs.timeline_fetch_failed'));
         loading = false;
         return;
     }
@@ -37,10 +40,10 @@ export async function getTimeline(clean) {
         if (!post) {
             if (post === null || post === undefined) {
                 if (post_data.id) {
-                    console.warn("Failed to parse post #" + post_data.id);
+                    console.warn(lang.string('logs.post_parse_failed_id', post_data.id));
                 } else {
-                    console.warn("Failed to parse post:");
-                    console.warn(post_data);
+                    console.warn(lang.string('logs.post_parse_failed'));
+                    console.debug(post_data);
                 }
             }
             continue;

src/lib/ui/Composer.svelte

@@ -32,7 +32,7 @@
 
     const placeholders = lang.stringArray('compose_placeholders');
     let placeholder = Array.isArray(placeholders) ? placeholders[Math.floor(placeholders.length * Math.random())]
-        .replaceAll("$1", $account.username) : placeholders;
+        .replaceAll("%1", $account.username) : placeholders;
 
     const dispatch = createEventDispatcher();
 

src/lib/ui/Navigation.svelte

@@ -72,7 +72,7 @@
         );
 
         if (!res.ok)
-            console.warn("Token revocation failed! Dumping data anyways");
+            console.warn(lang.string('logs.token_revoke_failed'));
 
         account.set(false);
         app.set(false);

src/lib/ui/post/BoostContext.svelte

@@ -13,7 +13,7 @@
     <span class="post-context-icon">🔁</span>
     <span class="post-context-action">
         { @html
-        lang.string('post.boosted').replaceAll('%1',
+        lang.string('post.boosted',
         `<a href={${post.account.url}} target="_blank"><span class="name">${post.account.rich_name}</span></a>`)
         }
     </span>