From 6577007717910bf46086490da8e9d549b63f1891 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 13 Nov 2023 02:36:08 +0100
Subject: [PATCH] Fix: _actually_ fix #1706

---
 src/UI/Popup/TagRendering/Questionbox.svelte  | 20 +++++++++----------
 .../TagRendering/SpecialTranslation.svelte    |  5 +++--
 .../TagRendering/TagRenderingQuestion.svelte  |  6 ++++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/UI/Popup/TagRendering/Questionbox.svelte b/src/UI/Popup/TagRendering/Questionbox.svelte
index 71478b75d..ff789eb76 100644
--- a/src/UI/Popup/TagRendering/Questionbox.svelte
+++ b/src/UI/Popup/TagRendering/Questionbox.svelte
@@ -29,6 +29,7 @@
    */
   export let notForLabels: string[] | undefined = undefined
   const _notForLabels = new Set(notForLabels)
+  let showAllQuestionsAtOnce = state.userRelatedState.showAllQuestionsAtOnce
 
   function allowed(labels: string[]) {
     if (onlyForLabels?.length > 0 && !labels.some((l) => _onlyForLabels.has(l))) {
@@ -67,11 +68,12 @@
     },
     [skippedQuestions]
   )
+  let firstQuestion = questionsToAsk.map(qta => qta[0])
 
   let answered: number = 0
   let skipped: number = 0
 
-  function skip(question: TagRenderingConfig, didAnswer: boolean = false) {
+  function skip(question: {id: string}, didAnswer: boolean = false) {
     skippedQuestions.data.add(question.id)
     skippedQuestions.ping()
     if (didAnswer) {
@@ -136,36 +138,34 @@
     {/if}
   {:else}
     <div>
-      <If condition={state.userRelatedState.showAllQuestionsAtOnce}>
+      {#if $showAllQuestionsAtOnce}
         <div>
           {#each $questionsToAsk as question (question.id)}
             <TagRenderingQuestion config={question} {tags} {selectedElement} {state} {layer} />
           {/each}
         </div>
-
-        <div slot="else">
-          <TagRenderingQuestion
-            config={$questionsToAsk[0]}
+      {:else}
+        <TagRenderingQuestion
+            config={$firstQuestion}
             {layer}
             {selectedElement}
             {state}
             {tags}
             on:saved={() => {
-              skip($questionsToAsk[0], true)
+              skip($firstQuestion, true)
             }}
           >
             <button
               class="secondary"
               on:click={() => {
-                skip(questionsToAsk[0])
+                skip($firstQuestion)
               }}
               slot="cancel"
             >
               <Tr t={Translations.t.general.skip} />
             </button>
           </TagRenderingQuestion>
-        </div>
-      </If>
+      {/if}
     </div>
   {/if}
 </div>
diff --git a/src/UI/Popup/TagRendering/SpecialTranslation.svelte b/src/UI/Popup/TagRendering/SpecialTranslation.svelte
index 84a37969c..52b414af4 100644
--- a/src/UI/Popup/TagRendering/SpecialTranslation.svelte
+++ b/src/UI/Popup/TagRendering/SpecialTranslation.svelte
@@ -29,8 +29,9 @@
   let specs: RenderingSpecification[] = []
   $: {
     try {
+      txt = t.textFor($language)
       if (txt !== undefined) {
-        const key = "cached_special_spec_" + $language
+        let key = "cached_special_spec_" + $language
         specs = t[key]
         if (specs === undefined) {
           specs = SpecialVisualizations.constructSpecification(txt)
@@ -67,6 +68,6 @@
       <WeblateLink context={t.context} />
     </span>
   {:else if $tags !== undefined}
-    <ToSvelte construct={createVisualisation(specpart)} />
+    <ToSvelte construct={() => createVisualisation(specpart)} />
   {/if}
 {/each}
diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index 67ce1cc0c..9db0c8ccd 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -172,6 +172,8 @@
     state?.featureSwitches?.featureSwitchIsDebugging ?? new ImmutableStore(false)
   let showTags = state?.userRelatedState?.showTags ?? new ImmutableStore(undefined)
   let numberOfCs = state?.osmConnection?.userDetails?.data?.csCount ?? 0
+  let question = config.question
+  $: question = config.question
   if (state?.osmConnection) {
     onDestroy(
       state.osmConnection?.userDetails?.addCallbackAndRun((ud) => {
@@ -181,7 +183,7 @@
   }
 </script>
 
-{#if config.question !== undefined}
+{#if question !== undefined}
   <div
     class="interactive border-interactive relative flex flex-col overflow-y-auto p-1 px-2"
     style="max-height: 85vh"
@@ -190,7 +192,7 @@
       <div class="interactive sticky top-0 flex justify-between">
         <span class="font-bold">
           <SpecialTranslation
-            t={config.question}
+            t={question}
             {tags}
             {state}
             {layer}