Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.
2023-06-10 11:15:05 +02:00
parent d907e79140 44cd88adc4
commit 85722a918d
130 changed files with 420 additions and 5081 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
--- a/app/javascript/mastodon/locales/whitelist_af.json
+++ b/app/javascript/mastodon/locales/whitelist_af.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_an.json
+++ b/app/javascript/mastodon/locales/whitelist_an.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ar.json
+++ b/app/javascript/mastodon/locales/whitelist_ar.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ast.json
+++ b/app/javascript/mastodon/locales/whitelist_ast.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_be.json
+++ b/app/javascript/mastodon/locales/whitelist_be.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_bg.json
+++ b/app/javascript/mastodon/locales/whitelist_bg.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_bn.json
+++ b/app/javascript/mastodon/locales/whitelist_bn.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_br.json
+++ b/app/javascript/mastodon/locales/whitelist_br.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_bs.json
+++ b/app/javascript/mastodon/locales/whitelist_bs.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ca.json
+++ b/app/javascript/mastodon/locales/whitelist_ca.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ckb.json
+++ b/app/javascript/mastodon/locales/whitelist_ckb.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_co.json
+++ b/app/javascript/mastodon/locales/whitelist_co.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_cs.json
+++ b/app/javascript/mastodon/locales/whitelist_cs.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_csb.json
+++ b/app/javascript/mastodon/locales/whitelist_csb.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_cy.json
+++ b/app/javascript/mastodon/locales/whitelist_cy.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_da.json
+++ b/app/javascript/mastodon/locales/whitelist_da.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_de.json
+++ b/app/javascript/mastodon/locales/whitelist_de.json
@ -1,5 +0,0 @@
-[
-  "account.badges.bot",
-  "compose_form.publish_loud",
-  "search_results.hashtags"
-]
--- a/app/javascript/mastodon/locales/whitelist_el.json
+++ b/app/javascript/mastodon/locales/whitelist_el.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_en-GB.json
+++ b/app/javascript/mastodon/locales/whitelist_en-GB.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_en.json
+++ b/app/javascript/mastodon/locales/whitelist_en.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_eo.json
+++ b/app/javascript/mastodon/locales/whitelist_eo.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_es-AR.json
+++ b/app/javascript/mastodon/locales/whitelist_es-AR.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_es-MX.json
+++ b/app/javascript/mastodon/locales/whitelist_es-MX.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_es.json
+++ b/app/javascript/mastodon/locales/whitelist_es.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_et.json
+++ b/app/javascript/mastodon/locales/whitelist_et.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_eu.json
+++ b/app/javascript/mastodon/locales/whitelist_eu.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fa.json
+++ b/app/javascript/mastodon/locales/whitelist_fa.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fi.json
+++ b/app/javascript/mastodon/locales/whitelist_fi.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fo.json
+++ b/app/javascript/mastodon/locales/whitelist_fo.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fr-QC.json
+++ b/app/javascript/mastodon/locales/whitelist_fr-QC.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fr.json
+++ b/app/javascript/mastodon/locales/whitelist_fr.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_fy.json
+++ b/app/javascript/mastodon/locales/whitelist_fy.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ga.json
+++ b/app/javascript/mastodon/locales/whitelist_ga.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_gd.json
+++ b/app/javascript/mastodon/locales/whitelist_gd.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_gl.json
+++ b/app/javascript/mastodon/locales/whitelist_gl.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_he.json
+++ b/app/javascript/mastodon/locales/whitelist_he.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_hi.json
+++ b/app/javascript/mastodon/locales/whitelist_hi.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_hr.json
+++ b/app/javascript/mastodon/locales/whitelist_hr.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_hu.json
+++ b/app/javascript/mastodon/locales/whitelist_hu.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_hy.json
+++ b/app/javascript/mastodon/locales/whitelist_hy.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_id.json
+++ b/app/javascript/mastodon/locales/whitelist_id.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ig.json
+++ b/app/javascript/mastodon/locales/whitelist_ig.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_io.json
+++ b/app/javascript/mastodon/locales/whitelist_io.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_is.json
+++ b/app/javascript/mastodon/locales/whitelist_is.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_it.json
+++ b/app/javascript/mastodon/locales/whitelist_it.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ja.json
+++ b/app/javascript/mastodon/locales/whitelist_ja.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ka.json
+++ b/app/javascript/mastodon/locales/whitelist_ka.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_kab.json
+++ b/app/javascript/mastodon/locales/whitelist_kab.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_kk.json
+++ b/app/javascript/mastodon/locales/whitelist_kk.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_kn.json
+++ b/app/javascript/mastodon/locales/whitelist_kn.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ko.json
+++ b/app/javascript/mastodon/locales/whitelist_ko.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ku.json
+++ b/app/javascript/mastodon/locales/whitelist_ku.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_kw.json
+++ b/app/javascript/mastodon/locales/whitelist_kw.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_la.json
+++ b/app/javascript/mastodon/locales/whitelist_la.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_lt.json
+++ b/app/javascript/mastodon/locales/whitelist_lt.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_lv.json
+++ b/app/javascript/mastodon/locales/whitelist_lv.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_mk.json
+++ b/app/javascript/mastodon/locales/whitelist_mk.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ml.json
+++ b/app/javascript/mastodon/locales/whitelist_ml.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_mr.json
+++ b/app/javascript/mastodon/locales/whitelist_mr.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ms.json
+++ b/app/javascript/mastodon/locales/whitelist_ms.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_my.json
+++ b/app/javascript/mastodon/locales/whitelist_my.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_nl.json
+++ b/app/javascript/mastodon/locales/whitelist_nl.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_nn.json
+++ b/app/javascript/mastodon/locales/whitelist_nn.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_no.json
+++ b/app/javascript/mastodon/locales/whitelist_no.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_oc.json
+++ b/app/javascript/mastodon/locales/whitelist_oc.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_pa.json
+++ b/app/javascript/mastodon/locales/whitelist_pa.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_pl.json
+++ b/app/javascript/mastodon/locales/whitelist_pl.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_pt-BR.json
+++ b/app/javascript/mastodon/locales/whitelist_pt-BR.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_pt-PT.json
+++ b/app/javascript/mastodon/locales/whitelist_pt-PT.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ro.json
+++ b/app/javascript/mastodon/locales/whitelist_ro.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ru.json
+++ b/app/javascript/mastodon/locales/whitelist_ru.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sa.json
+++ b/app/javascript/mastodon/locales/whitelist_sa.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sc.json
+++ b/app/javascript/mastodon/locales/whitelist_sc.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sco.json
+++ b/app/javascript/mastodon/locales/whitelist_sco.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_si.json
+++ b/app/javascript/mastodon/locales/whitelist_si.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sk.json
+++ b/app/javascript/mastodon/locales/whitelist_sk.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sl.json
+++ b/app/javascript/mastodon/locales/whitelist_sl.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sq.json
+++ b/app/javascript/mastodon/locales/whitelist_sq.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sr-Latn.json
+++ b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sr.json
+++ b/app/javascript/mastodon/locales/whitelist_sr.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_sv.json
+++ b/app/javascript/mastodon/locales/whitelist_sv.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_szl.json
+++ b/app/javascript/mastodon/locales/whitelist_szl.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ta.json
+++ b/app/javascript/mastodon/locales/whitelist_ta.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_tai.json
+++ b/app/javascript/mastodon/locales/whitelist_tai.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_te.json
+++ b/app/javascript/mastodon/locales/whitelist_te.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_th.json
+++ b/app/javascript/mastodon/locales/whitelist_th.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_tr.json
+++ b/app/javascript/mastodon/locales/whitelist_tr.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_tt.json
+++ b/app/javascript/mastodon/locales/whitelist_tt.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ug.json
+++ b/app/javascript/mastodon/locales/whitelist_ug.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_uk.json
+++ b/app/javascript/mastodon/locales/whitelist_uk.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_ur.json
+++ b/app/javascript/mastodon/locales/whitelist_ur.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_uz.json
+++ b/app/javascript/mastodon/locales/whitelist_uz.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_vi.json
+++ b/app/javascript/mastodon/locales/whitelist_vi.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_zgh.json
+++ b/app/javascript/mastodon/locales/whitelist_zgh.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_zh-CN.json
+++ b/app/javascript/mastodon/locales/whitelist_zh-CN.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_zh-HK.json
+++ b/app/javascript/mastodon/locales/whitelist_zh-HK.json
@ -1,2 +0,0 @@
-[
-]
--- a/app/javascript/mastodon/locales/whitelist_zh-TW.json
+++ b/app/javascript/mastodon/locales/whitelist_zh-TW.json
@ -1,2 +0,0 @@
-[
-]