Merge branch 'develop' into feature/nsi

src/UI/InputElement/Helpers/SimpleTagInput.svelte

@@ -5,8 +5,8 @@
   import { UIEventSource } from "../../../Logic/UIEventSource"
   import BasicTagInput from "../../Studio/TagInput/BasicTagInput.svelte"
   import { TagUtils } from "../../../Logic/Tags/TagUtils"
-  import nmd from "nano-markdown"
   import FromHtml from "../../Base/FromHtml.svelte"
+  import Markdown from "../../Base/Markdown.svelte"
   export let value: UIEventSource<undefined | string>
   export let args: string[] = []
   let uploadableOnly: boolean = args[0] === "uploadableOnly"
@@ -34,6 +34,6 @@
 {#if $dropdownFocussed}
   <div class="m-2 border border-dashed border-black p-2">
     <b>{documentation.name}</b>
-    <FromHtml src={nmd(documentation.docs)} />
+    <Markdown src={documentation.docs} />
   </div>
 {/if}

src/UI/InputElement/Validators.ts

@@ -29,6 +29,7 @@ import IdValidator from "./Validators/IdValidator"
 import SlopeValidator from "./Validators/SlopeValidator"
 import VeloparkValidator from "./Validators/VeloparkValidator"
 import NameSuggestionIndexValidator from "./Validators/NameSuggestionIndexValidator"
+import CurrencyValidator from "./Validators/CurrencyValidator"
 
 export type ValidatorType = (typeof Validators.availableTypes)[number]
 
@@ -62,6 +63,7 @@ export default class Validators {
         "slope",
         "velopark",
         "nsi",
+        "currency"
     ] as const
 
     public static readonly AllValidators: ReadonlyArray<Validator> = [
@@ -92,6 +94,7 @@ export default class Validators {
         new SlopeValidator(),
         new VeloparkValidator(),
         new NameSuggestionIndexValidator(),
+        new CurrencyValidator()
     ]
 
     private static _byType = Validators._byTypeConstructor()

src/UI/InputElement/Validators/CurrencyValidator.ts

@@ -0,0 +1,73 @@
+import { Validator } from "../Validator"
+import { Utils } from "../../../Utils"
+
+export default class CurrencyValidator extends Validator {
+    private readonly segmenter: Intl.Segmenter
+    private readonly symbolToCurrencyMapping: Map<string, string>
+    private readonly supportedCurrencies: Set<string>
+
+    constructor() {
+        super("currency", "Validates monetary amounts")
+        if (Intl.Segmenter === undefined || Utils.runningFromConsole) {
+            // Librewolf doesn't support this
+            return
+        }
+        let locale = "en-US"
+        if(!Utils.runningFromConsole){
+             locale??= navigator.language
+        }
+        this.segmenter = new Intl.Segmenter(locale, {
+            granularity: "word"
+        })
+
+        const mapping: Map<string, string> = new Map<string, string>()
+        const supportedCurrencies: Set<string> = new Set(Intl.supportedValuesOf("currency"))
+        this.supportedCurrencies = supportedCurrencies
+        for (const currency of supportedCurrencies) {
+            const symbol = (0).toLocaleString(
+                locale,
+                {
+                    style: "currency",
+                    currency: currency,
+                    minimumFractionDigits: 0,
+                    maximumFractionDigits: 0
+                }
+            ).replace(/\d/g, "").trim()
+
+            mapping.set(symbol.toLowerCase(), currency)
+        }
+        this.symbolToCurrencyMapping = mapping
+    }
+
+    reformat(s: string): string {
+        if (!this.segmenter) {
+            return s
+        }
+
+        const parts = Array.from(this.segmenter.segment(s)).map(i => i.segment).filter(part => part.trim().length > 0)
+        if(parts.length !== 2){
+            return s
+        }
+        const mapping = this.symbolToCurrencyMapping
+        let currency: string = undefined
+        let amount = undefined
+        for (const part of parts) {
+            const lc = part.toLowerCase()
+            if (this.supportedCurrencies.has(part.toUpperCase())) {
+                currency = part.toUpperCase()
+                continue
+            }
+
+            if (mapping.has(lc)) {
+                currency = mapping.get(lc)
+                continue
+            }
+            amount = part
+        }
+        if(amount === undefined || currency === undefined){
+            return s
+        }
+
+        return amount+" "+currency
+    }
+}

src/UI/InputElement/Validators/VeloparkValidator.ts

@@ -3,7 +3,7 @@ import UrlValidator from "./UrlValidator"
 
 export default class VeloparkValidator extends UrlValidator {
     constructor() {
-        super("velopark", "A custom element to allow copy-pasting velopark-pages")
+        super("velopark", "A special URL-validator that checks the domain name and rewrites to the correct velopark format.")
     }
 
     getFeedback(s: string): Translation {