From 0da2785e59317cb997d34aa6936d329e261bc487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= <jurij@kompot.si>
Date: Mon, 1 Apr 2024 20:36:28 +0200
Subject: [PATCH] Popravki prevodov (linki, nekaj napisov, ...)

---
 nuxt/components/Glava.vue       | 18 ++++++++++--------
 nuxt/components/IzborJezika.vue | 21 ++++++++++++++++-----
 nuxt/components/Pojem.vue       |  5 +++--
 nuxt/composables/ui.js          |  1 -
 nuxt/lang/en.json               |  1 +
 nuxt/nuxt.config.js             |  6 +++---
 nuxt/pages/index.vue            |  2 +-
 nuxt/pages/manifest/index.vue   |  4 ++--
 nuxt/pages/manifest/pojem.vue   | 10 ++++++++--
 9 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/nuxt/components/Glava.vue b/nuxt/components/Glava.vue
index 6aedc6e..56e3d0d 100644
--- a/nuxt/components/Glava.vue
+++ b/nuxt/components/Glava.vue
@@ -3,7 +3,8 @@
 const route = useRoute()
 
 const pot = computed(() => route.path)
-const naManifestu = computed(() => route.path.indexOf('/manifest') === 0)
+const naManifestu = computed(() => route.name.indexOf('manifest') === 0
+                            || route.name.indexOf('pojem') === 0)
 
 const { baseUrl } = useRuntimeConfig().public
 
@@ -13,17 +14,19 @@ const { baseUrl } = useRuntimeConfig().public
   <section class="glava" :class="{ manifest: naManifestu }">
     <ul class="meni">
       <li>
-        <NuxtLink to="/">
+        <NuxtLink :to="localePath('index')">
           {{ $t('domov') }}
         </NuxtLink>
       </li>
       <li>
-        <NuxtLink to="/manifest">
-          Manifest
+        <NuxtLink :to="localePath('manifest')">
+          {{ $t('manifest') }}
         </NuxtLink>
       </li>
       <li>
-        <IzborJezika />
+        <a @click.prevent>
+          <IzborJezika />
+        </a>
       </li>
       <li>
         <NuxtLink :to="baseUrl + '/user'" class="posivljen" target="_blank">
@@ -34,7 +37,7 @@ const { baseUrl } = useRuntimeConfig().public
 
     <img src="/images/zvezda.png">
 
-    <h1 v-if="naManifestu">MANIFEST</h1>
+    <h1 v-if="naManifestu">{{ $t('manifest') }}</h1>
     <h1 v-else>{{ $t('jugofuturizem') }}</h1>
   </section>
 </template>
@@ -56,6 +59,7 @@ h1 {
   font-family: Trailers;
   font-size: 16rem;
   z-index: 50;
+  text-transform: uppercase;
 }
 
 @media screen and (max-width: 1090px) {
@@ -87,8 +91,6 @@ img {
   }
 }
 
