From 05b68bbc264f3ac700962552f7dd6ee86ba1f16f Mon Sep 17 00:00:00 2001 From: Alex J Date: Wed, 22 Jun 2022 18:58:15 +0200 Subject: [PATCH 1/2] Remove mdsex Signed-off-by: Alex J --- package.json | 5 ++--- pnpm-lock.yaml | 58 ++++++++---------------------------------------- svelte.config.js | 6 +---- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 3ea2035..dadbab1 100644 --- a/package.json +++ b/package.json @@ -17,17 +17,16 @@ "@iconify-json/simple-icons": "^1.1.15", "@sveltejs/adapter-static": "next", "@sveltejs/kit": "next", - "mdsvex": "^0.10.6", "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", "svelte": "^3.48.0", "svelte-check": "^2.7.2", "svelte-preprocess": "^4.10.7", "svelte-seo": "^1.4.1", + "sveltekit-i18n": "^2.2.2", "tslib": "^2.4.0", "typescript": "^4.7.4", - "unplugin-icons": "^0.14.5", - "sveltekit-i18n": "^2.2.2" + "unplugin-icons": "^0.14.5" }, "type": "module" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 77cde19..37d1023 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,11 +1,10 @@ -lockfileVersion: 5.4 +lockfileVersion: 5.3 specifiers: '@iconify-json/fa6-solid': ^1.1.4 '@iconify-json/simple-icons': ^1.1.15 '@sveltejs/adapter-static': next '@sveltejs/kit': next - mdsvex: ^0.10.6 prettier: ^2.7.1 prettier-plugin-svelte: ^2.7.0 svelte: ^3.48.0 @@ -21,13 +20,12 @@ devDependencies: '@iconify-json/fa6-solid': 1.1.4 '@iconify-json/simple-icons': 1.1.15 '@sveltejs/adapter-static': 1.0.0-next.34 - '@sveltejs/kit': 1.0.0-next.350_svelte@3.48.0 - mdsvex: 0.10.6_svelte@3.48.0 + '@sveltejs/kit': 1.0.0-next.352_svelte@3.48.0 prettier: 2.7.1 - prettier-plugin-svelte: 2.7.0_nakrehnrzdf7fdea5k3a4dfy4m + prettier-plugin-svelte: 2.7.0_prettier@2.7.1+svelte@3.48.0 svelte: 3.48.0 svelte-check: 2.7.2_svelte@3.48.0 - svelte-preprocess: 4.10.7_lvfi2wesz6u4l5rfbnetbucfmm + svelte-preprocess: 4.10.7_svelte@3.48.0+typescript@4.7.4 svelte-seo: 1.4.1_typescript@4.7.4 sveltekit-i18n: 2.2.2_svelte@3.48.0 tslib: 2.4.0 @@ -127,8 +125,8 @@ packages: tiny-glob: 0.2.9 dev: true - /@sveltejs/kit/1.0.0-next.350_svelte@3.48.0: - resolution: {integrity: sha512-qkZNjp7yIj6t91+wMhmMtGJH0Lb89OaKdVXUDy92CS5/4OHRTKcQPdfOKs4no/upkS3RiFb+rEpOkYqTMcPUXg==} + /@sveltejs/kit/1.0.0-next.352_svelte@3.48.0: + resolution: {integrity: sha512-cYQWGZ2TU1iMsh1cqi44FJm5Aqs3iOkuUOnRpoecthcbmiZaqkD1sPG/uROBIPexXSbfyUfrck/hgr9vdCAmCw==} engines: {node: '>=16.7'} hasBin: true peerDependencies: @@ -198,10 +196,6 @@ packages: '@types/node': 18.0.0 dev: true - /@types/unist/2.0.6: - resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==} - dev: true - /acorn/8.7.1: resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==} engines: {node: '>=0.4.0'} @@ -716,18 +710,6 @@ packages: sourcemap-codec: 1.4.8 dev: true - /mdsvex/0.10.6_svelte@3.48.0: - resolution: {integrity: sha512-aGRDY0r5jx9+OOgFdyB9Xm3EBr9OUmcrTDPWLB7a7g8VPRxzPy4MOBmcVYgz7ErhAJ7bZ/coUoj6aHio3x/2mA==} - peerDependencies: - svelte: 3.x - dependencies: - '@types/unist': 2.0.6 - prism-svelte: 0.4.7 - prismjs: 1.28.0 - svelte: 3.48.0 - vfile-message: 2.0.4 - dev: true - /merge-stream/2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} dev: true @@ -870,7 +852,7 @@ packages: source-map-js: 1.0.2 dev: true - /prettier-plugin-svelte/2.7.0_nakrehnrzdf7fdea5k3a4dfy4m: + /prettier-plugin-svelte/2.7.0_prettier@2.7.1+svelte@3.48.0: resolution: {integrity: sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==} peerDependencies: prettier: ^1.16.4 || ^2.0.0 @@ -886,15 +868,6 @@ packages: hasBin: true dev: true - /prism-svelte/0.4.7: - resolution: {integrity: sha512-yABh19CYbM24V7aS7TuPYRNMqthxwbvx6FF/Rw920YbyBWO3tnyPIqRMgHuSVsLmuHkkBS1Akyof463FVdkeDQ==} - dev: true - - /prismjs/1.28.0: - resolution: {integrity: sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==} - engines: {node: '>=6'} - dev: true - /queue-microtask/1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true @@ -1035,7 +1008,7 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 3.48.0 - svelte-preprocess: 4.10.7_lvfi2wesz6u4l5rfbnetbucfmm + svelte-preprocess: 4.10.7_svelte@3.48.0+typescript@4.7.4 typescript: 4.7.4 transitivePeerDependencies: - '@babel/core' @@ -1059,7 +1032,7 @@ packages: svelte: 3.48.0 dev: true - /svelte-preprocess/4.10.7_lvfi2wesz6u4l5rfbnetbucfmm: + /svelte-preprocess/4.10.7_svelte@3.48.0+typescript@4.7.4: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -1157,12 +1130,6 @@ packages: hasBin: true dev: true - /unist-util-stringify-position/2.0.3: - resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==} - dependencies: - '@types/unist': 2.0.6 - dev: true - /unplugin-icons/0.14.5: resolution: {integrity: sha512-fxi/fuBZXtZu64L8iAPj+ecu/rnSvTbfR14RO44xIWdsI/Ohpzs9Gve7+nHIgD6JFrdtCfzGnXWBEVPbMGWX3A==} peerDependencies: @@ -1218,13 +1185,6 @@ packages: webpack-virtual-modules: 0.4.3 dev: true - /vfile-message/2.0.4: - resolution: {integrity: sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==} - dependencies: - '@types/unist': 2.0.6 - unist-util-stringify-position: 2.0.3 - dev: true - /vite/2.9.12: resolution: {integrity: sha512-suxC36dQo9Rq1qMB2qiRorNJtJAdxguu5TMvBHOc/F370KvqAe9t48vYp+/TbPKRNrMh/J55tOUmkuIqstZaew==} engines: {node: '>=12.2.0'} diff --git a/svelte.config.js b/svelte.config.js index 707413c..4937d4f 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,19 +1,15 @@ import adapter from "@sveltejs/adapter-static"; import preprocess from "svelte-preprocess"; import icons from "unplugin-icons/vite"; -import { mdsvex } from "mdsvex"; /** @type {import('@sveltejs/kit').Config} */ const config = { // Consult https://github.com/sveltejs/svelte-preprocess // for more information about preprocessors - extensions: [".svelte", ".md"], + extensions: [".svelte"], preprocess: [ preprocess(), - mdsvex({ - extensions: [".md"] - }) ], kit: { From 4fbd32e38f490aa214b522d50ec7913c6da7094e Mon Sep 17 00:00:00 2001 From: Alex J Date: Wed, 22 Jun 2022 19:14:13 +0200 Subject: [PATCH 2/2] Fixup faq (nb) Signed-off-by: Alex J --- src/i18n/nb.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/i18n/nb.json b/src/i18n/nb.json index 2e8b551..22ace0a 100644 --- a/src/i18n/nb.json +++ b/src/i18n/nb.json @@ -46,5 +46,17 @@ "CSM_TITLE": "Anbefalte mods", "CSM_HOW_THEY_ARE_PICKED": "Disse er plukket av våres felleskap eller er for server funksjoner som stemmechat.", "CSM_NOTE_BEDROCK": "Hvis du spiller på Bedrock, så får du ikke brukt mods som Simple Voice Chat. Unnskyld! :(", - "CSM_OPTIMIZATION_MODS_NOTE": "Hva slags mod som gjør spillet kjappere (Vi anbefaler i det minste Sodium)" + "CSM_OPTIMIZATION_MODS_NOTE": "Hva slags mod som gjør spillet kjappere (Vi anbefaler i det minste Sodium)", + "FAQ_TITLE": "Ofte Stilte Spørsmål", + "FAQ_OWNER_TITLE": "Hvem eier prosjektet?", + "FAQ_OWNER": "Originalt var det Midou (system administrator) og MrLeRien (personen som eierer 2 av våres VPSer og Soleil), men nå har Odyssey346 (Spillserver systemadministrator, nettutvikler og norsk-oversetter) og Devnol (personen som eier Helios) blitt med oss.", + "FAQ_TOXICITY_TITLE": "En av deres tjenester har slemme folk!", + "FAQ_TOXICITY_1": "Du kan få i kontakt med oss på e-post eller på Matrix og vi kan diskutere det med deg. Vi anbefaler at du putter meste av disse forespørselene i våres support-kanal her:", + "FAQ_TOXICITY_2": "på Matrix. Hvis det er personlig, bare si at du har en rapport mot noen på våres tjenester, og at du har lyst til å bli kontaktet av en administrator, så kontakter vi deg når det er mulig.", + "FAQ_TRUST_TITLE": "Hvordan kan jeg stole på dere?", + "FAQ_TRUST_1": "Vel, du kan egentlig ikke det. Vi slepper ikke ut loggene våres, men du kan spørre oss om informasjom vi har om deg på serverene våres med å kontakte oss. Hvis du er paranoid,", + "FAQ_TRUST_2": " det er lov å bruke Tor på våres tjenester", + "FAQ_TRUST_3": ", men vi har ingen .onion lenker.", + "FAQ_CONTACT_TITLE": "Hvordan har dere lyst til å kommunisere?", + "FAQ_CONTACT": "Se på" }