diff --git a/app/javascript/flavours/glitch/locales/load_locale.ts b/app/javascript/flavours/glitch/locales/load_locale.ts index b5613a2937..692c31e7e7 100644 --- a/app/javascript/flavours/glitch/locales/load_locale.ts +++ b/app/javascript/flavours/glitch/locales/load_locale.ts @@ -5,9 +5,9 @@ import { isLocaleLoaded, setLocale } from './global_locale'; const localeLoadingSemaphore = new Semaphore(1); -const upstreamLocaleFiles = import.meta.glob<{ default: LocaleData['messages'] }>([ - '@/mastodon/locales/*.json', -]); +const upstreamLocaleFiles = import.meta.glob<{ + default: LocaleData['messages']; +}>(['@/mastodon/locales/*.json']); const localeFiles = import.meta.glob<{ default: LocaleData['messages'] }>([ './*.json', ]); @@ -25,11 +25,15 @@ export async function loadLocale() { if (isLocaleLoaded()) return; // If there is no locale file, then fallback to english - const upstreamLocaleFile = Object.hasOwn(upstreamLocaleFiles, `/mastodon/locales/${locale}.json`) + const upstreamLocaleFile = Object.hasOwn( + upstreamLocaleFiles, + `/mastodon/locales/${locale}.json`, + ) ? upstreamLocaleFiles[`/mastodon/locales/${locale}.json`] : upstreamLocaleFiles['/mastodon/locales/en.json']; - if (!upstreamLocaleFile) throw new Error('Could not load the upstream locale JSON file'); + if (!upstreamLocaleFile) + throw new Error('Could not load the upstream locale JSON file'); const { default: upstreamLocaleData } = await upstreamLocaleFile(); diff --git a/config/formatjs-formatter.js b/config/formatjs-formatter.js index 9be5dd7e26..7a3e6db07a 100644 --- a/config/formatjs-formatter.js +++ b/config/formatjs-formatter.js @@ -1,7 +1,11 @@ const path = require('path'); -const upstreamTranslations = require(path.join(__dirname, "../app/javascript/mastodon/locales/en.json")); -const currentTranslations = require(path.join(__dirname, "../app/javascript/flavours/glitch/locales/en.json")); +const upstreamTranslations = require( + path.join(__dirname, '../app/javascript/mastodon/locales/en.json'), +); +const currentTranslations = require( + path.join(__dirname, '../app/javascript/flavours/glitch/locales/en.json'), +); exports.format = (msgs) => { const results = {}; diff --git a/public/clock.js b/public/clock.js deleted file mode 100644 index ffb9beae80..0000000000 --- a/public/clock.js +++ /dev/null @@ -1,54 +0,0 @@ -document.addEventListener("DOMContentLoaded", function(event) { - updateClock(); - setInterval(updateClock, 1000); -}); - -function getNextOpen(now) { - var days = [[0, 14], [4, 18], [8, 22], [12], [2, 16], [6, 20], [10]] - var nowday = now.getUTCDay(); - var nour = now.getUTCHours(); - - var open_hour = -1; - var d = 0; - - while (open_hour == -1) { - var times = days[(nowday + d) % 7]; - for (var i = 0; i < times.length; ++i) { - var time = times[i]; - if (time == nour) { - return "refresh"; - } else if (time > nour || d > 0) { - open_hour = time; - break; - } - } - if (open_hour == -1) { - d += 1; - nour = -1; - } - } - - var open = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + d)); - var ts = open.setUTCHours(open_hour); - return open; -} - -function updateClock() { - var clock = document.querySelector(".closed-registrations-message .clock"); - var now = new Date(); - var open = getNextOpen(now); - - if (open == "refresh") { - location.reload(); - return; - } - - var until = open - now; - var ms = until % 1000; - var s = Math.floor((until / 1000)) % 60; - var m = Math.floor((until / 1000 / 60)) % 60; - var h = Math.floor((until / 1000 / 60 / 60)); - if (m < 10) m = "0" + m; - if (s < 10) s = "0" + s; - clock.innerHTML = h + ":" + m + ":" + s; -}