-
-
 .meni {
   position: absolute;
   top: 0;
diff --git a/nuxt/components/IzborJezika.vue b/nuxt/components/IzborJezika.vue
index 83554c2..de9bfa5 100644
--- a/nuxt/components/IzborJezika.vue
+++ b/nuxt/components/IzborJezika.vue
@@ -17,7 +17,7 @@ const izbor = ref(false)
 
 <template>
   <div class="izbor">
-    <div @click="izbor = !izbor">
+    <div class="jezik" @click="izbor = !izbor">
       <img :src="slikaJezika(izbraniJezik)" /> {{ store.mozniJeziki[izbraniJezik] }}
     </div>
 
@@ -30,12 +30,23 @@ const izbor = ref(false)
 </template>
 
 <style>
+
 .izbor {
-  width: 7rem;
+  width: 10rem;
   cursor: pointer;
 }
-img {
-  position: relative;
-  top: 5px;
+
+.jezik {
+  display: flex;
+  align-items: center;
 }
+
+.drugiJeziki > div {
+  margin-top: 5px;
+}
+
+img {
+  margin-right: 5px;
+}
+
 </style>
diff --git a/nuxt/components/Pojem.vue b/nuxt/components/Pojem.vue
index d2cfb0c..61318d3 100644
--- a/nuxt/components/Pojem.vue
+++ b/nuxt/components/Pojem.vue
@@ -9,15 +9,16 @@ const store = usePojmiStore()
 const nastavitveStore = useNastavitveStore()
 const route = useRoute()
 
+const { izbraniJezik } = storeToRefs(nastavitveStore)
+
 const props = defineProps({
   naslov: String
 })
 
 if (props.naslov && !(props.naslov in store.pojmi)) {
-  await store.naloziPojme()
+  await store.naloziPojme(izbraniJezik.value)
 }
 
-const { izbraniJezik } = storeToRefs(nastavitveStore)
 watch(izbraniJezik, jezik => {
   store.naloziPojme(jezik)
 })
diff --git a/nuxt/composables/ui.js b/nuxt/composables/ui.js
index 0fca18c..650095f 100644
--- a/nuxt/composables/ui.js
+++ b/nuxt/composables/ui.js
@@ -3,7 +3,6 @@
 export const useUi = () => ({
   poskrolaj: (sekcija, timeout = 50) => {
     setTimeout(() => {
-      console.log('UI SKROL!', sekcija)
       if (sekcija && sekcija.scrollIntoView) {
         sekcija.scrollIntoView({ behavior: 'smooth' })
       }
diff --git a/nuxt/lang/en.json b/nuxt/lang/en.json
index 2e1420e..5771884 100644
--- a/nuxt/lang/en.json
+++ b/nuxt/lang/en.json
@@ -1,6 +1,7 @@
 {
   "domov": "home",
   "jugofuturizem": "yugofuturism",
+  "manifest": "manifesto",
   "Nazaj": "Back",
   "Vsak lahko prispeva k vsebinam manifesta. Predlaga lahko nov pojem ali ureja, dopolni ali predela obstoječe.": "Anyone can add content to the manifesto. You can suggest a new concept or edit, amend or adjust an existing one.",
   "Dodaj nov pojem": "Add new concept"
diff --git a/nuxt/nuxt.config.js b/nuxt/nuxt.config.js
index a79325a..af3bc0b 100644
--- a/nuxt/nuxt.config.js
+++ b/nuxt/nuxt.config.js
@@ -42,15 +42,15 @@ export default defineNuxtConfig({
   hooks: {
     'pages:extend' (pages) {
       pages.push({
-        name: 'poglej_pojem',
+        name: 'pojem_poglej',
         path: '/manifest/:naslov',
         file: '~/pages/manifest/pojem.vue'
       }, {
-        name: 'uredi_pojem',
+        name: 'pojem_uredi',
         path: '/manifest/:naslov/uredi/:guid',
         file: '~/pages/manifest/pojem.vue'
       }, {
-        name: 'nov_pojem_guid',
+        name: 'pojem_dodaj',
         path: '/manifest/dodaj/:guid',
         file: '~/pages/manifest/dodaj.vue'
       })
diff --git a/nuxt/pages/index.vue b/nuxt/pages/index.vue
index 84c464d..db62a32 100644
--- a/nuxt/pages/index.vue
+++ b/nuxt/pages/index.vue
@@ -8,7 +8,7 @@ const { izbraniJezik } = storeToRefs(nastavitveStore)
 const stran = computed(() => store.strani['YuFu'])
 useHead({meta: [{title: "jugofuturizem"}]})
 
-await store.naloziStrani()
+await store.naloziStrani(izbraniJezik.value)
 
 watch(izbraniJezik, jezik => {
   store.naloziStrani(jezik)
diff --git a/nuxt/pages/manifest/index.vue b/nuxt/pages/manifest/index.vue
index b2b342a..2018761 100644
--- a/nuxt/pages/manifest/index.vue
+++ b/nuxt/pages/manifest/index.vue
@@ -18,13 +18,13 @@ onMounted(() => {
 
 <template>
   <h3 class="navodila" ref="navodila">{{ $t('Vsak lahko prispeva k vsebinam manifesta. Predlaga lahko nov pojem ali ureja, dopolni ali predela obstoječe.') }}</h3>
-  <NuxtLink class="gumb" to="/manifest/dodaj">
+  <NuxtLink class="gumb" :to="localePath('pojem_dodaj')">
     {{ $t('Dodaj nov pojem') }}
   </NuxtLink>
   <NuxtLink
     v-for="pojem in Object.keys(store.pojmi)"
     :naslov="pojem"
-    :to="`/manifest/${encodeURIComponent(pojem)}`"
+    :to="localePath('poglej_pojem', encodeURIComponent(pojem))"
     class="okvir">
     <h2>{{ pojem }}</h2>
   </NuxtLink>
diff --git a/nuxt/pages/manifest/pojem.vue b/nuxt/pages/manifest/pojem.vue
index 2cad06a..95c222f 100644
--- a/nuxt/pages/manifest/pojem.vue
+++ b/nuxt/pages/manifest/pojem.vue
@@ -20,11 +20,17 @@ const resp = await $fetch(`${etherpadApiUrl}/createPad?padID=${padId}`)
     <Pojem :naslov="naslov" />
   </div>
 
-  <NuxtLink class="gumb" to="/manifest#skrol">
-    Manifest
+  <NuxtLink class="gumb" :to="localePath('manifest') + '#skrol'">
+    {{ $t('manifest') }}
   </NuxtLink>
 
   <br>
   <br>
 
 </template>
+
+<style>
+  a {
+    text-transform: capitalize;
+  }
+</style>