#91 replacements

src/lib/BasePage.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import Toc from 'svelte-toc'
   import { Img } from '.'
   import { microcopy } from './stores'

src/lib/ChapterList.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from './stores'
   import type { Chapter } from './types'
 

src/lib/Footer.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { repository } from '$root/package.json'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { Social } from '.'
   import { microcopy } from './stores'
   import type { Link } from './types'
@@ -10,12 +10,16 @@
 </script>
 
 <footer>
+  {@html $microcopy?.icons?.global?.award}
+  {@html $microcopy?.icons?.pages?.nav?.expand}
+  {@html $microcopy?.icons?.pages?.footer['Impressum']}
+
   <img src="/favicon.svg" alt="SbS Logo" height="60" />
   <span>© {new Date().getFullYear()} {$microcopy?.footer?.name}</span>
   <div>
     {#each links as { title, url }}
       <a href={url}>
-        <Icon inline icon={$microcopy?.icons?.footer[title]} />
+        <Icon inline icon={$microcopy?.icons?.pages?.footer[title]} />
         {title}
       </a>
     {/each}

src/lib/Nav.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { beforeNavigate } from '$app/navigation'
   import { page } from '$app/stores'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { slide } from 'svelte/transition'
   import type { NavLink } from './types'
   import { microcopy } from './stores'

src/lib/PlaceSelect.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import type { Result } from '@mapbox/mapbox-gl-geocoder'
   import type { Map as MapBox, Marker } from 'mapbox-gl'
   import mapbox from 'mapbox-gl'

src/lib/PostPreview.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { Img, ToolTip } from '.'
   import type { Post } from './types'
   import { microcopy } from './stores'

src/lib/Social.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from './stores'
 
   export let social: Record<string, string>

src/lib/TagList.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { fade, slide } from 'svelte/transition'
   import type { Post } from './types'
   import { microcopy } from './stores'

src/lib/ThemeSwitcher.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { colorMode, microcopy } from './stores'
 
   // TODO: i18n the color mode titles

src/routes/+layout.ts

@@ -1,5 +1,5 @@
 import { fetch_chapters, fetch_yaml } from '$lib/fetch'
-import { microcopy } from '$lib/stores'
+import { microcopy, icons } from '$lib/stores'
 import type { Chapter, NavLink } from '$lib/types'
 
 export const load = async () => {
@@ -8,6 +8,7 @@ export const load = async () => {
   const social = await fetch_yaml(`Social`)
   const chapters = await fetch_chapters()
   const smallTexts = await fetch_yaml(`smallTexts`)
+  const iconYaml = await fetch_yaml('icons')
   microcopy.set(smallTexts)
 
   // ensure the non-chapter link spans all chapter subnav columns

src/routes/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { ChapterMap } from '$lib'
   import { microcopy } from '$lib/stores'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
 
   export let data
 
@@ -64,7 +64,7 @@
   <div style="background: var(--light-blue);">
     <span>{$microcopy?.indexPage?.boxes?.organizationMemberNumber}</span>
     <strong>
-      <Icon inline icon="fa6-solid:user-group" {style} />
+      <Icon inline icon={microcopy?.icons?.global?.group} {style} />
       {@html $microcopy?.indexPage?.boxes?.organizationMemberName}
     </strong>
   </div>

src/routes/auszeichnungen/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { BasePage, Img } from '$lib'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from '../../lib/stores.js'
 
   export let data

src/routes/blog/[slug]/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Img, ToolTip } from '$lib'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { onMount } from 'svelte'
   import { microcopy } from '/src/lib/stores.js'
   export let data
@@ -68,7 +68,7 @@
       <strong>{new Date(date).toLocaleDateString(`de`)}</strong>
     </span>
     <span>
-      <Icon icon="ic:round-remove-red-eye" />
+      <Icon icon={$microcopy?.icons?.pages?.blog?.eye} />
       {n_readers}
     </span>
   </section>

src/routes/faq/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Collapsible } from '$lib'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { flip } from 'svelte/animate'
   import { scale } from 'svelte/transition'
   import { microcopy } from '../../lib/stores.js'

src/routes/lernmaterial/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { BasePage, Img } from '$lib'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { flip } from 'svelte/animate'
   import { scale } from 'svelte/transition'
   import { microcopy } from '../../lib/stores.js'

src/routes/presse/+page.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { BasePage, Img } from '$lib'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from '../../lib/stores.js'
 
   export let data

src/routes/signup-pupil/+page.svelte

@@ -3,7 +3,7 @@
   // to make the signup form truely adaptive to other countries, these 3 files need to be imported adaptively (same in the other form)
   import { signup_form_submit_handler } from '$lib/azure'
   import { signupStore } from '$lib/stores'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from '../../lib/stores.js'
 
   export let data

src/routes/signup-student/+page.svelte

@@ -2,7 +2,7 @@
   import { CircleSpinner, FormField, Modal } from '$lib'
   import { signup_form_submit_handler } from '$lib/azure'
   import { signupStore } from '$lib/stores'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
   import { microcopy } from '../../lib/stores.js'
 
   export let data

src/routes/standorte/[slug]/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { BasePage } from '$lib'
   import { microcopy } from '$lib/stores'
-  import Icon from '@iconify/svelte'
+  import { Icon } from '@iconify/svelte'
 
   export let data
   $: ({ page, slug } = data)

src/signup-form/de/smallTexts.yml

@@ -13,11 +13,13 @@ indexPage:
   boxes:
     locationsName: Standorte
     studentsName: Studierende
-    studentsNumber: 2872
+    studentsNumber: 3228
     pupilsName: Schüler:innen
-    pupilsNumber: 3186
+    pupilsNumber: 3231
     scholarshipName: '<a style="color: white;" href="/stipendium">Stipendien</a>'
-    scholarshipNumber: 9
+    scholarshipNumber: 12
+    organizationMemberName: Vereinsmitglieder
+    organizationMemberNumber: 350
 
 footer:
   name: "Studenten bilden Schüler e.V."
@@ -34,10 +36,12 @@ map:
   text:
     active: "aktiver Standort"
     inSetup: "in Gründung"
+    partner: "Partner"
 
 chapterList:
   locations: "Unsere Standorte"
   inSetup: "Standorte in Gründung"
+  partner: "Partner Standorte"
 
 location:
   register: "Anmeldungen"
@@ -46,6 +50,7 @@ location:
   linkStudentInfo: "/mitmachen/nachhilfelehrer"
   infoStudentButton: "Infos für Studierende"
   joinPupil: "Suchst du Nachhilfe?"
+  declinePupil: "Warteliste voll :("
   registerPupil: "Als Schüler:in anmelden"
   linkPupilInfo: "/mitmachen/schueler"
   infoPupilButton: "Infos für Schüler:innen"
@@ -91,10 +96,11 @@ icons:
     expand: &EXPAND "bi:chevron-expand"
     graduate: &GRADUATE "fa-solid:user-graduate"
     graduationCap: &GRADUATION_CAP "fa-solid:graduation-cap"
+    group: &GROUP "fa6-solid:user-group"
     # handshake
     hands: &HANDS_HELPING "fa-solid:hands-helping"
     information: &INFORMATION "bi:info-circle-fill"
-    link: &LINK bx:link
+    link: &LINK "bx:link"
     newspaper: &NEWSPAPER "ion:newspaper"
     # marker
     place: &PLACE "ic:place"
@@ -117,14 +123,16 @@ icons:
     article:
       history: "ic:round-history-edu"
       person: "bi:person-circle"
+    blog:
+      eye: "ic:round-remove-red-eye"
     chapterList:
       construction: "ic:round-construction"
     footer:
       Datenschutz: "ic:round-privacy-tip"
       Impressum: "octicon:law"
       Satzung: "ion:document-text"
       Spenden: *CURRENCY
-      cookie: bxs:cookie
+      cookie: "bxs:cookie"
       opensource: "ri:open-source-fill"
     index:
       update: "ic:update"
@@ -136,7 +144,7 @@ icons:
       Mitmachen: "ion:people-circle"
       Standorte: *PLACE
       expand: *EXPAND
-      menu: heroicons-solid:menu
+      menu: "heroicons-solid:menu"
       Über Uns: *PLANT
     placeSelect:
       delete: "ic:delete"
@@ -159,7 +167,7 @@ icons:
       Bundesvorstand: "ion:stats-chart"
       Erfahrungsberichte: "ic:rate-review"
       Events: "ic:event-available"
-      Freizeit: "ic:be   ach-access"
+      Freizeit: "ic:beach-access"
       IT: "bx:git-branch"
       Interview: "ic:question-answer"
       Mentoring: *TEACHER