First full release

express/views/pages/admin-dict-structure-demo.pug

@@ -1,5 +1,6 @@
 extends ../layout
 
+//- TODO MARK FOR DELETION
 block body
   section
     include ../common/main-navigation

express/views/pages/admin.pug

@@ -1,5 +1,6 @@
 extends ../layout
 
+//- TODO MARK FOR DELETION
 //- TODO check if deprecated
 block body
   section

express/views/pages/admin/areas.pug

@@ -12,15 +12,13 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Podpodročja', h1: 'Podpodročja', description: 'Podpodročja so namenjena podrobnejšemu razvrščanju terminoloških slovarjev. Administrator mora vsa novo predlagana podpodročja potrditi, preden jih lahko na seznamu vidijo tudi drugi uporabniki portala.', buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Podpodročja'), h1: t('Podpodročja'), description: t('Podpodročja so namenjena podrobnejšemu razvrščanju terminoloških slovarjev. Administrator mora vsa novo predlagana podpodročja potrditi, preden jih lahko na seznamu vidijo tudi drugi uporabniki portala.'), buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: t('Shrani') }] }
   +mainHeader(c)
 
   .content-hold-prerequisites
-    #offset-main.main-container.mt-2
+    #offset-main.main-container
       if results.length
-        .d-flex.justify-content-between.mt-4
-          .d-flex.flex-row.mb-4
-            include /components/search-and-filter/inline-search
+        .d-flex.justify-content-end.mt-4
           .d-flex
             include /utilities/pager
             +pager
@@ -31,9 +29,9 @@ block body
           table#all-areas-table.table.areas-table.table-responsive
             thead
               tr
-                th(scope="col") Vidno
-                th(scope="col") Podpodročje
-                th(scope="col") Prevod
+                th(scope="col")= t('Vidno')
+                th(scope="col")= t('Podpodročje')
+                th(scope="col")= t('Prevod')
                 th(scope="col") 
             tbody#page-results
               each result in results
@@ -53,6 +51,7 @@ block body
                         name="isApproved"
                         disabled
                       )
+                  //- TODO I18n 
                   td.tdata-area= result.nameSl
                   td.tdata-translation= result.nameEn
                   td.buttons-group
@@ -66,21 +65,21 @@ block body
                         data-bs-toggle="modal"
                         type="button"
                       )
-                        img(src="/images/red-trash-icon.svg" alt="")
+                        img(src="/images/red-trash-icon.svg" alt=t('Izbriši'))
 
       #input-row.row
         .col-sm-3
           .subject-name
-            label.input-name-txt PODPODROČJE
+            label.input-name-txt= ('PODPODROČJE')
           input#area-input.form-control(type="text")
         .col-sm-3
           .subject-name
-            label.input-name-txt ANGLEŠKI PREVOD PODPODROČJA
+            label.input-name-txt= ('ANGLEŠKI PREVOD')
           input#translation-input.form-control(type="text")
         .col.d-flex.align-items-end.mt-2
-          button#add-area.btn.btn-primary(type="submit" disabled) Dodaj
+          button#add-area.btn.btn-primary(type="submit" disabled)= ('Dodaj')
+      include /common/footer
 
       include /utilities/modal-alert
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/comments.pug

@@ -12,10 +12,11 @@ block body
   - const d = { activeLvl1: 'comments', activeLvl2: '' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Urejanje', h1: 'Komentarji', description: 'Na tem mestu so zbrani vsi komentarji, povezani s terminološkim portalom.' }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: t('Urejanje'), h1: t('Komentarji'), description: t('Na tem mestu so zbrani vsi komentarji, povezani s terminološkim portalom.') }
   +mainHeader(c)
 
-  .comments-content.col-12.col-md-12.py-md-3.bd-content.content-hold-prerequisites
+  .comments-content.col-12.col-md-12.pt-md-3.bd-content.content-hold-prerequisites
     #offset-main.main-container
       include /utilities/comments-with-pager
 

express/views/pages/admin/connections-list.pug

@@ -13,7 +13,7 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Povezave', h1: 'Povezave s portali', description: 'Svoj terminološki portal lahko povežete še z drugimi terminološkimi portali in med iskalnimi prikazujete tudi njihove zadetke.', buttons: [{ type: 'link', content: 'Dodaj povezavo', url: '/admin/povezave/nova' }] }
+  - const c = { sideMenu: true, h2: t('Povezave'), h1: t('Povezave s portali'), description: t('Svoj terminološki portal lahko povežete še z drugimi terminološkimi portali in med iskalnimi prikazujete tudi njihove zadetke.'), buttons: [{ type: 'link', content: t('Dodaj povezavo'), url: '/admin/povezave/nova' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
@@ -34,23 +34,23 @@ block body
                       data-link-id=link.id
                     )
                       img(src="/images/external-link.svg")
-                      span.ms-1 Pošlji
+                      span.ms-1= t('Pošlji')
                 hr.mt-2.mb-3
                 .d-sm-flex.justify-content-between
                   .d-sm-flex.align-items-center.mb-0
                     img(src="/images/x-circle-red.svg")
-                    span.normal-gray.ms-1 ZAVRJEN
+                    span.normal-gray.ms-1= t('ZAVRJEN')
                   .d-flex.align-content-center.mb-0.me-3.mt-2.mt-sm-0
                     a.btn.p-0.image-link(
                       type="link"
                       href=`/admin/povezava/${link.id}/urejanje`
                     )
                       img(src="/images/u_edit-alt.svg" alt="Uredi")
-                      span.normal-gray.ms-1 Uredi
+                      span.normal-gray.ms-1= t('Uredi')
                     .ms-3
                       button.p-0.btn.delete-task(data-link-id=link.id)
                         img(src="/images/red-trash-icon.svg" alt="")
-                        span.normal-gray.ms-2 Odstrani
+                        span.normal-gray.ms-2= t('Odstrani')
             else
               #synced-terms-div
                 .container-fluid.task.task-completed.p-3.mb-4(id='code' + link)
@@ -67,12 +67,12 @@ block body
                           data-link-id=link.id
                         )
                           img(src="/images/refresh-ccw.svg")
-                          span.ms-1 Sinhroniziraj
+                          span.ms-1= t('Sinhroniziraj')
                       a.ms-2.btn.btn-secondary.align-items-center.d-flex(
                         href=`/admin/povezave/seznam/${link.id}`
                       )
                         img(src="/images/book-colorized.svg")
-                        span.ms-1 Slovarji
+                        span.ms-1= t('Slovarji')
                   hr.mt-2.mb-3
                   .d-sm-flex.justify-content-between
                     .d-sm-flex.align-items-center.mb-0.form-check.form-switch.portal-enable-switch(
@@ -91,22 +91,22 @@ block body
                           name="isEnabled"
                           id='checkbox' + link.id
                         )
-                      label.normal-gray.ms-2.mt-1(for='checkbox' + link.id) Omogočeno
+                      label.normal-gray.ms-2.mt-1(for='checkbox' + link.id)= t('Omogočeno')
                     .d-flex.align-content-center.mb-0.me-3.mt-2.mt-sm-0
                       a.btn.p-0.image-link(
                         type="link"
                         href=`/admin/povezava/${link.id}/urejanje`
                       )
                         img(src="/images/u_edit-alt.svg" alt="Uredi")
-                        span.normal-gray.ms-1 Uredi
+                        span.normal-gray.ms-1= t('Uredi')
                       .ms-3
                         button.p-0.btn.delete-task(data-link-id=link.id)
                           img(src="/images/red-trash-icon.svg" alt="")
-                          span.normal-gray.ms-2 Odstrani
+                          span.normal-gray.ms-2= t('Odstrani')
         else
           .d-flex.justify-content-center.mt-5
-            p Nimate povezav za urejanje.
+            p= t('Nimate povezav za urejanje.')
+      include /common/footer
     include /utilities/modal-alert
     include /utilities/modal-response
     +responseModal
-  include /common/footer

express/views/pages/admin/dictionaries-list.pug

@@ -12,13 +12,11 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Slovarji', h1: 'Seznam slovarjev', description: 'Seznam vseh slovarjev, ki jih uredniki, sicer registrirani uporabniki, urejajo na tem portalu.', buttons: [{ type: 'link', content: 'Dodaj slovar', url: '/slovarji/nov' }] }
+  - const c = { sideMenu: true, h2: t('Slovarji'), h1: t('Seznam slovarjev'), description: t('Seznam vseh slovarjev, ki jih uredniki, sicer registrirani uporabniki, urejajo na tem portalu.'), buttons: [{ type: 'link', content: t('Dodaj slovar'), url: '/slovarji/nov' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-3
-      .d-flex.justify-content-between
-        .d-flex.flex-row.mb-4
-          include /components/search-and-filter/inline-search
+      .d-flex.justify-content-end
         .d-flex
           include /utilities/pager
           +pager
@@ -34,28 +32,34 @@ block body
       .table-responsive
         table.styled-table
           thead
-            tr
+            tr#thead
               th= 'ID'
-              th= 'NASLOV'
-              th= 'STATUS'
-              th= 'USTVARJEN'
-              th= 'SPREMENJEN'
+              th= t('NASLOV')
+              th= t('STATUS')
+              th= t('USTVARJEN')
+              th= t('SPREMENJEN')
               th= ''
           tbody#page-results 
             each result in results
               tr
-                each el in result
-                  if result.timeCreated===el || result.timeModified===el
-                    - const date = new Date(el).toLocaleDateString('sl-SL', localeOptions)
-                    td= date
-                  else
-                    td= el
+                td= result.id
+                td= result.name
+                if result.status === 'closed'
+                  td= t('zaprt')
+                else if result.status ==='reviewed'
+                  td= t('v predogledu')
+                else
+                  td= t('odprt')
+                - const dateC = new Date(result.timeCreated).toLocaleDateString('sl-SL', localeOptions)
+                - const dateM = new Date(result.timeModified).toLocaleDateString('sl-SL', localeOptions)
+                td= dateC
+                td= dateM
                 td
                   a.image-link(
                     type="link"
                     href=`/admin/slovarji/${result.id}/podatki`
                   )
-                    img(src="/images/u_edit-alt.svg" alt="Uredi")
-                    span.normal-gray.ms-1 Uredi
+                    img(src="/images/u_edit-alt.svg" alt=t('Uredi'))
+                    span.normal-gray.ms-1= t('Uredi')
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/dictionary-advanced.pug

@@ -12,7 +12,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Napredno', description: 'Napredno urejanje omogoča spreminjanje večjega števila podatkov v terminološkem slovarju.' }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Napredno'), description: t('Napredno urejanje omogoča spreminjanje večjega števila podatkov v terminološkem slovarju.') }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-3
@@ -21,44 +22,50 @@ block body
         name="dictionaryId"
         value=dictionary.id
       )
-      .row
+      .row.g-0
         .col-md-6.white-border-background.p-4.d-flex.align-items-center
-          span.info-text-for-button.me-auto Indeksiraj ...
-          button#index-entries-btn.btn.btn-primary.ps-5.pe-5.advanced-blue-btn UREDI
+          span.info-text-for-button.me-auto= t('Indeksiranje slovarja')
+          button#index-entries-btn.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('IDEKSIRAJ')
         .col-sm.align-items-center.ms-xxl-3.ms-md-3.d-flex.ps-1
-          span.name-info-txt Navodilo k posamičnemu polju.
+          span.name-info-txt= t('Tukaj lahko ponovno ideksirate slovar.')
 
       .file-type.mt-4
-        .row.mt-5
+        .row.mt-5.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Brisanje slovarskih sestavkov
-            button#adv-delete-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn BRIŠI
+            span.info-text-for-button.me-auto= t('Brisanje slovarskih sestavkov')
+            button#adv-delete-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('BRIŠI')
           .col-sm.align-items-center.ms-xxl-3.ms-md-3.d-flex.ps-1
-            span.name-info-txt Izbrišete lahko vse doslej obdelane slovarske sestavke in ohranite vse metapodatke o slovarju. Dejanja ni mogoče preklicati.
-              a.name-info-txt.ms-1(href="/pomoc") Več …
+            span.name-info-txt= t('Izbrišete lahko vse doslej obdelane slovarske sestavke in ohranite vse metapodatke o slovarju. Dejanja ni mogoče preklicati.')
+              a.name-info-txt.ms-1(
+                href="/pomoc#help-edit-dict"
+                target="_blank"
+              )= t('Več …')
       .file-type.mt-5
-        .row.mt-5
+        .row.mt-5.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Brisanje slovarja
-            button#adv-delete-dictionary.btn.btn-primary.ps-5.pe-5.advanced-blue-btn BRIŠI
+            span.info-text-for-button.me-auto= t('Brisanje slovarja')
+            button#adv-delete-dictionary.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('BRIŠI')
           .col-sm.align-items-center.ms-xxl-3.ms-md-3.d-flex.ps-1
-            span.name-info-txt Izbrišete lahko celoten slovar z vsemi metapodatki. Dejanja ni mogoče preklicati.
-              a.name-info-txt.ms-2(href="/pomoc") Več …
+            span.name-info-txt= t('Izbrišete lahko celoten slovar z vsemi metapodatki. Dejanja ni mogoče preklicati.')
+              a.name-info-txt.ms-2(
+                href="/pomoc#help-edit-dict"
+                target="_blank"
+              )= t('Več …')
       .file-type.mt-5
-        .row.mt-5
+        .row.mt-5.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Objava vseh slovarskih sestavkov
-            button#adv-publish-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn OBJAVI
+            span.info-text-for-button.me-auto= t('Objava vseh slovarskih sestavkov')
+            button#adv-publish-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('OBJAVI')
           .col-sm.align-items-center.ms-xxl-3.ms-md-3.d-flex.ps-1
-            span.name-info-txt Po koncu urejanja vseh slovarskih sestavkov lahko slovar objavite in ga tako prikažete na javnem delu terminološkega portala.
+            span.name-info-txt= t('Po koncu urejanja vseh slovarskih sestavkov lahko slovar objavite in ga tako prikažete na javnem delu terminološkega portala.')
+      include /common/footer
     include /utilities/modal-spinner
     include /utilities/modal-alert-mixin
-    +alertModal("index-entries", "Uporabi", "Prekliči", "modal-use-btn", "cancel-btn", 'Ali želite indeksirati?')
-    +alertModal("delete-entries", "Izbriši", "Prekliči", "modal-use-btn", "cancel-btn", 'S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju. Metapodatki bodo ostali. Dejanja ni mogoče razveljaviti.')
-    +alertModal("delete-dictionary", "Izbriši", "Prekliči", "modal-use-btn", "cancel-btn", 'S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju in vse metapodatke. Dejanja ni mogoče razveljaviti.')
-    +alertModal("publish-entries", "Objavi", "Prekliči", "modal-use-btn", "cancel-btn", 'Ali želite objaviti vsa gesla?')
+    +alertModal("index-entries", t("Uporabi"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('Ali želite indeksirati?'))
+    +alertModal("delete-entries", t("Izbriši"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju. Metapodatki bodo ostali. Dejanja ni mogoče razveljaviti.'))
+    +alertModal("delete-dictionary", t("Izbriši"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju in vse metapodatke. Dejanja ni mogoče razveljaviti.'))
+    +alertModal("publish-entries", t("Objavi"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('Ali želite objaviti vsa gesla?'))
     include /utilities/modal-response
-    +responseModal("delete-entries-res", "Razumem", "understand-btn", "Slovarski sestavki so bili izbrisani.")
-    +responseModal("delete-dict-res", "Razumem", "understand-btn", "Slovar je bil izbrisan.")
-    +responseModal("publish-entries-res", "Razumem", "understand-btn", "Slovarski sestavki so bili objavljeni.")
-  include /common/footer
+    +responseModal("delete-entries-res", t("Razumem"), "understand-btn", t("Slovarski sestavki so bili izbrisani."))
+    +responseModal("delete-dict-res", t("Razumem"), "understand-btn", t("Slovar je bil izbrisan."))
+    +responseModal("publish-entries-res", t("Razumem"), "understand-btn", t("Slovarski sestavki so bili objavljeni."))

express/views/pages/admin/dictionary-comments.pug

@@ -13,11 +13,12 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Komentarji', description: 'Na tem mestu so zbrani vsi komentarji, povezani z izbranim terminološkim slovarjem.' }
+  //- TODO I18n
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Komentarji'), description: t('Na tem mestu so zbrani vsi komentarji, povezani z izbranim terminološkim slovarjem.') }
   +mainHeader(c)
 
-  .comments-content.col-12.col-md-12.py-md-3.bd-content.content-hold-prerequisites
+  .comments-content.col-12.col-md-12.pt-md-3.bd-content.content-hold-prerequisites
     #offset-main.main-container
       include /utilities/comments-with-pager
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/dictionary-description.pug

@@ -12,235 +12,11 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Osnovni podatki', description: 'Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.', helpLink: { linkHref: '/pomoc', linkText: 'Več ...' }, buttons: [{ type: 'disabled', content: 'Shrani', form: 'admin-description' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Osnovni podatki'), description: t('Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.'), helpLink: { linkHref: '/pomoc#help-edit-dict', linkText: t('Več ...') }, buttons: [{ type: 'disabled', content: t('Shrani'), form: 'admin-description' }] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-1
-      .title
-        .subject-name
-          label.smaller-gray-uppercase(for="") ID Slovarja
-        .row
-          .col-sm-6
-            span.page-title-header= dictionary.id
-
-      form#admin-description.needs-validation.mt-3(method="post" novalidate)
-        .title
-          .subject-name
-            label.smaller-gray-uppercase(for="dictionary-title") NASLOV SLOVARJA *
-          .row
-            .col-sm-6
-              input#dictionary-title.name-input.form-control(
-                type="text"
-                name="nameSl"
-                required
-                maxlength="120"
-                value=dictionary.nameSl
-              )
-            .invalid-feedback Niste vpisali naslova slovarja.
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Celotni naslov slovarja, ki bo zabeležen v bibliografskih podatkih.
-
-        .english-title.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="dictionary-title-en") ANGLEŠKI NASLOV SLOVARJA *
-          .row
-            .col-sm-6
-              input#dictionary-title-en.name-input.form-control(
-                type="text"
-                name="nameEn"
-                maxlength="120"
-                value=dictionary.nameEn ? dictionary.nameEn : ''
-                required
-              )
-              .invalid-feedback Niste vpisali angleškega naslova slovarja.
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Celotni naslov slovarja v angleščini.
-
-        .short-title.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="short-dictionary-title") SKRAJŠANI NASLOV SLOVARJA
-          .row
-            .col-sm-6
-              input#short-dictionary-title.name-input.d-inline.form-control(
-                type="text"
-                name="nameSlShort"
-                maxlength="15"
-                value=dictionary.nameSlShort ? dictionary.nameSlShort : ''
-              )
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Zaradi organizacije podatkov na portalu za skrajšani naslov slovarja predlagamo poenobesede	nje, ki se bo izpisovalo ob slovarju, npr. Davčni terminološki slovar → Davki.
-        //- TODO enable field when slug is in DB
-        //- .mt-4
-        //-   .subject-name
-        //-     label.smaller-gray-uppercase(for="slug") Slug
-        //-   .row
-        //-     .col-sm-6
-        //-       input#slug.name-input.d-inline.form-control(
-        //-         type="text"
-        //-         placeholder="V razvoju ..."
-        //-         disabled
-        //-       )
-        //-     .col-sm.d-flex.align-items-center
-        //-       span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Slug
-
-        if dictionary.author
-          each ele, index in dictionary.author
-            .author.mt-4.added-field
-              .subject-name
-                label.smaller-gray-uppercase(for="author") AVTOR SLOVARJA
-              .row
-                .col-sm-6
-                  .input-group
-                    input(
-                      class=index != 0 ? 'name-input d-inline form-control icon-trash' : 'name-input d-inline form-control'
-                      type="text"
-                      name="author"
-                      maxlength="64"
-                      value=ele ? ele : ''
-                    )
-                    if (index != 0)
-                      button.input-group-text.delete-author-btn(type="button")
-                        img.delete-author.p-0(
-                          src="/images/red-trash-icon.svg"
-                          alt="Delete"
-                        )
-                .col-sm.d-flex.align-items-center
-                  span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite avtorja slovarja, če ste glavni avtor, na prvo mesto zapišite svoje ime.
-        else
-          #first-author.author.mt-4
-            .subject-name
-              label.smaller-gray-uppercase(for="author") AVTOR SLOVARJA
-            .row
-              .col-sm-6
-                input#author.name-input.d-inline.form-control(
-                  type="text"
-                  name="author"
-                  maxlength="64"
-                )
-              .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite avtorja slovarja, če ste glavni avtor, na prvo mesto zapišite svoje ime.
-
-        #add-new-author.author.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="input-new-author") NOV AVTOR
-          .row
-            .col-sm-6
-              button#input-new-author.form-control(type="button")
-                span.new-author-text-btn Nov avtor
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Dodajte ime in priimek naslednjega avtorja slovarja..
-        //- TODO enable field when weight is in DB
-        //- .mt-4
-        //-   .subject-name
-        //-     label.smaller-gray-uppercase(for="weight") TEŽA
-        //-   .row
-        //-     .col-sm-6.d-flex.align-items-center
-        //-       input#weight.name-input.form-control.autocomplete.d-inline(
-        //-         disabled
-        //-         placeholder="V razvoju ..."
-        //-       )
-
-        //-     .col-sm.d-flex.align-items-center
-        //-       span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Statična teža.
-
-        .mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="status") STATUS
-          .row
-            .col-sm-6.d-flex.align-items-center
-              select#status.name-input.form-select.d-inline(name="status")
-                option(
-                  value="closed"
-                  selected=status === 'closed' ? true : false
-                ) Zaprt
-                option(
-                  value="reviewed"
-                  selected=status === 'reviewed' ? true : false
-                  disabled=status === 'reviewed' ? false : true
-                ) V odpiranju
-                option(
-                  value="published"
-                  selected=status === 'published' ? true : false
-                ) Odprt
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Terminološkemu slovarju določite status. Izbirate lahko med zaprt, v urejanju in odprt.
-
-        .cerif-area.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="select-cerif") PODROČJE *
-          .row
-            .col-sm-6
-              select.name-input.d-inline.form-select(
-                name="domainPrimary"
-                required
-              )
-                each domain in allPrimaryDomains
-                  option(
-                    value=domain.id
-                    selected=domain.id === dictionary.domainPrimary
-                  )= domain.nameSl
-            #invalid-section.invalid-feedback-selection.hidden-section.mt-3 Nimate izbranega področja CERIF.
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Izberite področje svojega terminološkega slovarja na seznamu področij.
-
-        .small-name-area.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="domain-secondary") PODPODROČJE
-          .row
-            .col-sm-6
-              select#domain-secondary.name-input.d-inline.form-control.without-addition(
-                name="domainSecondary"
-                multiple
-              )
-                each domain in allSecondaryDomains
-                  if associatedSecondaryDomains.some(associatedDomain => associatedDomain.id === domain.id)
-                    option(value=domain.id selected)= domain.nameSl
-                  else
-                    option(value=domain.id)= domain.nameSl
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Podpodročje.
-
-        #add-new-area.author.mt-4
-          .subject-name
-            label.smaller-gray-uppercase NOVO PODPODROČJE
-          .row
-            .col-sm-6
-              button#input-new-area.form-control(type="button")
-                span.new-author-text-btn Novo podpodročje
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Vpišite novo podpodročje. Na seznamu podpodročij bo vidno takoj po potrditvi administratorja portala.
-
-          #text-editor.mt-4
-            .subject-name
-              span.smaller-gray-uppercase OPIS SLOVARJA
-            .container-xxl.ps-0.ms-0
-              textarea.summernote(
-                name="description"
-                value=dictionary.description
-              )
-                if dictionary.description
-                  p= dictionary.description
-            .col-sm-6.smaller-gray-info.mt-2
-              |
-        #issn-field.mt-4
-          .subject-name
-            label.smaller-gray-uppercase(for="issn") ISSN
-          .row
-            .col-sm-6
-              input#issn.name-input.d-inline.form-control(
-                type="text"
-                name="issn"
-                maxlength="20"
-                value=dictionary.issn ? dictionary.issn : ''
-              )
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 ISSN oznaka.
-              a.ms-1.smaller-gray-info(href="/pomoc" target="_blank") Več ...
+  include /utilities/dictionary-description-mixin
+  +dictionary-description(dictionary.id)
   include /utilities/modal-alert
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/dictionary-domain-labels.pug

@@ -12,99 +12,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Področne oznake', description: 'Na tem mestu lahko določite področne oznake, če želite posamezne termine v svojem terminološkem slovarju razvrstiti še podrobneje.', helpLink: { linkHref: '/pomoc#help-content-domains', linkText: 'Več ...' }, buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: 'Shrani' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Področne oznake'), description: t('Na tem mestu lahko določite področne oznake, če želite posamezne termine v svojem terminološkem slovarju razvrstiti še podrobneje.'), helpLink: { linkHref: '/pomoc#help-content-domains', linkText: t('Več ...') }, buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: t('Shrani') }] }
   +mainHeader(c)
-
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-2
-      if results.length
-        .d-flex.justify-content-between.mt-2
-          .d-flex.flex-row.mb-4
-            include /components/search-and-filter/inline-search
-          .d-flex
-            include /utilities/pager
-            +pager
-
-        form#dictionary-domain-labels(
-          method="post"
-          action="/api/v1/dictionaries/update-domain-labels"
-        )
-          input#subareas-dict-id(
-            type="hidden"
-            name="dictionaryId"
-            value=dictionary.id
-          )
-          table#all-areas-table.table.areas-table.table-responsive
-            thead
-              tr
-                th.visible-th(scope="col") Vidno
-                th(scope="col") Področna oznaka
-                th(scope="col") 
-            tbody#page-results
-              each result in results
-                tr
-                  input(type="hidden" name="domainLabelId" value=result.id)
-                  th(scope="row")
-                    if result.isVisible
-                      input.form-check.checkbox-table(
-                        type="checkbox"
-                        name="isVisible"
-                        checked
-                        disabled
-                      )
-                    else
-                      input.form-check.checkbox-table(
-                        type="checkbox"
-                        name="isVisible"
-                        disabled
-                      )
-                  td.tdata-area= result.name
-                  td.buttons-group
-                    .table-buttons
-                      button.p-0.table-button-grp.me-3.edit-row-btn(
-                        type="button"
-                      )
-                        img(src="/images/u_edit-alt.svg" alt="")
-                      button.p-0.table-button-grp.delete-row-btn(
-                        type="button"
-                        data-bs-target="#alert-modal"
-                        data-bs-toggle="modal"
-                      )
-                        img(src="/images/red-trash-icon.svg" alt="")
-      else
-        form#dictionary-domain-labels(
-          method="post"
-          action="/api/v1/dictionaries/update-domain-labels"
-        )
-          input#subareas-dict-id(
-            type="hidden"
-            name="dictionaryId"
-            value=dictionary.id
-          )
-          #subareas-info.d-flex.justify-content-center.mt-5
-            p Niste vnesli področnih oznak.
-          #no-subareas-section.d-none
-            .d-flex.justify-content-between.mt-4
-              .d-flex.flex-row.mb-4
-                include /components/search-and-filter/inline-search
-              .d-flex
-                include /utilities/pager
-                +pager
-
-            table#all-areas-table.table.areas-table.table-responsive
-              thead
-                tr
-                  th.visible-th(scope="col") Vidno
-                  th(scope="col") Področna oznaka
-                  th(scope="col") 
-              tbody
-                tr.hidden(hidden)
-      .row
-        .col-sm-3
-          .subject-name
-            label.input-name-txt PODROČNA OZNAKA
-          input#subarea-input.form-control(type="text")
-        .col.d-flex.align-items-end.mt-2
-          button#add-area.btn.btn-primary(type="submit" disabled) Dodaj
-    include /utilities/modal-alert
-  include /common/footer
+  include /utilities/dictionary-domain-labels-mixin
+  +dictionary-domain-labels

express/views/pages/admin/dictionary-export.pug

@@ -1,8 +1,7 @@
 extends /layout
 block pageSpecificScipts
-  script(nonce=cspNonce src="/javascripts/admin.js")
-block include-styles
-  link(rel="stylesheet" href="/stylesheets/pages/admin.css")
+  script(nonce=cspNonce src="/javascripts/dictionaries.js")
+  script(nonce=cspNonce src="/javascripts/dictionary-export.js")
 
 block body
   section#fixed-top-section
@@ -13,241 +12,9 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Izvoz', description: 'Terminološke slovarje lahko v celoti ali po izbranih kriterijih izvozite v različnih formatih in shranite na svojem računalniku.', buttons: [] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Izvoz'), description: t('Terminološke slovarje lahko v celoti ali po izbranih kriterijih izvozite v različnih formatih in shranite na svojem računalniku.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-2
-      .row.validity.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Veljavnost
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#validKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="validKeys"
-                  )
-                    | Veljavni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notValidKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notValidKeys"
-                  )
-                    | Neveljavni
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, katere slovarske sestavke želite izpisati glede na njihovo veljavnost.
-      .row.posted.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Objavljeno
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allPostedKeys.form-check-input(
-                    type="radio"
-                    name="posted"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allPostedKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyPosted.form-check-input(type="radio" name="posted")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyPosted"
-                  )
-                    | Objavljeni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notPosted.form-check-input(type="radio" name="posted")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notPosted"
-                  )
-                    | Neobjavljeni
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo objavljene ali tudi neobjavljene slovarske sestavke.
-      .row.phases.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Faze urejanja
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allEditedKeys.form-check-input(
-                    type="radio"
-                    name="edited"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allEditedKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#editedKeys.form-check-input(type="radio" name="edited")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="editedKeys"
-                  )
-                    | Urejeni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#inEditing.form-check-input(type="radio" name="edited")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="inEditing"
-                  )
-                    | V urejanju
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati vse slovarske sestavke ali samo tiste, ki so v določeni fazi urejanja.
-      .row.proffesional-check.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Strokovni pregled
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="allChecked"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyProffesionallyChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyProffesionallyChecked"
-                  )
-                    | Pregledani
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notProffesionallyChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notProffesionallyChecked"
-                  )
-                    | Nepregledani
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo strokovno pregledane slovarske sestavke.
-      .row.terminology-check.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Jezikovni pregled
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="allGramaticallyChecked"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyGramaticallyChecked"
-                  )
-                    | Pregledani
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notGramaticallyChecked"
-                  )
-                    | Nepregledani
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo jezikovno pregledane slovarske sestavke.
-      .file-type
-        span.new-user-info FORMAT ZAPISA
-        .row.align-items-center
-          .col-xxl-6.col-md-7
-            .form-check.radio-button.ms-2.ps-3
-              input#file-format-xml.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="xml"
-                checked
-              )
-              label.form-check-label.ms-0(for="file-format-xml")
-                | XML
-            .form-check.radio-button.ms-3
-              input#file-format-csv.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="csv"
-              )
-              label.form-check-label.ms-0(for="file-format-csv")
-                | CSV
-            .form-check.radio-button.ms-3
-              input#file-format-tsv.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="tsv"
-              )
-              label.form-check-label.ms-0(for="file-format-tsv")
-                | TSV
-            .form-check.radio-button.ms-3
-              input#file-format-txt.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="txt"
-              )
-              label.form-check-label.ms-0(for="file-format-txt")
-                | TXT
-          .col.mb-3.mb-md-0
-            span.name-info-txt Izberite format izpisa izbranega terminološkega slovarja.
-        button.btn.btn-primary.mt-4 IZVOZI
-        .latest-exports.mt-4
-          .d-flex.w-100.justify-content-between
-            .d-flex
-              span.info-text-for-button Zadnji izvozi
-            .d-flex
-              include /utilities/pager
-              +pager(1,2,3,1,3,true)
-          .d-block.w-100
-            include /utilities/table-mixin
-        -
-          const headerRow = ['Datum', 'Vrsta', 'Št. gesel', 'Status']
-          const dataRows = [
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', ""],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}]
-          ]
-        +tableHeader(headerRow, dataRows)
-
-  include /common/footer
+  include /utilities/dictionary-export-content-mixin
+  +dictionary-export-content(dictionary.id)
+    include /common/footer

express/views/pages/admin/dictionary-extraction-import.pug

@@ -11,56 +11,9 @@ block body
   include /common/side-menu-mixin-admin
   - const d = { activeLvl1: 'dictionaries', activeLvl2: 'extractionImport' }
   +sideNavigation(d)
-
+  //- TODO I18n
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Uvoz iz luščilnika', description: 'Rezultat luščenja so terminološki kandidati. Z uvozom rezultatov posameznega luščenja lahko dopolnite geslovnik terminološkega slovarja, ki ga urejate.', buttons: [] }
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Uvoz iz luščilnika'), description: t('Rezultat luščenja so terminološki kandidati. Z uvozom rezultatov posameznega luščenja lahko dopolnite geslovnik terminološkega slovarja, ki ga urejate.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-3
-      .small-name-area
-        .subject-name
-          span.input-name-txt IME LUŠČENJA
-        .row
-          .col-lg-6
-            select#select-extraction-name.name-input.d-inline.form-control
-              option(selected value="" disabled hidden)= 'Izberite luščenje'
-              each el in extractions
-                option(value=el.id)= el.name
-          .col-sm.d-flex.align-items-center
-            span.name-info-txt.ms-lg-3.mt-2.mt-lg-0 Izberite enega od rezultatov luščenja s seznama.
-      .list-terminology-candidates.mt-4.me-2
-        .d-flex.w-100.justify-content-between
-          .d-flex.align-items-center
-            span.info-text-for-button Seznam terminoloških kandidatov
-          .d-flex
-            include /utilities/pager
-            +pager
-        .table-responsive.mt-2.me-2
-          table.styled-table
-            thead
-              tr
-                th= '#'
-                th= 'KANONIČNA OBLIKA'
-                th= 'RANKING'
-                th= 'POGOSTOST OBJAVLJANJA'
-            tbody#page-results
-        .row.mt-4
-          .me-0.pe-0.d-flex.align-items-center
-            span.radio-button-labels Uvozi termine od številke
-            input.without-arrows.form-control.terminology-input.ms-1(
-              type="number"
-              maxlength="5"
-              name="from"
-              min="0"
-            )
-            span.radio-button-labels.ms-1 do številke
-            input.without-arrows.form-control.terminology-input.ms-1(
-              type="number"
-              maxlength="5"
-              name="to"
-              min="0"
-            )
-
-        button.btn.btn-primary.mt-4(disabled) UVOZI
-
-  include /common/footer
+  include /utilities/dictionary-extraction-import-mixin
+  +dictionary-extraction-import

express/views/pages/admin/dictionary-import.pug

@@ -1,8 +1,6 @@
 extends /layout
 block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/dictionaries.js")
-block include-styles
-  link(rel="stylesheet" href="/stylesheets/pages/admin.css")
 
 block body
   section#fixed-top-section
@@ -13,144 +11,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Uvoz iz datoteke', description: 'Slovar lahko uvozite s svojega računalnika in nadaljujete z urejanjem na terminološkem portalu.', buttons: [] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Uvoz iz datoteke'), description: t('Če imate pripravljen slovar v enem od formatov, ki so navedeni spodaj, lahko svoje podatke uvozite.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container
-      form#file-import-form.container.mt-3.ms-2.ps-0(
-        method="post"
-        enctype="multipart/form-data"
-      )
-        .file-type
-          span.new-user-info DATOTEKA
-        .row
-          .col-md-6.ms-2.white-border-background.p-4.d-flex.align-items-center.justify-content-between
-            .align-items-center.d-flex
-              span#chosen-file.info-text-for-button Izberi datoteko
-            div
-              label(for="upload") 
-                button#button-import.btn.btn-primary(type="button") IZBERI
-              input#upload(
-                type="file"
-                name="dictionaryImportFile"
-                accept=".xml"
-              )
-
-          .col-md.d-flex.align-items-center
-            span.name-info-txt Izberite slovarske podatke, ki ste jih shranili na svojem računalniku.
-        .file-type.mt-4
-          span.new-user-info NAČIN UVOZA
-          .row
-            .col-sm-6.ms-2
-              .checkbox
-                input#flexCheckDefault.form-check-input(
-                  type="checkbox"
-                  name="deleteExistingEntries"
-                )
-                label.form-check-label(for="flexCheckDefault")
-                  span.user-email Izbriši obstoječe slovarske sestavke.
-            .col
-              span.name-info-txt Če izberete to možnost, se bodo vsi doslejšnji slovarski sestavki ob uvozu nove datoteke izbrisali.
-        .file-type.mt-4
-          span.new-user-info FAZA UREJANJA
-          #file-type-selection.file-types
-            .row
-              .col-sm-6.ms-2
-                .form-check.radio-button.ms-0.ps-3
-                  input#in-edit-radio.form-check-input(
-                    type="radio"
-                    name="entryStatus"
-                    value="inEdit"
-                    checked
-                  )
-                  label.form-check-label.ms-0(for="in-edit-radio")
-                    | V urejanju
-                #complete-radio.form-check.radio-button.ms-3
-                  input#complete-radio.form-check-input(
-                    type="radio"
-                    name="entryStatus"
-                    value="complete"
-                  )
-                  label.form-check-label.ms-0(for="complete-radio")
-                    | Urejeno
-              .col 
-                span.name-info-txt Z izbiro te možnosti boste pobrisali samo slovarske sestavke, ki so v določeni fazi urejanja.
-        .file-type.mt-4
-          span.new-user-info FORMAT ZAPISA
-          #file-type-selection.file-types
-            .row
-              .col-sm-6.ms-2.text-nowrap
-                .form-check.radio-button.ms-0.ps-3
-                  input#file-format-xml.form-check-input(
-                    type="radio"
-                    name="importFileFormat"
-                    value="xml"
-                    checked
-                  )
-                  label.form-check-label.ms-0(for="file-format-xml")
-                    | XML
-                .form-check.radio-button.ms-3
-                  input#file-format-csv.form-check-input(
-                    type="radio"
-                    name="importFileFormat"
-                    value="csv"
-                  )
-                  label.form-check-label.ms-0(for="file-format-csv")
-                    | CSV
-                .form-check.radio-button.ms-3
-                  input#file-format-tsv.form-check-input(
-                    type="radio"
-                    name="importFileFormat"
-                    value="tsv"
-                  )
-                  label.form-check-label.ms-0(for="file-format-tsv")
-                    | TSV
-                .form-check.radio-button.ms-3
-                  input#file-format-txt.form-check-input(
-                    type="radio"
-                    name="importFileFormat"
-                    value="txt"
-                  )
-                  label.form-check-label.ms-0(for="file-format-txt")
-                    | TXT
-              .col
-                span.name-info-txt Izberite format datoteke, v kateri je slovar shranjen na vašem računalniku.
-      .file-type.mt-4
-        button.btn.btn-primary.mt-4 UVOZI
-        .latest-uploads.mt-4
-          .d-flex.w-100.justify-content-between
-            .d-flex
-              span.info-text-for-button Zadnji uvozi
-            .d-flex
-              include /utilities/pager
-              +pager
-
-          if imports.length
-            .table-responsive
-              table.styled-table
-                thead
-                  tr
-                    th= 'DATUM'
-                    th= 'VRSTA'
-                    th= 'ŠT. GESEL'
-                    th= 'STATUS'
-                    th= ''
-                    -
-                      const localeOptions = {
-                        day: '2-digit',
-                        month: '2-digit',
-                        year: 'numeric',
-                        hour: '2-digit',
-                        minute: '2-digit',
-                        second: '2-digit'
-                      }  
-                    each element in imports
-                      tr
-                        td= element.timeStarted.toLocaleDateString('sl-SL', localeOptions)
-                        td= element.fileFormat
-                        td= element.countValidEntries
-                        td= element.status
-          else
-            p Ni še dodanih uvozov.
-
-  include /common/footer
+  include /utilities/dictionary-import-mixin
+  +dictionary-import(dictionary.id)

express/views/pages/admin/dictionary-structure.pug

@@ -1,7 +1,7 @@
 extends /layout
 
 block pageSpecificScipts
-  script(nonce=cspNonce src="/javascripts/admin.js")
+  script(nonce=cspNonce src="/javascripts/dictionaries.js")
 
 block body
   section#fixed-top-section
@@ -12,12 +12,13 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Struktura slovarskega sestavka', description: 'V tem razdelku lahko določite elemente slovarskega sestavka. Z izbiro elementov se vam prikazuje podoba slovarskega sestavka. Izbiro lahko tudi med urejanjem vsebine kadarkoli spremenite.', helpLink: { linkHref: '/pomoc', linkText: 'Več ...' }, buttons: [{ type: 'disabled', content: 'Shrani', form: 'form-dictionary-structure' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Struktura slovarskega sestavka'), description: t('V tem razdelku lahko določite elemente slovarskega sestavka. Z izbiro elementov se vam prikazuje podoba slovarskega sestavka. Izbiro lahko tudi med urejanjem vsebine kadarkoli spremenite.'), helpLink: { linkHref: '/pomoc#help-structure-dict', linkText: t('Več ...') }, buttons: [{ type: 'disabled', content: t('Shrani'), form: 'form-dictionary-structure' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container
       form#form-dictionary-structure(method="post")
         include /utilities/dictionary-structure-input
+      include /common/footer
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/dictionary-users.pug

@@ -12,12 +12,12 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Uporabniki', description: 'V tem razdelku lahko določite fazo urejanja slovarja, dodajate uporabnike in jim določate uporabniške pravice pri urejanju slovarja.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'admin-dictionary-users' }] }
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Uporabniki'), description: t('V tem razdelku lahko določite uporabniške vloge posameznega uporabnika in urejate njegove podatke.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'admin-dictionary-users' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-1
       form#admin-dictionary-users.container-xxl.ms-0.ps-0(method="post")
-        span.users-subtitle-txt.ms-0 Faze urejanja
+        span.users-subtitle-txt.ms-0= t('Faze urejanja')
         .row.align-items-center.mt-2
           .col-sm-6
             .switch-forms-and-key-word.d-md-flex.mt-2
@@ -28,10 +28,10 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="preposition") Predlog
+                  label.form-check-label(for="preposition")= t('Predlog')
 
           .col-sm
-            span.name-info-txt V slovarju so samo terminološki kandidati. Slovarja ne morete objaviti.
+            span.name-info-txt= t('V slovarju so samo terminološki kandidati. Slovarja ne morete objaviti.')
 
         .row.align-items-center
           .col-sm-6
@@ -43,11 +43,11 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="editing") V urejanju
+                  label.form-check-label(for="editing")= t('V urejanju')
 
           .col-sm
-            span.name-info-txt Slovarski sestavek je v fazi, ko se dodajajo in oblikujejo elementi, ki ste jih izbrali v strukturi slovarskega sestavka.
-            a.ms-1.name-info-txt(href="/pomoc#help-users-dict" target="_blank") Več...
+            span.name-info-txt= t('Slovarski sestavek je v fazi, ko se dodajajo in oblikujejo elementi, ki ste jih izbrali v strukturi slovarskega sestavka.')
+            a.ms-1.name-info-txt(href="/pomoc#help-users-dict" target="_blank")= t('Več...')
 
         .row.align-items-center
           .col-sm-6
@@ -59,9 +59,9 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="edited") Urejeno
+                  label.form-check-label(for="edited")= t('Urejeno')
           .col-sm
-            span.name-info-txt Slovarski sestavek je pregledan in dokončan.
+            span.name-info-txt= t('Slovarski sestavek je pregledan in dokončan.')
 
         .row.align-items-center.mt-2
           .col-sm-6
@@ -74,16 +74,16 @@ block body
                       name="hasTerminologyReview"
                       checked
                     )
-                    label.form-check-label(for="terminology_review") Strokovno pregledano
+                    label.form-check-label(for="terminology_review")= t('Strokovno pregledano')
                 else
                   .form-check.form-switch.d-flex
                     input#terminology_review.form-check-input(
                       type="checkbox"
                       name="hasTerminologyReview"
                     )
-                    label.form-check-label(for="terminology_review") Strokovno pregledano
+                    label.form-check-label(for="terminology_review")= t('Strokovno pregledano')
           .col-sm
-            span.name-info-txt Slovar je pregledal področni strokovnjak.
+            span.name-info-txt= t('Slovar je pregledal področni strokovnjak.')
 
         .row.align-items-center.mt-2
           .col-sm-6
@@ -96,35 +96,35 @@ block body
                       name="hasLanguageReview"
                       checked
                     )
-                    label.form-check-label(for="language_review") Jezikovno pregledano
+                    label.form-check-label(for="language_review")= t('Jezikovno pregledano')
                 else
                   .form-check.form-switch.d-flex
                     input#language_review.form-check-input(
                       type="checkbox"
                       name="hasLanguageReview"
                     )
-                    label.form-check-label(for="language_review") Jezikovno pregledano
+                    label.form-check-label(for="language_review")= t('Jezikovno pregledano')
 
           .col-sm
-            span.name-info-txt Slovar je pregledal jezikoslovec.
+            span.name-info-txt= t('Slovar je pregledal jezikoslovec.')
 
         .container-xl.mt-4.ms-0.ps-0
-          span.users-subtitle-txt.ms-0.mt-3 Uporabniške pravice/vloge
+          span.users-subtitle-txt.ms-0.mt-3= t('Uporabniške pravice/vloge')
             table#user-roles-table.table-users.table-borderless.align-middle.mt-3
               thead
                 tr
                   th.col-2
-                    span.user-rights-column-title Uporabnik
+                    span.user-rights-column-title= t('Uporabnik')
                   th.col-2
-                    span.user-rights-column-title Administracija
+                    span.user-rights-column-title= t('Administracija')
                   th.col-2.text-center
-                    span.user-rights-column-title Urejanje
+                    span.user-rights-column-title= t('Urejanje')
                   th.col-2
-                    span#txt-term-rev.user-rights-column-title Strokovni pregled
+                    span#txt-term-rev.user-rights-column-title= t('Strokovni pregled')
                   th.col-2
-                    span#txt-lang-rev.user-rights-column-title Jezikovni pregled
+                    span#txt-lang-rev.user-rights-column-title= t('Jezikovni pregled')
                   th.col-1.justify-content-center
-                    span.hidden-text Izbriši polje
+                    span.hidden-text= t('Izbriši polje')
 
               if userRights
                 each el in userRights
@@ -207,7 +207,7 @@ block body
       form#form-add-user.container-xl.new-user-input.mt-4.ps-0.ms-0(
         action="/api/v1/users/addUser"
       )
-        span.new-user-info NOV UPORABNIK
+        span.new-user-info= t('NOV UPORABNIK')
         .row.d-flex.justify-content-lg-start.align-items-center.mt-2.ms-0.ps-0
           .col-lg-6.ms-0.ps-0.me-2
             input.name-input.d-inline.form-control.ms-0.ps-0(
@@ -216,13 +216,13 @@ block body
               autocomplete="off"
             )
           .col.ms-xl-4.ms-0.ps-0.d-flex.justify-content-start.mt-2.mt-lg-0
-            button.btn.btn-primary Dodaj
+            button.btn.btn-primary= t('Dodaj')
 
       - const minEntriesNum = parseInt(minEntries)
       - const countEntries = parseInt(entriesCount)
       .container-xxl.ms-0.ps-0
-        .row.align-items-center
-          .col-sm-6.mt-4
+        .row.align-items-center.mt-4
+          .col-sm-6
             .switch-forms-and-key-word.d-md-flex
               .form-check.form-switch.d-flex
                 if publishApproval === 'F'
@@ -263,20 +263,20 @@ block body
                       form="admin-dictionary-users"
                       checked
                     )
-                label.form-check-label(for="publish-switch") Slovar odprt
+                label.form-check-label(for="publish-switch")= t('Slovar odprt')
 
           .col-sm
-            span.name-info-txt Slovar je pregledal jezikoslovec.
+            span.name-info-txt= t('Slovar je odprt.')
         if dictionary.status === 'published' && countEntries < minEntriesNum
           .col-sm-6
-            span.mt-3.normal-red-note Število slovarskih sestavkov je manjše od zahtevanega števila - povečajte število slovarskih sestavkov, sicer ga skrbnik slovarjev lahko zapre
+            span.mt-3.normal-red-note= t('Število slovarskih sestavkov je manjše od zahtevanega števila - povečajte število slovarskih sestavkov, sicer ga skrbnik slovarjev lahko zapre')
         if publishApproval === 'T' && dictionary.status === 'reviewed'
           .col-sm-6
-            span.mt-3.normal-red-note Slovar je v odpiranju - čaka na potrditev skrbnika slovarjev
+            span.mt-3.normal-red-note= t('Slovar je v odpiranju - čaka na potrditev skrbnika slovarjev')
 
+      include /common/footer
     include /utilities/modal-alert
     include /utilities/modal-response
     +responseModal
   include /utilities/modal-alert-mixin
   +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer

express/views/pages/admin/new-connection.pug

@@ -12,18 +12,18 @@ block body
   - const d = { activeLvl1: 'connections', activeLvl2: 'list' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Povezave', h1: 'Povezave s portali', description: 'Vnesite podatke terminološkega portala, s katerim želite povezati svoj portal.' }
+  - const c = { sideMenu: true, h2: t('Povezave'), h1: t('Povezave s portali'), description: t('Vnesite podatke terminološkega portala, s katerim želite povezati svoj portal.') }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
       .row
         ul.col-sm-5
-          span.smaller-blue-subheading Dodaj povezavo
+          span.smaller-blue-subheading= t('Dodaj povezavo')
 
       form#form-connection-new(method="post")
         .mt-3
           .subject-name
-            label.smaller-black-uppercase(for="portal-name") IME PORTALA *
+            label.smaller-black-uppercase(for="portal-name")= t('IME PORTALA *')
           .row
             .col-sm-5
               input#portal-name.name-input.form-control.autocomplete.d-inline(
@@ -32,11 +32,11 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Vnesite polno ime terminološkega portala, s katerim se povezujete.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Vnesite polno ime terminološkega portala, s katerim se povezujete.')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="portal-label") OZNAKA PORTALA *
+            label.smaller-black-uppercase(for="portal-label")= t('OZNAKA PORTALA *')
           .row
             .col-sm-5
               input#portal-label.name-input.form-control.autocomplete.d-inline(
@@ -46,11 +46,11 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Unikatna oznaka povezanega terminološkega portala za prikaz na vašem portalu, sestavljena iz dveh črk ali črke in številke.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Unikatna oznaka povezanega terminološkega portala za prikaz na vašem portalu, sestavljena iz dveh črk ali črke in številke.')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="index-url") URL za sinhronizacijo slovarjev *
+            label.smaller-black-uppercase(for="index-url")= t('URL za sinhronizacijo slovarjev *')
           .row
             .col-sm-5
               input#index-url.name-input.form-control.autocomplete.d-inline(
@@ -59,11 +59,11 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 URL naslov terminološkega portala, s katerim želite povezati svoj portal. (API klic)
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('URL naslov terminološkega portala, s katerim želite povezati svoj portal. (API klic)')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="update-url") URL za sinhronizacijo slovarskih sestavkov *
+            label.smaller-black-uppercase(for="update-url")= t('URL za sinhronizacijo slovarskih sestavkov *')
           .row
             .col-sm-5
               input#update-url.name-input.form-control.autocomplete.d-inline(
@@ -72,16 +72,16 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 URL naslov terminološkega portala, s katerim boste sinhronizirali podatke iz terminoloških virov.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('URL naslov terminološkega portala, s katerim boste sinhronizirali podatke iz terminoloških virov.')
 
         .mt-5
           .row
             .col-sm-5
             .col-sm.d-flex.flex-column.flex-sm-row.align-items-center.justify-content-center
-              a.btn.btn-secondary.w-sm-100(href="/admin/povezave/seznam") Prekliči
+              a.btn.btn-secondary.w-sm-100(href="/admin/povezave/seznam")= t('Prekliči')
               button.create-portal-btn.btn.btn-primary.ms-sm-4.mt-2.mt-sm-0(
                 type="submit"
                 form="form-connection-new"
-              ) Dodaj povezavo
+              )= t('Dodaj povezavo')
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/portal-consultancy-settings.pug

@@ -12,7 +12,7 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Osnovne nastavitve', h1: 'Svetovalnica', description: 'Portal lahko povežete s Terminološko svetovalnico ZRC SAZU in tako prikazujete terminološke odgovore na svojem portalu, lahko pa vklopite lastno svetovalnico. V tem primeru morate med registriranimi uporabniki izbrati svetovalce in urednika svetovalnice, ki  bodo odgovarjali na terminološka vprašanja uporabnikov.', buttons: [{ form: 'admin-settings-consult', type: 'disabled', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Osnovne nastavitve'), h1: t('Svetovalnica'), description: t('Portal lahko povežete s Terminološko svetovalnico ZRC SAZU in tako prikazujete terminološke odgovore na svojem portalu, lahko pa vklopite lastno svetovalnico. V tem primeru morate med registriranimi uporabniki izbrati svetovalce in urednika svetovalnice, ki  bodo odgovarjali na terminološka vprašanja uporabnikov.'), buttons: [{ form: 'admin-settings-consult', type: 'disabled', content: t('Shrani') }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
@@ -26,14 +26,14 @@ block body
                 value="own"
                 checked
               )
-              label.normal-gray.ms-2(for="own-consultancy") Lastna svetovalnica
+              label.normal-gray.ms-2(for="own-consultancy")= t('Lastna svetovalnica')
             .mt-3
               input#zrc-consultancy.form-check-input(
                 type="radio"
                 name="consultancyType"
                 value="ZRC"
               )
-              label.normal-gray.ms-2(for="zrc-consultancy") Terminološka svetovalnica ZRC SAZU
+              label.normal-gray.ms-2(for="zrc-consultancy")= t('Terminološka svetovalnica ZRC SAZU')
           else
             .button-type
               input#own-consultancy.form-check-input(
@@ -41,7 +41,7 @@ block body
                 name="consultancyType"
                 value="own"
               )
-              label.normal-gray.ms-2(for="own-consultancy") Lastna svetovalnica
+              label.normal-gray.ms-2(for="own-consultancy")= t('Lastna svetovalnica')
             .mt-3
               input#zrc-consultancy.form-check-input(
                 type="radio"
@@ -49,11 +49,11 @@ block body
                 value="ZRC"
                 checked
               )
-              label.normal-gray.ms-2(for="zrc-consultancy") Terminološka svetovalnica ZRC SAZU
+              label.normal-gray.ms-2(for="zrc-consultancy")= t('Terminološka svetovalnica ZRC SAZU')
 
         .mt-4
           .subject-name
-            label.smaller-black-uppercase(for="zrc-email") E-NASLOV
+            label.smaller-black-uppercase(for="zrc-email")= t('E-NASLOV')
           .row
             .col-sm-5
               input#zrc-email.name-input.form-control.autocomplete.d-inline(
@@ -62,11 +62,11 @@ block body
                 value=consultancy.zrcEmail
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Vnesite e-naslov, ki ga za obveščanje o novih terminoloških vprašanjih uporabljajo terminološki svetovalci.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Vnesite e-naslov, ki ga za obveščanje o novih terminoloških vprašanjih uporabljajo terminološki svetovalci.')
 
         .mt-3
           .subject-name
-            label.smaller-black-uppercase(for="zrc-url") POVEZAVA
+            label.smaller-black-uppercase(for="zrc-url")= t('POVEZAVA')
           .row
             .col-sm-5
               input#zrc-url.name-input.form-control.autocomplete.d-inline(
@@ -75,7 +75,7 @@ block body
                 value=consultancy.zrcURL
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Vnesite naslov spletnega mesta, kjer so zbrani vsi odgovori terminološke svetovalnice.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Vnesite naslov spletnega mesta, kjer so zbrani vsi odgovori terminološke svetovalnice.')
+      include /common/footer
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/portal-edit.pug

@@ -11,18 +11,18 @@ block body
   - const d = { activeLvl1: 'connections', activeLvl2: 'list' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Povezave', h1: 'Povezave s portali', description: 'Vnesite podatke terminološkega portala, s katerim želite povezati svoj portal.' }
+  - const c = { sideMenu: true, h2: t('Povezave'), h1: t('Povezave s portali'), description: t('Vnesite podatke terminološkega portala, s katerim želite povezati svoj portal.') }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
       .row
         ul.col-sm-5
-          span.smaller-blue-subheading Uredi povezavo
+          span.smaller-blue-subheading= t('Uredi povezavo')
 
       form#form-connection-update(method="post")
         .mt-3
           .subject-name
-            label.smaller-black-uppercase(for="portal-name") IME PORTALA *
+            label.smaller-black-uppercase(for="portal-name")= t('IME PORTALA *')
           .row
             .col-sm-5
               input#portal-name.name-input.form-control.autocomplete.d-inline(
@@ -32,11 +32,11 @@ block body
                 value=portal.name
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Ime terminološkega portala ... (potrebujem text)
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Vnesite polno ime terminološkega portala, s katerim se povezujete.')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="portal-label") OZNAKA PORTALA *
+            label.smaller-black-uppercase(for="portal-label")= t('OZNAKA PORTALA *')
           .row
             .col-sm-5
               input#portal-label.name-input.form-control.autocomplete.d-inline(
@@ -47,11 +47,11 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Unikatna dvočrkovna oznaka povezanega terminološkega portala za prikaz na tem portalu.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Unikatna oznaka povezanega terminološkega portala za prikaz na vašem portalu, sestavljena iz dveh črk ali črke in številke.')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="index-url") URL za sinhronizacijo slovarjev *
+            label.smaller-black-uppercase(for="index-url")= t('URL za sinhronizacijo slovarjev *')
           .row
             .col-sm-5
               input#index-url.name-input.form-control.autocomplete.d-inline(
@@ -61,11 +61,11 @@ block body
                 value=portal.indexURL
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 URL naslov terminološkega portala, s katerim želimo povezati svoj portal. (API klic)
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('URL naslov terminološkega portala, s katerim želimo povezati svoj portal. (API klic)')
 
         .mt-5
           .subject-name
-            label.smaller-black-uppercase(for="update-url") URL za sinhronizacijo slovarskih sestavkov *
+            label.smaller-black-uppercase(for="update-url")= t('URL za sinhronizacijo slovarskih sestavkov *')
           .row
             .col-sm-5
               input#update-url.name-input.form-control.autocomplete.d-inline(
@@ -75,16 +75,16 @@ block body
                 value=portal.URLupdate
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 URL naslov terminološkega portala, s katerim želimo povezati svoj portal.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('URL naslov terminološkega portala, s katerim želimo povezati svoj portal.')
 
         .mt-5
           .row
             .col-sm-5
             .col-sm.d-flex.flex-column.flex-sm-row.align-items-center.justify-content-center
-              a.btn.btn-secondary.w-sm-100(href="/admin/povezave/seznam") Prekliči
+              a.btn.btn-secondary.w-sm-100(href="/admin/povezave/seznam")= t('Prekliči')
               button.btn.btn-primary.ms-sm-4.mt-2.mt-sm-0(
                 type="submit"
                 form="form-connection-update"
-              ) Shrani spremembe
+              )= t('Shrani')
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/portal-list-dict.pug

@@ -12,13 +12,11 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Povezave', h1: 'Povezani slovarji', description: 'Seznam slovarjev s povezanega portala.', buttons: [{ type: 'button', form: 'all-linked-dictionaries', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Povezave'), h1: t('Povezani slovarji'), description: t('Seznam slovarjev s povezanega portala.'), buttons: [{ type: 'button', form: 'all-linked-dictionaries', content: t('Shrani') }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container
-      .d-flex.justify-content-between
-        .d-flex.flex-row.mb-4
-          include /components/search-and-filter/inline-search
+      .d-flex.justify-content-end
         .d-flex.me-3
           include /utilities/pager
           +pager
@@ -27,10 +25,10 @@ block body
         .table-responsive
           table.styled-table
             thead
-              tr
+              tr#thead
                 th= ''
-                th= 'Naslov'
-                th= 'Oznaka portala'
+                th= t('Naslov')
+                th= t('Oznaka portala')
             tbody#page-results 
               if results.length
                 each result in results
@@ -48,6 +46,6 @@ block body
                       if result.code
                         td= result.code
               else
-                p Ni še povezanih portalov
+                p= ('Ni še povezanih portalov')
 
   include /common/footer

express/views/pages/admin/portal.pug

@@ -11,7 +11,7 @@ block body
   - const d = { activeLvl1: 'settings', activeLvl2: 'portals' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Osnovne nastavitve', h1: 'Portal', description: 'Administratorski del portala je namenjen skupini oseb, ki vsebinsko in tehnično ureja portal, odpira slovarske vire, daje pooblastila posameznim uporabnikom in skrbi za vsebinsko in tehnično urejenost portala. Izberite module, ki jih boste ponudili na terminološkem portalu in na kratko opišite, kaj ponuja vaš portal.', buttons: [{ type: 'disabled', form: 'admin-portal-settings', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Osnovne nastavitve'), h1: t('Portal'), description: t('Administratorski del portala je namenjen skupini oseb, ki vsebinsko in tehnično ureja portal, odpira slovarske vire, daje pooblastila posameznim uporabnikom in skrbi za vsebinsko in tehnično urejenost portala. Izberite module, ki jih boste ponudili na terminološkem portalu in na kratko opišite, kaj ponuja vaš portal.'), buttons: [{ type: 'disabled', form: 'admin-portal-settings', content: t('Shrani') }] }
   +mainHeader(c)
 
   .content-hold-prerequisites
@@ -19,20 +19,33 @@ block body
       form#admin-portal-settings(method="post")
         .port-name
           .subject-name
-            label.smaller-black-uppercase(for="portal-name") IME PORTALA
+            label.smaller-black-uppercase(for="portal-name-sl")= t('IME PORTALA')
           .row
             .col-sm-5
-              input#portal-name.name-input.form-control.autocomplete.d-inline(
+              input#portal-name-sl.name-input.form-control.autocomplete.d-inline(
                 type="text"
-                name="portalName"
-                value=portal.name
+                name="portalNameSl"
+                value=portal.nameSl
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Polno ime terminološkega portala.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Polno ime terminološkega portala.')
 
         .mt-3
           .subject-name
-            label.smaller-black-uppercase(for="dictionary-label") OZNAKA PORTALA *
+            label.smaller-black-uppercase(for="portal-name-en")= t('ANGLEŠKO IME PORTALA')
+          .row
+            .col-sm-5
+              input#portal-name-en.name-input.form-control.autocomplete.d-inline(
+                type="text"
+                name="portalNameEn"
+                value=portal.nameEn
+              )
+            .col-sm.d-flex.align-items-center
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Angleško ime terminološkega portala.')
+
+        .mt-3
+          .subject-name
+            label.smaller-black-uppercase(for="dictionary-label")= t('OZNAKA PORTALA *')
           .row
             .col-sm-5
               input#dictionary-label.name-input.form-control.autocomplete.d-inline.w-25(
@@ -43,21 +56,31 @@ block body
                 required
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Dvočrkovna oznaka terminološkega portala.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Dvočrkovna oznaka terminološkega portala.')
 
         #text-editor.mt-sm-3
         .subject-name
-          span.smaller-black-uppercase OPIS PORTALA
+          span.smaller-black-uppercase= t('OPIS PORTALA')
         div
           textarea.summernote(
-            name="portalDescription"
-            value=portal.description
+            name="portalDescriptionSl"
+            value=portal.descriptionSl
           )
-            p= portal.description
+            p= portal.descriptionSl
+
+        //- TODO: render values once eng columns are added in db
+        .subject-name.mt-3
+          span.smaller-black-uppercase= t('ANGLEŠKI OPIS PORTALA')
+        div
+          textarea.summernote(
+            name="portalDescriptionEn"
+            value=portal.descriptionEn
+          )
+            p= portal.descriptionEn
 
         .moduls.mt-3
           .subject-name
-            label.smaller-black-uppercase(for="dictionary-label") MODULI
+            label.smaller-black-uppercase(for="dictionary-label")= t('MODULI')
           .d-grid
             .ms-1.d-sm-flex.mt-2.row
               .form-check.form-switch.d-flex.align-items-center.col-sm-5
@@ -73,9 +96,9 @@ block body
                       type="checkbox"
                       name="isExtractionEnabled"
                     )
-                label.form-check-label.normal-gray-label(for="extraction") Luščenje
+                label.form-check-label.normal-gray-label(for="extraction")= t('Luščenje')
               .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.smaller-gray-info Modul za luščenje terminoloških kandidatov iz besedil.
+                span.d-md-inline.d-block.smaller-gray-info= t('Modul za luščenje terminoloških kandidatov iz besedil.')
 
             .ms-1.d-sm-flex.mt-4.row
               .form-check.form-switch.d-flex.align-items-center.col-sm-5
@@ -91,9 +114,9 @@ block body
                       type="checkbox"
                       name="isDictionariesEnabled"
                     )
-                label.form-check-label.normal-gray-label(for="edit") Urejanje
+                label.form-check-label.normal-gray-label(for="edit")= t('Urejanje')
               .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.smaller-gray-info Modul za urejanje terminoloških slovarjev.
+                span.d-md-inline.d-block.smaller-gray-info= t('Modul za urejanje terminoloških slovarjev.')
 
             .ms-1.d-sm-flex.mt-4.row
               .form-check.form-switch.d-flex.align-items-center.col-sm-5
@@ -109,9 +132,9 @@ block body
                       type="checkbox"
                       name="isConsultancyEnabled"
                     )
-                label.form-check-label.normal-gray-label(for="consulting") Svetovanje
+                label.form-check-label.normal-gray-label(for="consulting")= t('Svetovanje')
               .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.smaller-gray-info Modul za svetovanje pri terminoloških zagatah.
+                span.d-md-inline.d-block.smaller-gray-info= t('Modul za svetovanje pri terminoloških zagatah.')
+      include /common/footer
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/portals-all-linked-dictionaries.pug

@@ -13,14 +13,12 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Povezave', h1: 'Vsi povezani slovarji', description: 'Poiščite naslove terminoloških slovarjev, s katerimi želite dopolniti iskalne zadetke na svojem portalu. Lahko izberete vse slovarje ali le nekatere. Svoje izbire morate shraniti. Vse vaše izbire mora potrditi administrator povezanega portala.', buttons: [{ type: 'button', form: 'all-linked-dictionaries', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Povezave'), h1: t('Vsi povezani slovarji'), description: t('Poiščite naslove terminoloških slovarjev, s katerimi želite dopolniti iskalne zadetke na svojem portalu. Lahko izberete vse slovarje ali le nekatere. Svoje izbire morate shraniti. Vse vaše izbire mora potrditi administrator povezanega portala.'), buttons: [{ type: 'button', form: 'all-linked-dictionaries', content: t('Shrani') }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
       if results.length
-        .d-flex.justify-content-between
-          .d-flex.flex-row.mb-4
-            include /components/search-and-filter/inline-search
+        .d-flex.justify-content-end
           .d-flex.me-3
             include /utilities/pager
             +pager
@@ -29,10 +27,10 @@ block body
           .table-responsive
             table.styled-table
               thead
-                tr
+                tr#thead
                   th= ''
-                  th= 'Naslov'
-                  th= 'Oznaka portala'
+                  th= t('Naslov')
+                  th= t('Oznaka portala')
                   th= ''
               tbody#page-results
                 each result in results
@@ -51,6 +49,6 @@ block body
                         td= result.code
       else
         .d-flex.justify-content-center
-          p Ni še povezanih portalov
+          p= t('Ni še povezanih portalov')
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/settings-dictionaries.pug

@@ -12,14 +12,14 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Osnovne nastavitve', h1: 'Slovarji', description: 'Določite lastnosti terminoloških virov na portalu, zlasti minimalno število sestavkov, ki so pogoj za objavo, možnosti potrjevanja objave novih slovarjev, število različic slovarja, ki jih lahko hrani posamezni uporabnik. Te nastavitve veljajo za vse terminološke vire na portalu.', buttons: [{ form: 'admin-settings-dict', type: 'disabled', content: 'Shrani' }] }
+  - const c = { sideMenu: true, h2: t('Osnovne nastavitve'), h1: t('Slovarji'), description: t('Določite lastnosti terminoloških virov na portalu, zlasti minimalno število sestavkov, ki so pogoj za objavo, možnosti potrjevanja objave novih slovarjev, število različic slovarja, ki jih lahko hrani posamezni uporabnik. Te nastavitve veljajo za vse terminološke vire na portalu.'), buttons: [{ form: 'admin-settings-dict', type: 'disabled', content: t('Shrani') }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
       form#admin-settings-dict(method="post") 
         .min-composition
           .subject-name
-            label.smaller-black-uppercase(for="min-composition") MINIMALNO ŠTEVILO SLOVARSKIH SESTAVKOV
+            label.smaller-black-uppercase(for="min-composition")= t('MINIMALNO ŠTEVILO SLOVARSKIH SESTAVKOV')
           .row
             .col-sm-5
               select#min-composition.name-input.form-control.autocomplete.d-inline.w-25(
@@ -43,11 +43,11 @@ block body
                   selected=dictionary.minEntriesPerDictionary === '100'
                 ) 100
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Število slovarskih sestavkov, ki jih mora vsebovati slovar, da je omogočena objava slovarja na portalu.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Število slovarskih sestavkov, ki jih mora vsebovati slovar, da je omogočena objava slovarja na portalu.')
 
         .mt-4
           .subject-name
-            label.smaller-black-uppercase(for="publish-control") KONTROLA OBJAVE
+            label.smaller-black-uppercase(for="publish-control")= t('KONTROLA OBJAVE')
           .ms-1.row
             .form-check.form-switch.d-flex.align-items-center.col-sm-5
               if dictionary.dictionaryPublishApproval
@@ -64,50 +64,13 @@ block body
                   )
               label.form-check-label.normal-gray-label.ms-3(
                 for="publish-control"
-              ) Kontrola objave
+              )= t('Kontrola objave')
             .col-sm.d-flex.align-items-center.ps-0
-              span.smaller-gray-info.ms-xxl-3.ms-md-3 Za prvo objavo slovarja je potrebno dovoljenje skrbnika slovarjev.
-
-        //- .mt-4
-        //-   .subject-name
-        //-     label.smaller-black-uppercase(for="max-copy-count") MAKSIMALNO ŠTEVILO KOPIJ SLOVARJEV
-        //-   .row
-        //-     .col-sm-5
-        //-       input#max-copy-count.name-input.form-control.autocomplete.d-inline.w-25(
-        //-         type="text"
-        //-         maxlength="6"
-        //-         name="keepNumOfExportsPerDict"
-        //-         value=dictionary.keepNumOfExportsPerDict
-        //-       )
-        //-     .col-sm.d-flex.align-items-center
-        //-       span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Število zadnjih kopij spremenjenih slovarjev, ki se hranijo. Če vrednost ni določena, omejitve ni.
-
-        //- .mt-4
-        //-   .subject-name
-        //-     label.smaller-black-uppercase(for="autosave") SAMODEJNO SHRANJEVANJE
-        //-   .row
-        //-     .col-sm-5
-        //-       select#autosave.name-input.form-select.autocomplete.d-inline.w-50(
-        //-         name="dictionaryAutoSaveFrequency"
-        //-       )
-        //-         if dictionary.dictionaryAutoSaveFrequency === 'disabled'
-        //-           option(selected value="disabled") Onemogočeno
-        //-           option(value="monthly") Mesečno
-        //-           option(value="yearly") Letno
-        //-         if dictionary.dictionaryAutoSaveFrequency === 'monthly'
-        //-           option(selected value="monthly") Mesečno
-        //-           option(value="disabled") Onemogočeno
-        //-           option(value="yearly") Letno
-        //-         if dictionary.dictionaryAutoSaveFrequency === 'yearly'
-        //-           option(selected value="yearly") Letno
-        //-           option(value="disabled") Onemogočeno
-        //-           option(value="monthly") Mesečno
-        //-     .col-sm.d-flex.align-items-center
-        //-       span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Časovno obdobje, v katerem se slovar samodejno shranjuje.
+              span.smaller-gray-info.ms-xxl-3.ms-md-3= t('Za prvo objavo slovarja je potrebno dovoljenje skrbnika slovarjev.')
 
         .mt-4
           .subject-name
-            label.smaller-black-uppercase(for="max-composition-count") MAKSIMALNO ŠTEVILO KOPIJ SLOVARSKIH SESTAVKOV
+            label.smaller-black-uppercase(for="max-composition-count")= t('MAKSIMALNO ŠTEVILO KOPIJ SLOVARSKIH SESTAVKOV')
           .row
             .col-sm-5
               input#max-composition-count.name-input.form-control.autocomplete.d-inline.w-25(
@@ -117,12 +80,12 @@ block body
                 value=dictionary.numOfHistoryEntriesPerEntry
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Število zadnjih kopij spremenjenih slovarskih sestavkov, ki se hranijo. Če vrednost ni določena, omejitve ni.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Število zadnjih kopij spremenjenih slovarskih sestavkov, ki se hranijo. Če vrednost ni določena, omejitve ni.')
 
         .mt-4
           .row
             .subject-name.col-sm-5
-              label.smaller-black-uppercase MOŽNOST OBJAVE SLOVARSKEGA SESTAVKA MED UREJANJEM
+              label.smaller-black-uppercase= t('MOŽNOST OBJAVE SLOVARSKEGA SESTAVKA MED UREJANJEM')
           .d-grid
             .ms-1.d-sm-flex.row
               .form-check.form-switch.d-flex.align-items-center.col-sm-5
@@ -133,75 +96,15 @@ block body
                       name="canPublishEntriesInEdit"
                       checked
                     )
-                    label.form-check-label.normal-gray-label(for="in-editing") Objava med urejanjem
+                    label.form-check-label.normal-gray-label(for="in-editing")= t('Objava med urejanjem')
                   else
                     input#in-editing.form-check-input(
                       type="checkbox"
                       name="canPublishEntriesInEdit"
                     )
-                    label.form-check-label.normal-gray-label(for="in-editing") Objava med urejanjem
+                    label.form-check-label.normal-gray-label(for="in-editing")= t('Objava med urejanjem')
               .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.smaller-gray-info.ms-md-2 Poleg objave slovarskega sestavka v fazi "Urejeno" je omogočena tudi objava v fazi "V urejanju".
-              //- .ms-1.d-sm-flex.mt-2.row
-          //-     .form-check.form-switch.d-flex.align-items-center.col-sm-2
-          //-       input#suggestion.form-check-input(
-          //-         type="checkbox"
-          //-         disabled
-          //-         checked
-          //-       )
-          //-       label.form-check-label.normal-gray-label(for="suggestion") Predlog
-          //-     .col-sm.d-flex.align-items-center
-            //- span.d-md-inline.d-block.smaller-gray-info Modul za luščenje terminoloških kandidatov iz besedil.
-              //- span.d-md-inline.d-block.smaller-gray-info Modul za urejanje terminoloških slovarjev.
-
-            //- .ms-1.d-sm-flex.mt-4.row
-            //-   .form-check.form-switch.d-flex.align-items-center.col-sm-2
-            //-     if dictionary.enabledTerminologyReview
-            //-       if dictionary.enabledTerminologyReview === 'T'
-            //-         input#pro-checked.form-check-input(
-            //-           type="checkbox"
-            //-           checked
-            //-           name="enabledTerminologyReview"
-            //-         )
-            //-       else
-            //-         input#pro-checked.form-check-input(
-            //-           type="checkbox"
-            //-           name="enabledTerminologyReview"
-            //-         )
-            //-     label.form-check-label.normal-gray-label(for="pro-checked") Strokovno pregledano
-            //-   .col-sm.d-flex.align-items-center
-              //- span.d-md-inline.d-block.smaller-gray-info Modul za urejanje terminoloških slovarjev.
-
-            //- .ms-1.d-sm-flex.mt-4.row
-            //-   .form-check.form-switch.d-flex.align-items-center.col-sm-2
-            //-     if dictionary.enabledLanguageReview
-            //-       if dictionary.enabledLanguageReview === 'T'
-            //-         input#linguistically-checked.form-check-input(
-            //-           type="checkbox"
-            //-           checked
-            //-           name="enabledLanguageReview"
-            //-         )
-            //-       else
-            //-         input#linguistically-checked.form-check-input(
-            //-           type="checkbox"
-            //-           name="enabledLanguageReview"
-            //-         )
-            //-     label.form-check-label.normal-gray-label(
-            //-       for="linguistically-checked"
-            //-     ) Jezikovno pregledano
-            //-   .col-sm.d-flex.align-items-center
-              //- span.d-md-inline.d-block.smaller-gray-info Modul za urejanje terminoloških slovarjev.
-
-            //- .ms-1.d-sm-flex.mt-4.row
-            //-   .form-check.form-switch.d-flex.align-items-center.col-sm-2
-            //-     input#consulting.form-check-input(
-            //-       type="checkbox"
-            //-       checked
-            //-       disabled
-            //-     )
-            //-     label.form-check-label.normal-gray-label(for="consulting") Urejeno
-            //-   .col-sm.d-flex.align-items-center
-              //- span.d-md-inline.d-block.smaller-gray-info Modul za svetovanje pri terminoloških zagatah.
+                span.d-md-inline.d-block.smaller-gray-info.ms-md-2= t('Poleg objave slovarskega sestavka v fazi "Urejeno" je omogočena tudi objava v fazi "V urejanju".')
+      include /common/footer
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/admin/user-edit.pug

@@ -10,7 +10,7 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: false, h2: userData.firstName + ' ' + userData.lastName, h1: 'Uporabniki', description: 'V tem razdelku lahko določite fazo urejanja slovarja, dodajate uporabnike in jim določate uporabniške pravice pri urejanju slovarja.', buttons: [{ type: 'cancel', content: 'Prekliči', url:"/admin/uporabniki/seznam", classAtr: "btn btn-secondary header-btn-secondary small-header-btn"}, { type: 'disabled', content: 'Shrani', form: 'form-edit-user' }] }
+  - const c = { sideMenu: false, h2: userData.firstName + ' ' + userData.lastName, h1: t('Uporabniki'), description: t('V tem razdelku lahko določite uporabniške vloge posameznega uporabnika in urejate njegove podatke.'), buttons: [{ type: 'cancel', content: t('Prekliči'), url:"/admin/uporabniki/seznam", classAtr: "btn btn-secondary header-btn-secondary small-header-btn"}, { type: 'disabled', content: t('Shrani'), form: 'form-edit-user' }] }
   +mainHeader(c)
   .content-hold-prerequisites.mt-4
     #offset-main
@@ -24,7 +24,7 @@ block body
       form#form-edit-user.needs-validation(method="post" novalidate)
         .mt-2
           .subject-name
-            label.smaller-black-uppercase(for="user-name") Uporabniško ime
+            label.smaller-black-uppercase(for="user-name")= t('Uporabniško ime')
           .row
             .col-sm-5
               input#user-name.name-input.form-control(
@@ -33,11 +33,11 @@ block body
                 name="username"
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Ime, s katerim se uporabnik predstavlja na terminološkem portalu.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Ime, s katerim se uporabnik predstavlja na terminološkem portalu.')
 
         .mt-2
           .subject-name
-            label.smaller-black-uppercase(for="user-fname") Ime
+            label.smaller-black-uppercase(for="user-fname")= t('Ime')
           .row
             .col-sm-5
               input#user-fname.name-input.form-control(
@@ -46,11 +46,11 @@ block body
                 name="firstName"
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Ime registriranega uporabnika.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Ime registriranega uporabnika.')
 
         .mt-2
           .subject-name
-            label.smaller-black-uppercase(for="user-lastname") Priimek
+            label.smaller-black-uppercase(for="user-lastname")= t('Priimek')
           .row
             .col-sm-5
               input#user-lastname.name-input.form-control(
@@ -59,11 +59,11 @@ block body
                 name="lastName"
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Priimek registriranega uporabnika.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Priimek registriranega uporabnika.')
 
         .mt-2
           .subject-name
-            label.smaller-black-uppercase(for="user-mail") E-naslov
+            label.smaller-black-uppercase(for="user-mail")= t('E-naslov')
           .row
             .col-sm-5
               input#user-mail.name-input.form-control(
@@ -72,7 +72,7 @@ block body
                 name="email"
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Veljavni elektronski naslov uporabnika, na katerega uporabnik prejema sporočila, povezana s portalom.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Veljavni elektronski naslov uporabnika, na katerega uporabnik prejema sporočila, povezana s portalom.')
 
         //- .mt-2
         //-   .subject-name
@@ -101,45 +101,45 @@ block body
 
         .mt-2.mb-4
           .subject-name
-            label.smaller-black-uppercase(for="user-is-confirmed") Potrjen
+            label.smaller-black-uppercase(for="user-is-confirmed")= t('Potrjen')
           .row
             .col-sm-5
               input#user-is-confirmed.form-check-input(
                 type="checkbox"
-                value=""
-                name="isUserConfirmed"
+                name="status"
+                checked=userData.status === 'active'
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Registracija uporabnika je potrjena.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Registracija uporabnika je potrjena.')
 
         .d-flex.justify-content-between.container-xl.ps-0.ms-0.mt-4.mb-4
           button#edit-user-remove.btn.btn-secondary(type="button") 
             img.me-2(src="/images/red-trash-icon.svg" alt="Delete")
-            | Briši uporabnika
-        span.users-subtitle-txt Uporabniške vloge
+            = t('Briši uporabnika')
+        span.users-subtitle-txt= t('Uporabniške vloge')
         if userRoles
           .container-xl.ps-0.ms-0.mt-3
             table.styled-table-left-header
               thead
                 if userRoles.roles.isPortalAdmin
                   tr
-                    th.table-left-header= 'Skrbnik portala'
+                    th.table-left-header= t('Skrbnik portala')
                       td= ''
                 if userRoles.roles.isDictionariesAdmin
                   tr
-                    th.table-left-header= 'Skrbnik slovarjev'
+                    th.table-left-header= t('Skrbnik slovarjev')
                       td= ''
                 if userRoles.roles.isConsultancyAdmin
                   tr
-                    th.table-left-header= 'Skrbnik svetovalnice'
+                    th.table-left-header= t('Skrbnik svetovalnice')
                       td= ''
                 if userRoles.roles.isConsultant
                   tr
-                    th.table-left-header= 'Svetovalec'
+                    th.table-left-header= t('Svetovalec')
                       td= ''
                 if userRoles.roles.isEditor
                   tr
-                    th.table-left-header= 'Urednik slovarja'
+                    th.table-left-header= t('Urednik slovarja')
                       td= ''
 
   include /common/footer

express/views/pages/admin/user-list.pug

@@ -13,14 +13,12 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Uporabniki', h1: 'Seznam', description: 'Na seznamu uporabnikov lahko določite posameznemu uporabniku dodatne vloge ali urejate njihove podatke.' }
+  - const c = { sideMenu: true, h2: t('Uporabniki'), h1: t('Seznam'), description: t('Na seznamu uporabnikov lahko določite posameznemu uporabniku dodatne vloge ali urejate njihove podatke.') }
   +mainHeader(c)
   .content-hold-prerequisites.mt-4
     #offset-main.main-container.mt-4
       .table-full
-        .d-flex.w-100.justify-content-between.mb-4
-          .d-flex
-            include /components/search-and-filter/inline-search
+        .d-flex.w-100.justify-content-end.mb-4
           .d-flex
             include /utilities/pager
             +pager
@@ -28,10 +26,10 @@ block body
         .table-responsive
           table.styled-table
             thead
-              tr
-                th= 'Uporabniško ime'
-                th= 'E - naslov'
-                th= 'Potrjen'
+              tr#thead
+                th= t('Uporabniško ime')
+                th= t('E - naslov')
+                th= t('Potrjen')
                 th= ''
             tbody#page-results
               each result in results
@@ -44,7 +42,7 @@ block body
                       type="link"
                       href=`/admin/uporabniki/${result.id}/urejanje`
                     )
-                      img(src="/images/u_edit-alt.svg" alt="Uredi")
-                      span.normal-gray.ms-1 Uredi
+                      img(src="/images/u_edit-alt.svg" alt=t('Uredi'))
+                      span.normal-gray.ms-1= t('Uredi')
 
-  include /common/footer
+      include /common/footer

express/views/pages/admin/user-portals.pug

@@ -12,26 +12,26 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: 'Uporabniki', h1: 'Portal', description: 'V tem razdelku lahko določite glavne administratorske pravice na terminološkem portalu.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'form-user-roles' }] }
+  - const c = { sideMenu: true, h2: t('Uporabniki'), h1: t('Portal'), description: t('V tem razdelku lahko določite glavne administratorske pravice na terminološkem portalu.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'form-user-roles' }] }
   +mainHeader(c)
 
   .content-hold-prerequisites.mt-4
     #offset-main.main-container.mt-1
-      span.users-subtitle-txt.ms-0.mt-3 Uporabniške pravice/vloge
+      span.users-subtitle-txt.ms-0.mt-3= t('Uporabniške pravice/vloge')
       form#form-user-roles(method="post")
         table#user-roles-table.table-users.table-borderless.align-middle.mt-3
           thead
             tr
               th.col-2
-                span.user-rights-column-title Uporabnik
+                span.user-rights-column-title= t('Uporabnik')
               th.col-2
-                span.user-rights-column-title Skrbnik portala
+                span.user-rights-column-title= t('Skrbnik portala')
               th.col-2
-                span.user-rights-column-title.ms-xxl-4 Skrbnik slovarjev
+                span.user-rights-column-title.ms-xxl-4= t('Skrbnik slovarjev')
               th.col-2
-                span.user-rights-column-title.ms-xxl-4 Skrbnik svetovalnice
+                span.user-rights-column-title.ms-xxl-4= t('Skrbnik svetovalnice')
               th.col-1.justify-content-center
-                span.hidden-text Izbriši polje
+                span.hidden-text= t('Izbriši polje')
           each el in users
             tbody.user-data.pb-xl-2
               tr
@@ -96,7 +96,7 @@ block body
       form#form-add-user.container-xl.new-user-input.mt-4.ps-0.ms-0(
         action="/api/v1/users/addUser"
       )
-        span.new-user-info NOV UPORABNIK
+        span.new-user-info= t('NOV UPORABNIK')
         .row.d-flex.justify-content-lg-start.align-items-center.mt-2.ms-0.ps-0
           .col-lg-6.ms-0.ps-0.me-2
             input.name-input.d-inline.form-control.ms-0.ps-0(
@@ -105,10 +105,10 @@ block body
               autocomplete="off"
             )
           .col.ms-xl-4.ms-0.ps-0.d-flex.justify-content-start.mt-2.mt-lg-0
-            button.btn.btn-primary Dodaj
+            button.btn.btn-primary= t('Dodaj')
+      include /common/footer
     include /utilities/modal-alert
     include /utilities/modal-response
     +responseModal
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/consultancy/admin/consultancy-admin-inheritable-module.pug

@@ -10,6 +10,11 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/consultancy-search-mechanism.js")
 
 block body
+  input#consultancyContext(
+    type="hidden"
+    name="consultancyContext"
+    value=consultancyPageType
+  )
   - const specificUserRights = user && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
   //- .consultancy-padding-admin.consultancy-container-unique
   section#fixed-top-section
@@ -17,8 +22,8 @@ block body
     +main-navigation(false)
   block config
     - const pageTypeObject = { new: true }
-    - const subHeading = 'Novo'
-    - const description = 'Seznam vprašanj, ki so jih poslali uporabniki, in še niso bila dodeljena moderatorjem.'
+    - const subHeading = t('Novo')
+    - const description = t('Seznam vprašanj, ki so jih poslali uporabniki, in še niso bila dodeljena moderatorjem.')
 
   +sideMenu(pageTypeObject)
 
@@ -32,33 +37,25 @@ block body
     include /utilities/consultancy-admin-panel-header
     //- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
     // - 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.'
-    - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: subHeading, h2: 'Administratorska konzola', description: description }
+    - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: subHeading, h2: t('Administratorska konzola'), description: description }
     +mainHeader(c)
     .content-hold-prerequisites
       #offset-main.main-container
         include /components/consultancy/admin/consultancy-item-admin
         block consultancyContainer
           - const section = pageTypeObject
-        .consultancy-container
-          if pageTypeObject.new
-            each entry in entries
-              +consultancyItem(entry, section)
-          else
-            //- - const moderatorList = entries.filter(a => a.isModerator)
-            each entry in entries
-              //- -
-                entry.sharedAuthors = entries.filter(a => {
-                return !a.isModerator && entry.id === a.id
-                }).map(a => a.name = `${a.firstName} ${a.lastName}`)
-              +consultancyItem(entry, section)
+        #results-data.consultancy-container
+          each entry in entries
+            +consultancyItem(entry, section)
 
+        include /common/footer
   else
     include /utilities/empty-main-panel-header
     +mainHeader
     .content-hold-prerequisites.ps-4.pe-4
       #offset-main.ps-2.pe-2
         p Nimate ustreznih pravic
+    include /common/footer
 
   include ../../../utilities/modal-alert-mixin
-  +alertModal("deleteModal","Izbriši" ,"Prekliči" , "del-btn", "cancel-btn")
-  include /common/footer
+  +alertModal("deleteModal",t("Izbriši") ,t("Prekliči") , "del-btn", "cancel-btn")

express/views/pages/consultancy/admin/dialogs/assign.pug

@@ -29,7 +29,7 @@ mixin consultancyAdminAssignModal
     .modal-dialog
       .modal-content
         .modal-header.mb-0.pb-0
-          h5.pt-3.navigation-text-color Dodeli
+          h5.pt-3.navigation-text-color #{ t('Dodeli') }
           button.btn-close(
             type="button"
             data-bs-dismiss="modal"
@@ -43,9 +43,9 @@ mixin consultancyAdminAssignModal
               button.btn.btn-secondary.height50(
                 type="button"
                 data-bs-dismiss="modal"
-              ) Zapri
+              ) #{ t('Zapri') }
             .col.d-flex.justify-content-end.mb-2
               button#assign-btn.btn.btn-primary.height50(
                 type="button"
                 data-bs-dismiss="modal"
-              ) Uporabi
+              ) #{ t('Uporabi') }

express/views/pages/consultancy/admin/dialogs/share.pug

@@ -41,7 +41,7 @@ mixin consultancyAdminShareModal
     .modal-dialog
       .modal-content
         .modal-header.mb-0.pb-0
-          h5.pt-3.navigation-text-color Deli
+          h5.pt-3.navigation-text-color #{ t('Deli') }
           button.btn-close(
             type="button"
             data-bs-dismiss="modal"
@@ -55,6 +55,6 @@ mixin consultancyAdminShareModal
               button#close-shared.btn.btn-secondary.height50(
                 type="button"
                 data-bs-dismiss="modal"
-              ) Zapri
+              ) #{ t('Zapri') }
             #add-shared-author.col.d-flex.justify-content-end.mb-2
-              button.btn.btn-primary.height50(type="button") Dodaj
+              button.btn.btn-primary.height50(type="button") #{ t('Dodaj') }

express/views/pages/consultancy/admin/edit.pug

@@ -19,8 +19,8 @@ block body
     +main-navigation(false)
   block config
     - const pageTypeObject = sentFrom
-    - const subHeading = 'Urejanje'
-    - const description = 'Dodajte terminološki odgovor in ga utemeljite.'
+    - const subHeading = t('Urejanje')
+    - const description = t('Dodajte terminološki odgovor in ga utemeljite.')
 
   +sideMenu(pageTypeObject)
 
@@ -28,32 +28,32 @@ block body
 
   include /utilities/consultancy-admin-in-progress-panel-header
   //- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
-  - const c = { noSidebar: true, hrefurl: `/svetovanje/vprasanje/admin/${sentFrom}`, specificRights: specificUserRights, exportButtonPresent: false, h1: 'Urejanje terminološkega odgovora', description: 'Dodajte terminološki odgovor in ga utemeljite.', buttons: [{ form: 'edit-form', type: 'button', content: 'Shrani spremembe', contentDisabled: true }] }
+  - const c = { noSidebar: true, hrefurl: `/svetovanje/vprasanje/admin/${sentFrom}`, specificRights: specificUserRights, exportButtonPresent: false, h1: t('Urejanje terminološkega odgovora'), description: t('Dodajte terminološki odgovor in ga utemeljite.'), buttons: [{ form: 'edit-form', type: 'button', content: t('Shrani'), contentDisabled: true }] }
   +mainHeader(c)
   if specificUserRights
     .content-hold-prerequisites
       #offset-main.main-container.offset-correction
         .row.mt-4.mx-0
           .col.g-0
-            p.text-header-description-gray.mb-2 <b>Datum vprašanja:</b> #{ entry.timeCreated }
-            p.text-header-description-gray.mt-2.mb-0 <b>Uporabnik:</b> #{ author.firstName }
-            p.text-header-description-gray.mt-1 <b>E-pošta:</b> #{ author.email }
+            p.text-header-description-gray.mb-2 <b>#{ t('Datum vprašanja:') }</b> #{ entry.timeCreated }
+            p.text-header-description-gray.mt-2.mb-0 <b>#{ t('Uporabnik') }:</b> #{ author.firstName }
+            p.text-header-description-gray.mt-1 <b>#{ t('E-pošta') }:</b> #{ author.email }
             hr
-            p.text-header-description-gray.mb-2 <b>Datum objave/spremembe:</b> #{ entry.timePublished }
-            p.text-header-description-gray.mt-2.mb-0 <b>Avtorji mnenja:</b>
+            p.text-header-description-gray.mb-2 <b>#{ t('Datum objave/spremembe') }:</b> #{ entry.timePublished }
+            p.text-header-description-gray.mt-2.mb-0 <b>#{ t('Avtorji mnenja:') }</b>
               span.text-header-description-gray= ` ${entry.answerAuthors ? entry.answerAuthors.join(`, `) : ''}`
-            p.text-header-description-gray.mt-1 <b>URL povezava do mnenja:</b> #{ isPublished?`${urlPrefix}/svetovanje/vprasanje/${id}`:'' }
+            p.text-header-description-gray.mt-1 <b>#{ t('URL povezava do mnenja:') }</b> #{ isPublished?`${urlPrefix}/svetovanje/vprasanje/${id}`:'' }
             hr
         form#edit-form.row(method="put" action="/api/v1/consultancy/entry")
           input(type="hidden" name="_method" value="put")
           input#entry-id.d-none(type="text" value=id)
           .col
-            h5.navigation-text-color Urejanje
+            h5.navigation-text-color #{ t('Urejanje') }
 
             #question-title-field.mt-4
               .title.mt-4
                 .subject-name.col.d-flex.justify-content-between
-                  label.mb-1.smaller-gray-uppercase(for="address") NASLOV*
+                  label.mb-1.smaller-gray-uppercase(for="address") #{ t('NASLOV') }*
                   - const type = 'two'
                   +mixedContentBtns
                 .row
@@ -67,7 +67,7 @@ block body
 
             .cerif-area.mt-4
               .subject-name
-                label.smaller-gray-uppercase(for="select-cerif") PODROČJE
+                label.smaller-gray-uppercase(for="select-cerif") #{ t('PODROČJE') }
               .row
                 #cerif
                   select#select-cerif.select-cerif.name-input.d-inline.form-control(
@@ -80,14 +80,14 @@ block body
                         value=domain.id
                         selected=domain.id === entry.domainPrimaryId
                       )= domain.nameSl
-                #invalid-section.invalid-feedback-selection.hidden-section.mt-3 Nimate izbranega področja CERIF.
+                #invalid-section.invalid-feedback-selection.hidden-section.mt-3 #{ t('Nimate izbranega področja CERIF.') }
                 //- .col-sm.d-flex.align-items-center
                   span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Področje, v katero sodi opisani terminološki problem
 
             #question-field.mt-4
               .title.mt-4
                 .subject-name.col.d-flex.justify-content-between
-                  label.mb-1.smaller-gray-uppercase(for="questionTitle") VPRAŠANJE*
+                  label.mb-1.smaller-gray-uppercase(for="questionTitle") #{ t('VPRAŠANJE') }*
                   +mixedContentBtns(type)
                 .row
                   .col
@@ -100,7 +100,7 @@ block body
 
               #text-editor.mt-4
                 .subject-name
-                  span.smaller-gray-uppercase MNENJE*
+                  span.smaller-gray-uppercase #{ t('MNENJE') }*
                 .row
                   .col
                     -
@@ -110,24 +110,24 @@ block body
                       } else {
                       if(entry.institution){
                         innerHTML +=  `
-                        <b>Institucija:</b> ${entry.institution}
+                        <b>${t('Institucija')}:</b> ${entry.institution}
                         <br><br>
                         `
                         }
                         if(entry.description){
                         innerHTML += `
-                        <b>Opis terminološkega problema:</b> ${entry.description}
+                        <b>${t('Opis terminološkega problema')}:</b> ${entry.description}
                         <br><br>`
                         }
                         if(entry.existingSolutions){
                         innerHTML += `
-                        <b>Obstoječe poimenovalne rešitve:</b> ${entry.existingSolutions}
+                        <b>${t('Obstoječe poimenovalne rešitve')}:</b> ${entry.existingSolutions}
                         <br><br>
                         `
                         }
                         if(entry.examplesOfUse){
                         innerHTML += `
-                        <b>Primeri rabe:</b> ${entry.examplesOfUse}
+                        <b>${t('Primeri rabe')}:</b> ${entry.examplesOfUse}
                         <br><br><br>
                         `
                         }
@@ -136,14 +136,14 @@ block body
                     #opinion.summernote !{ innerHTML }
                   //- .col-sm.d-flex.align-items-center
                     span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Navodilo k posamičnemu polju. Reprehenderit aliqua quis ut velit eu irure non ad sunt sunt ipsum sunt esse.
-        .comments-content.col-12.col-md-12.py-md-3.bd-content
+        .comments-content.col-12.col-md-12.pt-md-3.bd-content
           include /utilities/comments-with-pager
+        include /common/footer
   else
     include /utilities/empty-main-panel-header
     +mainHeader
     .content-hold-prerequisites.ps-4.pe-4
       #offset-main.ps-2.pe-2
-        p Nimate ustreznih pravic
+        p #{ t('Nimate ustreznih pravic') }
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/consultancy/admin/in-progress.pug

@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
 
 block config
   - const pageTypeObject = { inProgress: true }
-  - const subHeading = 'V delu'
-  - const description = 'Seznam vprašanj, ki so še v urejanju.'
+  - const subHeading = t('V delu')
+  - const description = t('Seznam vprašanj, ki so še v urejanju.')

express/views/pages/consultancy/admin/prepared.pug

@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
 
 block config
   - const pageTypeObject = { prepared: true }
-  - const subHeading = 'Pripravljeno'
-  - const description = 'Seznam urejenih vprašanj, ki čakajo na potrditev dokončne objave.'
+  - const subHeading = t('Pripravljeno')
+  - const description = t('Seznam urejenih vprašanj, ki čakajo na potrditev dokončne objave.')

express/views/pages/consultancy/admin/published.pug

@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
 
 block config
   - const pageTypeObject = { published: true }
-  - const subHeading = 'Objavljeno'
-  - const description = 'Seznam objavljenih vprašanj.'
+  - const subHeading = t('Objavljeno')
+  - const description = t('Seznam objavljenih vprašanj.')

express/views/pages/consultancy/admin/rejected.pug

@@ -2,5 +2,5 @@ extends /pages/consultancy/admin/consultancy-admin-inheritable-module
 
 block config
   - const pageTypeObject = { rejected: true }
-  - const subHeading = 'Zavrnjeno'
-  - const description = 'Seznam vprašanj, ki so jih moderatorji zavrnili in jih je treba dodeliti nekomu drugemu.'
+  - const subHeading = t('Zavrnjeno')
+  - const description = t('Seznam vprašanj, ki so jih moderatorji zavrnili in jih je treba dodeliti nekomu drugemu.')

express/views/pages/consultancy/admin/statistics.pug

@@ -23,7 +23,7 @@ block body
       +main-navigation(false)
     block config
       - const pageTypeObject = { stats: true }
-      - const subHeading = 'Statistika'
+      - const subHeading = t('Statistika')
 
     +sideMenu(pageTypeObject)
 
@@ -36,7 +36,7 @@ block body
     if specificUserRights
       include /utilities/consultancy-admin-panel-header
       //- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
-      - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: 'Statistika', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
+      - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: t('Statistika'), description: 'STATISTIKA_PLACEHOLDER', buttons: [{ type: 'link', content: t('Zastavi novo vprašanje'), url: '/svetovanje/vprasanje/novo' }] }
       +mainHeader(c)
       .content-hold-prerequisites.ps-4.pe-4
         #offset-main.ps-2.pe-2
@@ -50,7 +50,7 @@ block body
       +mainHeader
       .content-hold-prerequisites.ps-4.pe-4
         #offset-main.ps-2.pe-2
-          p Nimate ustreznih pravic
+          p #{ t('Nimate ustreznih pravic') }
 
 //-  include ../../../utilities/modal-alert-mixin
 //-  +alertModal("deleteModal","Izbriši" ,"Prekliči" , "del-btn", "cancel-btn")

express/views/pages/consultancy/admin/users.pug

@@ -24,7 +24,7 @@ block body
     +main-navigation(false)
   block config
     - const pageTypeObject = { users: true }
-    - const subHeading = 'Uporabniki'
+    - const subHeading = t('Uporabniki')
 
   +sideMenu(pageTypeObject)
 
@@ -40,9 +40,9 @@ block body
         .header-container-left-side.d-flex.col-sm-10
           #chevrons-left.d-flex.w-100
             .header-container-divider-left
-              h2#site-header-title Uporabniki
-              h1#site-heading Seznam svetovalcev
-              span#text-description.page-description.pe-0 Na tem mestu lahko dodajate svetovalce, ki so registrirani uporabniki terminološkega portala. Če boste pripisali področje, boste lahko svetovalcu dodeljevali samo vprašanja, ki sodijo na izbrano področje, vsem drugim pa vsa.
+              h2#site-header-title #{ t('Uporabniki') }
+              h1#site-heading #{ t('Seznam svetovalcev') }
+              span#text-description.page-description.pe-0 #{ t('Na tem mestu lahko dodajate svetovalce, ki so registrirani uporabniki terminološkega portala. Če boste pripisali področje, boste lahko svetovalcu dodeljevali samo vprašanja, ki sodijo na izbrano področje, vsem drugim pa vsa.') }'
         .header-container-divider-right.d-flex.justify-content-end.col-sm-2
           //- a.btn.btn-primary.header-btn(disabled) Dodaj
 
@@ -60,8 +60,8 @@ block body
         table#all-areas-table.table.areas-table.table-responsive
           thead
             tr
-              th(scope="col") Ime
-              th(scope="col") Področja
+              th(scope="col") #{ t('Ime') }
+              th(scope="col") #{ t('Področja') }
               th(scope="col") 
           tbody
             each user in users
@@ -90,14 +90,14 @@ block body
           .row.mb-5
             .col-sm-3
               .subject-name
-                label.input-name-txt Ime
+                label.input-name-txt #{ t('Ime') }
               input#username.form-control(type="text")
             .col-sm-3
               .subject-name
-                label.input-name-txt Področja
+                label.input-name-txt #{ t('Področja') }
               input#domains.form-control(type="text")
             .col.d-flex.align-items-end.mt-2
-              button#add-area.btn.btn-primary(type="submit") Dodaj
+              button#add-area.btn.btn-primary(type="submit") #{ t('Dodaj') }
 
+        include /common/footer
     include /utilities/modal-alert
-  include /common/footer

express/views/pages/consultancy/ask.pug

@@ -3,6 +3,7 @@ extends /layout
 block pageSpecificScipts
   //- the only reason to include the bottom script is to calibrate the padding of the content
   script(nonce=cspNonce src="/javascripts/consultancy.js")
+  script(nonce=cspNonce src="/javascripts/consultancy-search-mechanism.js")
   script(nonce=cspNonce src="/javascripts/utils.js")
 
 block body
@@ -16,8 +17,8 @@ block body
     .content-hold-prerequisites.ps-4.pe-4
       #offset-main.ps-2.pe-2
         if user
-          .consultancy-container.mb-5
-            .back-section.mt-4.mb-3.d-flex
+          .consultancy-container
+            //- .back-section.mt-4.mb-3.d-flex
               a.bg-transparent.border-0.consultancy-back-button.d-flex.align-items-center(
                 href="/svetovanje"
               )
@@ -31,10 +32,10 @@ block body
                 autocomplete="off"
                 novalidate
               )
-                h5.navigation-text-color.text-1p5rem.fw-light Zastavi terminološko vprašanje
+                h5.navigation-text-color.text-1p5rem.fw-light #{ t('Zastavi terminološko vprašanje') }
                 #name-field.mt-4
                   .subject-name
-                    label.smaller-gray-uppercase(for="name") IME IN PRIIMEK
+                    label.smaller-gray-uppercase(for="name") #{ t('IME IN PRIIMEK') }
                   .row
                     .col-sm-6
                       input#name.name-input.d-inline.form-control(
@@ -44,11 +45,11 @@ block body
                         disabled
                       )
                     .col-sm.d-flex.align-items-center
-                      span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Ime in priimek trenutno prijavljenega uporabnika.
+                      span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Ime in priimek trenutno prijavljenega uporabnika.') }
 
                   #email-field.mt-4
                   .subject-name
-                    label.smaller-gray-uppercase(for="email") ELEKTRONSKI NASLOV
+                    label.smaller-gray-uppercase(for="email") #{ t('ELEKTRONSKI NASLOV') }
                   .row
                     .col-sm-6
                       input#email.name-input.d-inline.form-control(
@@ -58,10 +59,10 @@ block body
                         disabled
                       )
                     .col-sm.d-flex.align-items-center
-                      span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Elektronski naslov trenutno prijavljenega uporabnika.
+                      span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Elektronski naslov trenutno prijavljenega uporabnika.') }
                   #institution-field.mt-4
                     .subject-name
-                      label.smaller-gray-uppercase(for="institution") INSTITUCIJA
+                      label.smaller-gray-uppercase(for="institution") #{ t('INSTITUCIJA') }
                     .row
                       .col-sm-6
                         textarea#institution.explanation-field.form-control.noScrollbar.resizeNone.institution-input(
@@ -69,11 +70,11 @@ block body
                           rows="1"
                         )
                       .col-sm.d-flex.align-items-center
-                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Institucija, kjer trenutno prijavljeni uporabnik deluje.
+                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Institucija, kjer trenutno prijavljeni uporabnik deluje.') }
 
                   #text-editor.mt-4
                     .subject-name
-                      span.smaller-gray-uppercase OPIS TERMINOLOŠKEGA PROBLEMA *
+                      span.smaller-gray-uppercase #{ t('OPIS TERMINOLOŠKEGA PROBLEMA') } *
                     .row
                       .col-sm-6
                         textarea#description.explanation-field.form-control.ms-0.noScrollbar.resizeNone.r-3.form-check-label(
@@ -81,13 +82,13 @@ block body
                           rows="2"
                           required
                         )
-                        .invalid-feedback Niste vpisali opisa terminološkega problema.
+                        .invalid-feedback #{ t('Niste vpisali opisa terminološkega problema.') }
                       .col-sm.d-flex.align-items-center
-                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Čim bolj natančno opišite terminološki problem, zlasti opišite vsebino pojma.
+                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Čim bolj natančno opišite terminološki problem, zlasti opišite vsebino pojma.') }
 
                   .cerif-area.mt-4
                     .subject-name
-                      label.smaller-gray-uppercase(for="select-cerif") PODROČJE
+                      label.smaller-gray-uppercase(for="select-cerif") #{ t('PODROČJE') }
                     .row
                       #cerif.col-sm-6
                         select#select-cerif.select-cerif.name-input.d-inline.form-control(
@@ -96,13 +97,13 @@ block body
                           option(value=-1)
                           each domain in allPrimaryDomains
                             option(value=domain.id)= domain.nameSl
-                      #invalid-section.invalid-feedback-selection.hidden-section.mt-3 Nimate izbranega področja CERIF.
+                      #invalid-section.invalid-feedback-selection.hidden-section.mt-3 #{ t('Nimate izbranega področja CERIF.') }
                       .col-sm.d-flex.align-items-center
-                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Področje, v katero sodi opisani terminološki problem.
+                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Področje, v katero sodi opisani terminološki problem.') }
 
                   #text-editor.mt-4
                     .subject-name
-                      span.smaller-gray-uppercase OBSTOJEČE POIMENOVALNE REŠITVE
+                      span.smaller-gray-uppercase #{ t('OBSTOJEČE POIMENOVALNE REŠITVE') }
                     .row
                       .col-sm-6
                         textarea#existing-solutions.explanation-field.form-control.noScrollbar.r-3.resizeNone(
@@ -110,11 +111,11 @@ block body
                           rows="2"
                         )
                       .col-sm.d-flex.align-items-center
-                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Morebitne že obstoječe poimenovalne rešitve, če obstajajo.
+                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Morebitne že obstoječe poimenovalne rešitve, če obstajajo.') }
 
                   #text-editor.mt-4
                     .subject-name
-                      span.smaller-gray-uppercase PRIMERI RABE V BESEDILIH
+                      span.smaller-gray-uppercase #{ t('PRIMERI RABE V BESEDILIH') }
                     .row
                       .col-sm-6
                         textarea#examples-of-use.explanation-field.form-control.noScrollbar.r-3.resizeNone(
@@ -122,11 +123,15 @@ block body
                           rows="2"
                         )
                       .col-sm.d-flex.align-items-center
-                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Morebitni primeri rabe termina v besedilih ali povezave do njih, če obstajajo.
+                        span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 #{ t('Morebitni primeri rabe termina v besedilih ali povezave do njih, če obstajajo.') }
 
-                  .send-section.mt-5
-                    button.btn.btn-primary.send-cons-btn(type="submit") Pošlji
+                  .send-section.mt-5.flex-row.d-flex
+                    button#cancel-cons-btn.btn.btn-secondary(type="button") #{ t('Prekliči') }
+                    .d-flex.flex-grow-1.justify-content-end
+                      button.btn.btn-primary.send-cons-btn(type="submit") #{ t('Pošlji') }
 
+          include /utilities/modal-response
+          +responseModal("begin-response", t("Razumem"), "understand-btn", isOwnConsultancyEnabled?t("Hvala za poslano vprašanje, ki je bilo posredovano svetovalcem terminološkega portala. Odgovor boste prejeli na e-naslov, ki ste ga navedli ob registraciji."):t("Hvala za poslano vprašanje, ki je bilo posredovano v Terminološko svetovalnico ZRC SAZU. Odgovor boste prejeli na e-naslov, ki ste ga navedli ob registraciji."))
         else
-          p Za zastavljanje terminoloških vprašanj morate biti prijavljeni.
+          p #{ t('Za zastavljanje terminoloških vprašanj morate biti prijavljeni.') }
   include /common/footer

express/views/pages/consultancy/index.pug

@@ -4,13 +4,16 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/dictionaries.js")
   script(nonce=cspNonce src="/javascripts/consultancy.js")
   script(nonce=cspNonce src="/javascripts/consultancy-search-mechanism.js")
+  script(nonce=cspNonce src="/javascripts/query-focus-handler.js")
 
 block body
   block preDefinitions
     - const resultAmountDisplay = false
 
-  - const specificUserRights = user && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
-
+  - const specificUserRights = user && isOwnConsultancyEnabled && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
+  -
+    let descriptionText = t('Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.')
+    descriptionText = isOwnConsultancyEnabled?descriptionText:descriptionText+t(" Terminološke odgovore pripravljajo sodelavci Terminološke sekcije Inštituta za slovenski jezik Frana Ramovša ZRC SAZU (in so objavljeni tudi na spletišču <a href='https://isjfr.zrc-sazu.si/sl/terminologisce/svetovanje'>Terminologišče</a>), ki pri delu upoštevajo osnovna terminološka načela.")
   //- include /common/side-menu-fake
   //- +sideNavigationFake
 
@@ -19,14 +22,13 @@ block body
     +main-navigation(false)
   .consultancy-padding-main.p-squeeze-lg
     include /utilities/consultancy-main-panel-header
-    //- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
     block headerConfig
-      - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }], show5MostRecent: true }
+      - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: t('Terminološko svetovanje'), description: descriptionText, buttons: [{ type: 'link', content: t('Zastavi novo vprašanje'), url: '/svetovanje/vprasanje/novo' }], show5MostRecent: true }
     +mainHeader(c)
     .content-hold-prerequisites.ps-0.pe-0
       #offset-main
         include /components/consultancy/consultancy-item
-        .consultancy-container
+        #results-data.consultancy-container
           // To remove duplicates
           //- - const moderatorList = entryList.filter(a => a.isModerator) // All published questions have a moderator...
           each entry in entries

express/views/pages/consultancy/item-details.pug

@@ -4,29 +4,34 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/comments.js")
   //- script(nonce=cspNonce src="/javascripts/dictionaries.js")
   script(nonce=cspNonce src="/javascripts/consultancy.js")
+  script(nonce=cspNonce src="/javascripts/consultancy-search-mechanism.js")
 
 block body
-  - const specificUserRights = user && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
+  - const specificUserRights = user && isOwnConsultancyEnabled && (user.hasRole('consultant') || user.hasRole('consultancy admin'))
   section#fixed-top-section
     include /common/main-navigation
     +main-navigation(false)
+
+  -
+    let descriptionText = t('Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.')
+    descriptionText = isOwnConsultancyEnabled?descriptionText:descriptionText+t(" Terminološke odgovore pripravljajo sodelavci Terminološke sekcije Inštituta za slovenski jezik Frana Ramovša ZRC SAZU (in so objavljeni tudi na spletišču <a href='https://isjfr.zrc-sazu.si/sl/terminologisce/svetovanje'>Terminologišče</a>), ki pri delu upoštevajo osnovna terminološka načela.")
   .consultancy-padding-main.p-squeeze-lg.mx-xxl-auto
     include /utilities/consultancy-main-panel-header
     //- const c = { h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj, pa strokovnjaki čutijo potrebo po sistemskem poenotenju oz. izbiri najprimernejše rešitve.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
-    - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }] }
+    - const c = { specificRights: specificUserRights, exportButtonPresent: false, h1: t('Terminološko svetovanje'), description: descriptionText, buttons: [{ type: 'link', content: t('Zastavi novo vprašanje'), url: '/svetovanje/vprasanje/novo' }] }
     +mainHeader(c, false)
     .content-hold-prerequisites.px-0
       #offset-main
-        .back-section.mt-4.mb-2
+        .back-section.mt-2.mb-2
           a.bg-transparent.border-0.consultancy-back-button(href="/svetovanje")
             img.float-start(src="/images/chevrons-left.svg")
             .text-header-description-gray.ps-3.float-start
-              b Nazaj
+              b #{ t('Nazaj') }
         .consultancy-container.mb-2
           .consultancy-item-detailed
             .row
               .col-6.d-flex.justify-content-start
-                span Vprašanje poslano #{ entry.timeCreated }
+                span Vprašanje poslano: #{ entry.timeCreated }
               //- .col-6.d-flex.justify-content-end
                 button.me-3.bg-transparent.no-border
                   img.i1p5rx1p5r(src="/images/copy.svg")
@@ -39,10 +44,10 @@ block body
               .col
                 h4.mt-3.navigation-text-color #{ entry.title }
 
-            .mb-3!= `<b>Opis terminološkega problema:</b> ${entry.question}`
-            .mb-3!= `<b>Odgovor:</b> ${entry.answer}`
-            if entry.domain
-              .mb-3!= `<b>Področje:</b> ${entry.domain}`
+            .mb-3!= `<b>${t('Opis terminološkega problema:')}</b> ${entry.question}`
+            .mb-3!= `<b>${t('Odgovor')}:</b> ${entry.answer}`
+            if entry.domain && isOwnConsultancyEnabled
+              .mb-3!= `<b>${t('Področje')}:</b> ${entry.domain}`
             div!= `<b>${authorString}:</b> ${entry.answerAuthors ? entry.answerAuthors.join(', ') : ''}`
         //- .mt-3
           include /utilities/comments-with-pager

express/views/pages/consultancy/search.pug

@@ -4,4 +4,4 @@ block preDefinitions
   - const resultAmountDisplay = true
 
 block headerConfig
-  - const c = { specificRights: specificUserRights, exportButtonPresent: true, h1: 'Terminološko svetovanje', description: 'Terminološka svetovalnica je namenjena širši strokovni javnosti, ki se sooča s konkretnimi poimenovalnimi problemi, pa naj gre za popolnoma nove pojme, ki jih je v slovenščini šele treba poimenovati, ali že znane pojme, za katere obstaja več poimenovanj.', buttons: [{ type: 'link', content: 'Zastavi novo vprašanje', url: '/svetovanje/vprasanje/novo' }], show5MostRecent: false }
+  - const c = { specificRights: specificUserRights, exportButtonPresent: true, h1: t('Terminološko svetovanje'), description: descriptionText, buttons: [{ type: 'link', content: t('Zastavi novo vprašanje'), url: '/svetovanje/vprasanje/novo' }], show5MostRecent: false }

express/views/pages/demo-paginacija.pug

@@ -1,3 +1,5 @@
+//- TODO MARK FOR DELETION
+
 doctype html
 html(lang="sl")
   head
@@ -9,11 +11,12 @@ html(lang="sl")
     h1 Demo konceptualna zasnova paginacije (muštr)
 
     //- Id krovnega elementa je v realnem primeru lahko poljuben, saj ga podaš funkciji initPagination (v demo-paginacija.js).
+    //-   UPDATE: initPagination sedaj lahko sprejme tudi array idjev (tukaj: pagination-top in pagination-bottom)
     //- Interna struktura mora ostati enaka (imena elementov, njihove klase, imena, vrednosti).
     //- Lahko pa v gumbe dodaš slike itd., če je potrebno, ali dodatne klase na njih, če je potrebno zaradi oblikovanja.
     //- Oblikovanja tu namenoma nisem dodajal, da je demo čim enostavnejši. Oblikovati ga morata vidva oz. prvi, ki bo to delal.
     //- Če kaj ne bo jasno, me raje vprašaj.
-    #pagination
+    #pagination-top
       button.first-page(disabled) <<
       button.previous-page(disabled) <
       form
@@ -27,6 +30,16 @@ html(lang="sl")
       each result in results 
         li Zanimiva vrednost: #[b= result.zanimivo]. Totalno nezanimivo: #{ result.nezanimivo1 } in #{ result.nezanimivo2 }
 
+    #pagination-bottom
+      button.first-page(disabled) <<
+      button.previous-page(disabled) <
+      form
+        input(name="page" value="1")
+        span= ' / '
+        span.pages-total= numberOfAllPages
+      button.next-page(disabled=numberOfAllPages === 1) >
+      button.last-page(disabled=numberOfAllPages === 1) >>
+
     //- V realnem primeru:
     //- Ne uvoziš axiosa, ker je že v layout.pug
     //- Ne uvoziš skripte demo-paginacija.js, ker inicializacijsko kodo po njenem zgledu uporabiš v skripti, ki jo ta stan že uporablja.

express/views/pages/dictionaries/advanced.pug

@@ -12,7 +12,7 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Napredno', description: 'Napredno urejanje omogoča spreminjanje večjega števila podatkov v terminološkem slovarju.' }
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Napredno'), description: t('Napredno urejanje omogoča spreminjanje večjega števila podatkov v terminološkem slovarju.') }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-2
@@ -22,35 +22,41 @@ block body
         value=dictionary.id
       )
       .file-type.mt-2
-        .row
+        .row.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Brisanje slovarskih sestavkov
-            button#adv-delete-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn BRIŠI
+            span.info-text-for-button.me-auto= t('Brisanje slovarskih sestavkov')
+            button#adv-delete-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('BRIŠI')
           .col-sm.ms-xxl-3.ms-md-3.align-items-center.d-flex.ps-1
-            span.name-info-txt Izbrišete lahko vse doslej obdelane slovarske sestavke in ohranite vse metapodatke o slovarju. Dejanja ni mogoče preklicati.
-              a.name-info-txt.ms-2(href="/pomoc") Več …
+            span.name-info-txt= t('Izbrišete lahko vse doslej obdelane slovarske sestavke in ohranite vse metapodatke o slovarju. Dejanja ni mogoče preklicati.')
+              a.name-info-txt.ms-2(
+                href="/pomoc#help-edit-dict"
+                target="_blank"
+              )= t('Več …')
       .file-type.mt-5
-        .row
+        .row.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Brisanje slovarja
-            button#adv-delete-dictionary.btn.btn-primary.ps-5.pe-5.advanced-blue-btn BRIŠI
+            span.info-text-for-button.me-auto= t('Brisanje slovarja')
+            button#adv-delete-dictionary.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('BRIŠI')
           .col-sm.ms-xxl-3.ms-md-3.align-items-center.d-flex.ps-1
-            span.name-info-txt Izbrišete lahko celoten slovar z vsemi metapodatki. Dejanja ni mogoče preklicati.
-              a.name-info-txt.ms-2(href="/pomoc") Več …
+            span.name-info-txt= t('Izbrišete lahko celoten slovar z vsemi metapodatki. Dejanja ni mogoče preklicati.')
+              a.name-info-txt.ms-2(
+                href="/pomoc#help-edit-dict"
+                target="_blank"
+              )= t('Več …')
       .file-type.mt-5
-        .row
+        .row.g-0
           .col-md-6.white-border-background.p-4.d-flex.align-items-center
-            span.info-text-for-button.me-auto Objava vseh slovarskih sestavkov
-            button#adv-publish-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn OBJAVI
+            span.info-text-for-button.me-auto= t('Objava vseh slovarskih sestavkov')
+            button#adv-publish-all-entries.btn.btn-primary.ps-5.pe-5.advanced-blue-btn= t('OBJAVI')
           .col-sm.ms-xxl-3.ms-md-3.align-items-center.d-flex.ps-1
-            span.name-info-txt Ko boste končali z urejanjem svojega terminološkega slovarja, lahko objavite vse slovarske sestavke, ki bodo postali vidni vsem uporabnikom. Vaše dejanje mora potrditi še administrator portala.
+            span.name-info-txt= t('Ko boste končali z urejanjem svojega terminološkega slovarja, lahko objavite vse slovarske sestavke, ki bodo postali vidni vsem uporabnikom. Vaše dejanje mora potrditi še administrator portala.')
+      include /common/footer
     include /utilities/modal-spinner
     include /utilities/modal-alert-mixin
-    +alertModal("delete-entries", "Izbriši", "Prekliči", "modal-use-btn", "cancel-btn", 'S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju. Metapodatki bodo ostali. Dejanja ni mogoče razveljaviti.')
-    +alertModal("delete-dictionary", "Izbriši", "Prekliči", "modal-use-btn", "cancel-btn", 'S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju in vse metapodatke. Dejanja ni mogoče razveljaviti.')
-    +alertModal("publish-entries", "Uporabi", "Prekliči", "modal-use-btn", "cancel-btn", 'Ali želite objaviti vsa gesla?')
+    +alertModal("delete-entries", t("Izbriši"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju. Metapodatki bodo ostali. Dejanja ni mogoče razveljaviti.'))
+    +alertModal("delete-dictionary", t("Izbriši"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('S tem dejanjem boste izbrisali vse slovarske sestavke v slovarju in vse metapodatke. Dejanja ni mogoče razveljaviti.'))
+    +alertModal("publish-entries", t("Uporabi"), t("Prekliči"), "modal-use-btn", "cancel-btn", t('Ali želite objaviti vsa gesla?'))
     include /utilities/modal-response
-    +responseModal("delete-entries-res", "Razumem", "understand-btn", "Slovarski sestavki so bili izbrisani.")
-    +responseModal("delete-dict-res", "Razumem", "understand-btn", "Slovar je bil izbrisan.")
-    +responseModal("publish-entries-res", "Razumem", "understand-btn", "Slovarski sestavki so bili objavljeni.")
-  include /common/footer
+    +responseModal("delete-entries-res", t("Razumem"), "understand-btn", t("Slovarski sestavki so bili izbrisani."))
+    +responseModal("delete-dict-res", t("Razumem"), "understand-btn", t("Slovar je bil izbrisan."))
+    +responseModal("publish-entries-res", t("Razumem"), "understand-btn", t("Slovarski sestavki so bili objavljeni."))

express/views/pages/dictionaries/content.pug

@@ -30,7 +30,7 @@ block body
           #content-data-section.mt-2
             #no-entries-text.d-flex.justify-content-center
               .justify-content-center.mt-5
-                p Ni slovarskih sestavkov za urejanje.
+                p= t('Ni slovarskih sestavkov za urejanje.')
             #entry-preview-section.d-none
               #classic-overview
                 include /utilities/content-classic-overview
@@ -42,6 +42,8 @@ block body
         include /utilities/comments-with-pager
   include /utilities/modal-alert
   include /utilities/modal-alert-mixin
-  +alertModal("delete-modal", "Izbriši", "Prekliči", "modal-del-btn", "cancel-btn", 'Ali želite izbrisati geslo?')
+  include /utilities/modal-response
+  +alertModal("delete-modal", t("Izbriši"), t("Prekliči"), "modal-del-btn", "cancel-btn", t('Ali želite izbrisati slovarski sestavek?'))
+  +responseModal("duplicate-modal", t("Razumem"), "understand-btn", t("Vsebina slovarskega sestavka je bila duplicirana."))
   .mb-3
   //- include /common/footer

express/views/pages/dictionaries/description.pug

@@ -12,179 +12,11 @@ block body
   - const d = { activeLvl1: 'attributes', activeLvl2: 'description' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Osnovni podatki', description: 'Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.', helpLink: { linkHref: '/pomoc', linkText: 'Več ...' }, buttons: [{ type: 'disabled', content: 'Shrani', form: 'form-dictionary-description' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Osnovni podatki'), description: t('Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.'), helpLink: { linkHref: '/pomoc#help-edit-dict', linkText: t('Več ...') }, buttons: [{ type: 'disabled', content: t('Shrani'), form: 'form-dictionary-description' }] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-3
-      form#form-dictionary-description.needs-validation(
-        method="post"
-        novalidate
-      )
-        .title
-          .subject-name
-            label.input-name-txt(for="dictionary-title") NASLOV SLOVARJA *
-          .row
-            .col-sm-6
-              input#dictionary-title.name-input.form-control.d-inline(
-                type="text"
-                name="nameSl"
-                required
-                maxlength="120"
-                value=dictionary.nameSl
-              )
-              .invalid-feedback Niste vpisali naslova slovarja.
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Celotni naslov slovarja, ki bo zabeležen v bibliografskih podatkih.
-
-        .english-title.mt-4
-          .subject-name
-            label.input-name-txt(for="dictionary-title-en") ANGLEŠKI NASLOV SLOVARJA *
-          .row
-            .col-sm-6.align-items-center
-              input#dictionary-title-en.name-input.form-control.d-inline(
-                type="text"
-                name="nameEn"
-                maxlength="120"
-                value=dictionary.nameEn ? dictionary.nameEn : ''
-                required
-              )
-              .invalid-feedback Niste vpisali angleškega naslova slovarja.
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Celotni naslov slovarja v angleščini.
-
-        .short-title.mt-4
-          .subject-name
-            label.input-name-txt(for="short-dictionary-title") SKRAJŠANI NASLOV SLOVARJA
-          .row
-            .col-sm-6
-              input#short-dictionary-title.name-input.d-inline.form-control(
-                type="text"
-                name="nameSlShort"
-                maxlength="15"
-                value=dictionary.nameSlShort ? dictionary.nameSlShort : ''
-              )
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Zaradi organizacije podatkov na portalu za skrajšani naslov slovarja predlagamo poenobesede	nje, ki se bo izpisovalo ob slovarju, npr. Davčni terminološki slovar → Davki.
-
-        if dictionary.author
-          each ele, index in dictionary.author
-            .author.mt-4.added-field
-              .subject-name
-                label.input-name-txt(for="author") AVTOR SLOVARJA
-              .row
-                .col-sm-6
-                  .input-group
-                    input(
-                      class=index != 0 ? 'name-input d-inline form-control icon-trash' : 'name-input d-inline form-control'
-                      type="text"
-                      name="author"
-                      maxlength="64"
-                      value=ele ? ele : ''
-                    )
-                    if (index!=0)
-                      button.input-group-text.delete-author-btn(type="button")
-                        img(src="/images/red-trash-icon.svg" alt="")
-                .col-sm.d-flex.align-items-center
-                  span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite avtorja slovarja, če ste glavni avtor, na prvo mesto zapišite svoje ime.
-        else
-          #first-author.author.mt-4
-            .subject-name
-              label.input-name-txt(for="author") AVTOR SLOVARJA
-            .row
-              .col-sm-6
-                input#author.name-input.d-inline.form-control(
-                  type="text"
-                  name="author"
-                  maxlength="64"
-                )
-              .col-sm.d-flex.align-items-center
-                span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite avtorja slovarja, če ste glavni avtor, na prvo mesto zapišite svoje ime.
-
-        #add-new-author.author.mt-4
-          .subject-name
-            label.input-name-txt(for="input-new-author") NOV AVTOR SLOVARJA
-          .row
-            .col-sm-6
-              button#input-new-author.form-control(type="button")
-                span.new-author-text-btn Nov avtor
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Dodajte ime in priimek naslednjega avtorja slovarja..
-
-        .cerif-area.mt-4
-          .subject-name
-            label.input-name-txt(for="select-cerif") PODROČJE *
-          .row
-            .col-sm-6
-              select.name-input.d-inline.form-select(
-                name="domainPrimary"
-                required
-              )
-                each domain in allPrimaryDomains
-                  option(
-                    value=domain.id
-                    selected=domain.id === dictionary.domainPrimary
-                  )= domain.nameSl
-
-              #invalid-section.invalid-feedback-selection.hidden-section.mt-3 Nimate izbranega področja CERIF.
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Izberite področje svojega terminološkega slovarja na seznamu področij.
-
-        .small-name-area.mt-4
-          .subject-name
-            label.input-name-txt(for="domain-secondary") PODPODROČJE
-          .row
-            .col-sm-6
-              select#domain-secondary.name-input.d-inline.form-control.without-addition(
-                name="domainSecondary"
-                multiple
-              )
-                each domain in allSecondaryDomains
-                  if associatedSecondaryDomains.some(associatedDomain => associatedDomain.id === domain.id)
-                    option(value=domain.id selected)= domain.nameSl
-                  else
-                    option(value=domain.id)= domain.nameSl
-
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite podpodročje glavnega področja, ki ste ga izbrali. Če podpodročja ni med naborom, izberite polje Novo podpodročje.
-
-        #add-new-area.author.mt-4
-          .subject-name
-            label.input-name-txt NOVO PODPODROČJE
-          .row
-            .col-sm-6
-              button#input-new-area.form-control(type="button")
-                span.new-author-text-btn Novo podpodročje
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 Vpišite novo podpodročje. Na seznamu podpodročij bo vidno takoj po potrditvi administratorja portala.
-
-        #text-editor.mt-4
-          .subject-name
-            span.input-name-txt OPIS SLOVARJA
-          .container-xxl.ps-0.ms-0
-            textarea.summernote(
-              name="description"
-              value=dictionary.description
-            )
-              if dictionary.description
-                p= dictionary.description
-        #issn-field.mt-4
-          .subject-name
-            label.input-name-txt(for="issn") ISSN OZNAKA
-          .row
-            .col-sm-6
-              input#issn.name-input.d-inline.form-control(
-                type="text"
-                name="issn"
-                maxlength="20"
-                value=dictionary.issn ? dictionary.issn : ''
-              )
-            .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0 ISSN oznaka.
-              a.ms-1.name-info-txt(href="/pomoc" target="_blank") Več ...
-    include /utilities/modal-alert
+  include /utilities/dictionary-description-mixin
+  +dictionary-description
+  include /utilities/modal-alert
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/dictionaries/dictionary-comments.pug

@@ -12,11 +12,12 @@ block body
   - const d = { activeLvl1: 'attributes', activeLvl2: 'comments' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Komentarji', description: 'Tu so zbrani vsi komentarji, povezani z vašim slovarjem.' }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Komentarji'), description: t('Tu so zbrani vsi komentarji, povezani z vašim slovarjem.') }
   +mainHeader(c)
 
-  .comments-content.col-12.col-md-12.py-md-3.bd-content.content-hold-prerequisites
+  .comments-content.col-12.col-md-12.pt-md-3.bd-content.content-hold-prerequisites
     #offset-main.main-container
       include /utilities/comments-with-pager
 
-  include /common/footer
+      include /common/footer

express/views/pages/dictionaries/dictlist.pug

@@ -4,6 +4,7 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/dictionaries.js")
   script(nonce=cspNonce src="/javascripts/pagination-extensions.js")
   script(nonce=cspNonce src="/javascripts/search-dictionary.js")
+  script(nonce=cspNonce src="/javascripts/query-focus-handler.js")
 
 block body
   section#fixed-top-section
@@ -26,14 +27,14 @@ block body
       .header-container-left-side.d-flex
         .header-container-divider-left
           //- h2#site-header-title 
-          h1#site-heading Seznam slovarjev
-          span#text-description.pe-xl-5.page-description Seznam vseh slovarjev, ki so na tem portalu na voljo uporabnikom.
+          h1#site-heading #{ t('Seznam slovarjev') }
+          span#text-description.pe-xl-5.page-description #{ t('Seznam vseh slovarjev, ki so na tem portalu na voljo uporabnikom.') }
     hr#header-row.mt-1.mb-0
 
   //- - const c = {sideMenu:false, h2: 'Urejanje', h1: 'Nov slovar', description: 'Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.', helpLink: { linkHref: '/pomoc', linkText: 'Več ...' }, buttons: [{ type: 'cancel', content: 'Prekliči', url:"." },{ type: 'button', content: 'Ustvari', form: 'form-dictionary-new' }] }
   //- +mainHeader(c)
   .content-hold-prerequisites.ps-3.pe-3
-    #offset-main.container-fluid.mt-4.ps-sm-3.errc
+    #offset-main.container-fluid.mt-4.px-sm-3.errc
       .p-squeeze-lg
         .row
           .col-md-6

express/views/pages/dictionaries/domain-labels.pug

@@ -12,101 +12,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Področne oznake', description: 'Na tem mestu lahko določite področne oznake, če želite posamezne termine v svojem terminološkem slovarju razvrstiti še podrobneje.', helpLink: { linkHref: '/pomoc#help-content-domains', linkText: 'Več ...' }, buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: 'Shrani' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Področne oznake'), description: t('Na tem mestu lahko določite področne oznake, če želite posamezne termine v svojem terminološkem slovarju razvrstiti še podrobneje.'), helpLink: { linkHref: '/pomoc#help-content-domains', linkText: t('Več ...') }, buttons: [{ form: 'dictionary-domain-labels', type: 'disabled', content: t('Shrani') }] }
   +mainHeader(c)
-
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-2
-      if results.length
-        .d-flex.justify-content-between.mt-2
-          .d-flex.flex-row.mb-4
-            include /components/search-and-filter/inline-search
-          .d-flex
-            include /utilities/pager
-            +pager
-
-        form#dictionary-domain-labels(
-          method="post"
-          action="/api/v1/dictionaries/update-domain-labels"
-        )
-          input#subareas-dict-id(
-            type="hidden"
-            name="dictionaryId"
-            value=dictionary.id
-          )
-          table#all-areas-table.table.areas-table.table-responsive
-            thead
-              tr
-                th.visible-th(scope="col") Vidno
-                th(scope="col") Področna oznaka
-                th(scope="col") 
-            tbody#page-results
-              each result in results
-                tr
-                  input(type="hidden" name="domainLabelId" value=result.id)
-                  th(scope="row")
-                    if result.isVisible
-                      input.form-check.checkbox-table(
-                        type="checkbox"
-                        name="isVisible"
-                        checked
-                        disabled
-                      )
-                    else
-                      input.form-check.checkbox-table(
-                        type="checkbox"
-                        name="isVisible"
-                        disabled
-                      )
-                  td.tdata-area= result.name
-                  td.buttons-group
-                    .table-buttons
-                      button.p-0.table-button-grp.me-3.edit-row-btn(
-                        type="button"
-                      )
-                        img(src="/images/u_edit-alt.svg" alt="")
-                      button.p-0.table-button-grp.delete-row-btn(
-                        type="button"
-                        data-bs-target="#alert-modal"
-                        data-bs-toggle="modal"
-                      )
-                        img(src="/images/red-trash-icon.svg" alt="")
-      else
-        form#dictionary-domain-labels(
-          method="post"
-          action="/api/v1/dictionaries/update-domain-labels"
-        )
-          input#subareas-dict-id(
-            type="hidden"
-            name="dictionaryId"
-            value=dictionary.id
-          )
-          #subareas-info.d-flex.justify-content-center.mt-5
-            p Niste vnesli področnih oznak.
-          #no-subareas-section.d-none
-            .d-flex.justify-content-between.mt-4
-              .d-flex.flex-row.mb-4
-                include /components/search-and-filter/inline-search
-              .d-flex
-                include /utilities/pager
-                +pager
-
-            table#all-areas-table.table.areas-table.table-responsive
-              thead
-                tr
-                  th.visible-th(scope="col") Vidno
-                  th(scope="col") Področna oznaka
-                  th(scope="col") 
-              tbody
-                tr.hidden(hidden)
-      .row
-        .col-sm-3
-          .subject-name
-            label.input-name-txt PODROČNA OZNAKA
-          input#subarea-input.form-control(type="text")
-        .col.d-flex.align-items-end.mt-2
-          button#add-area.btn.btn-primary(type="submit" disabled) Dodaj
-    include /utilities/modal-alert
-  include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  include /utilities/dictionary-domain-labels-mixin
+  +dictionary-domain-labels

express/views/pages/dictionaries/export.pug

@@ -2,6 +2,7 @@ extends /layout
 
 block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/dictionaries.js")
+  script(nonce=cspNonce src="/javascripts/dictionary-export.js")
 
 block body
   section#fixed-top-section
@@ -12,241 +13,9 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Izvoz', description: 'Vse podatke, ki ste jih vnesli v svoj slovar, lahko izvozite na svoj računalnik ali drugo želeno mesto. Izbrati morate format, v katerem želite pridobiti podatke.', buttons: [] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Izvoz'), description: t('Terminološke slovarje lahko v celoti ali po izbranih kriterijih izvozite v različnih formatih in shranite na svojem računalniku.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-2
-      .row.validity.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Veljavnost
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#validKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="validKeys"
-                  )
-                    | Veljavni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notValidKeys.form-check-input(
-                    type="radio"
-                    name="flexRadioDefault"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notValidKeys"
-                  )
-                    | Neveljavni
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, katere slovarske sestavke želite izpisati glede na njihovo veljavnost.
-      .row.posted.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Objavljeno
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allPostedKeys.form-check-input(
-                    type="radio"
-                    name="posted"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allPostedKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyPosted.form-check-input(type="radio" name="posted")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyPosted"
-                  )
-                    | Objavljeni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notPosted.form-check-input(type="radio" name="posted")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notPosted"
-                  )
-                    | Neobjavljeni
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo objavljene ali tudi neobjavljene slovarske sestavke.
-      .row.phases.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Faze urejanja
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allEditedKeys.form-check-input(
-                    type="radio"
-                    name="edited"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0.text-nowrap(
-                    for="allEditedKeys"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#editedKeys.form-check-input(type="radio" name="edited")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="editedKeys"
-                  )
-                    | Urejeni
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#inEditing.form-check-input(type="radio" name="edited")
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="inEditing"
-                  )
-                    | V urejanju
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati vse slovarske sestavke ali samo tiste, ki so v določeni fazi urejanja.
-      .row.proffesional-check.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Strokovni pregled
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="allChecked"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyProffesionallyChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyProffesionallyChecked"
-                  )
-                    | Pregledani
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notProffesionallyChecked.form-check-input(
-                    type="radio"
-                    name="professionallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notProffesionallyChecked"
-                  )
-                    | Nepregledani
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo strokovno pregledane slovarske sestavke.
-      .row.terminology-check.align-items-center
-        .col-xxl-6.col-md-7
-          span.header-table-wrapper Jezikovni pregled
-            ul.d-sm-flex.validity-row.ps-2.mb-0.mb-md-2
-              .options-width-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#allGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                    checked
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="allGramaticallyChecked"
-                  )
-                    | Vsi slovarski sestavki
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#onlyGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="onlyGramaticallyChecked"
-                  )
-                    | Pregledani
-              .options-another-box
-                li.form-check.radio-button.ms-0.ps-3
-                  input#notGramaticallyChecked.form-check-input(
-                    type="radio"
-                    name="gramaticallyChecked"
-                  )
-                  label.radio-button-labels.form-check-label.ms-0(
-                    for="notGramaticallyChecked"
-                  )
-                    | Nepregledani
-        .col.mb-3.mb-md-0
-          span.name-info-txt Izberite, ali želite izpisati samo jezikovno pregledane slovarske sestavke.
-      .file-type
-        span.new-user-info FORMAT ZAPISA
-        .row.align-items-center
-          .col-xxl-6.col-md-7
-            .form-check.radio-button.ms-2.ps-3
-              input#file-format-xml.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="xml"
-                checked
-              )
-              label.form-check-label.ms-0(for="file-format-xml")
-                | XML
-            .form-check.radio-button.ms-3
-              input#file-format-csv.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="csv"
-              )
-              label.form-check-label.ms-0(for="file-format-csv")
-                | CSV
-            .form-check.radio-button.ms-3
-              input#file-format-tsv.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="tsv"
-              )
-              label.form-check-label.ms-0(for="file-format-tsv")
-                | TSV
-            .form-check.radio-button.ms-3
-              input#file-format-txt.form-check-input(
-                type="radio"
-                name="importFileFormat"
-                value="txt"
-              )
-              label.form-check-label.ms-0(for="file-format-txt")
-                | TXT
-          .col.mb-3.mb-md-0
-            span.name-info-txt Izberite format izpisa vašega slovarja.
-        button.btn.btn-primary.mt-4 IZVOZI
-        .latest-exports.mt-4
-          .d-flex.w-100.justify-content-between
-            .d-flex
-              span.info-text-for-button Zadnji izvozi
-            .d-flex
-              include /utilities/pager
-              +pager(1,2,3,1,3,true)
-          .d-block.w-100
-            include /utilities/table-mixin
-        -
-          const headerRow = ['Datum', 'Vrsta', 'Št. gesel', 'Status']
-          const dataRows = [
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', ""],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}],
-            ['12.12.2012', 'Oznaka', 'Št. gesel', 'Oznaka', {button: {content:"Shrani"}}]
-          ]
-        +tableHeader(headerRow, dataRows)
-
-  include /common/footer
+  include /utilities/dictionary-export-content-mixin
+  +dictionary-export-content(dictionary.id)
+    include /common/footer

express/views/pages/dictionaries/extraction-import.pug

@@ -13,54 +13,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Uvoz iz luščilnika', description: 'Rezultat luščenja so terminološki kandidati. Z uvozom rezultatov posameznega luščenja lahko dopolnite geslovnik terminološkega slovarja, ki ga urejate.', buttons: [] }
+  //- TODO I18n
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Uvoz iz luščilnika'), description: t('Rezultat luščenja so terminološki kandidati. Z uvozom rezultatov posameznega luščenja lahko dopolnite geslovnik terminološkega slovarja, ki ga urejate.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container.mt-3
-      .small-name-area
-        .subject-name
-          span.input-name-txt IME LUŠČENJA
-        .row
-          .col-lg-6
-            select#select-extraction-name.name-input.d-inline.form-control
-              option(selected value="" disabled hidden)= 'Izberite luščenje'
-              each el in extractions
-                option(value=el.id)= el.name
-          .col-sm.d-flex.align-items-center
-            span.name-info-txt.ms-lg-3.mt-2.mt-lg-0 Izberite enega od rezultatov luščenja s seznama.
-      .list-terminology-candidates.mt-4.me-2
-        .d-flex.w-100.justify-content-between
-          .d-flex.align-items-center
-            span.info-text-for-button Seznam terminoloških kandidatov
-          .d-flex
-            include /utilities/pager
-            +pager
-        .table-responsive.mt-2.me-2
-          table.styled-table
-            thead
-              tr
-                th= '#'
-                th= 'KANONIČNA OBLIKA'
-                th= 'RANKING'
-                th= 'POGOSTOST OBJAVLJANJA'
-            tbody#page-results
-        .row.mt-4
-          .me-0.pe-0.d-flex.align-items-center
-            span.radio-button-labels Uvozi termine od številke
-            input.without-arrows.form-control.terminology-input.ms-1(
-              type="number"
-              maxlength="5"
-              name="from"
-              min="0"
-            )
-            span.radio-button-labels.ms-1 do številke
-            input.without-arrows.form-control.terminology-input.ms-1(
-              type="number"
-              maxlength="5"
-              name="to"
-              min="0"
-            )
-
-        button.btn.btn-primary.mt-4(disabled) UVOZI
-
-  include /common/footer
+  include /utilities/dictionary-extraction-import-mixin
+  +dictionary-extraction-import

express/views/pages/dictionaries/import.pug

@@ -1,5 +1,4 @@
 extends /layout
-
 block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/dictionaries.js")
 
@@ -12,143 +11,8 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionaryName, h1: 'Uvoz iz datoteke', description: 'Če imate pripravljen slovar v enem od formatov, ki so navedeni spodaj, lahko svoje podatke uvozite.', buttons: [] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionaryName, h1: t('Uvoz iz datoteke'), description: t('Če imate pripravljen slovar v enem od formatov, ki so navedeni spodaj, lahko svoje podatke uvozite.'), buttons: [] }
   +mainHeader(c)
-  .content-hold-prerequisites
-    #offset-main.main-container
-      .import-container.mt-3.ms-1
-        form#file-import-form(method="post" enctype="multipart/form-data")
-          .file-type
-            span.new-user-info DATOTEKA
-          .row
-            .col-md-6.ms-2.white-border-background.p-4.d-flex.align-items-center.justify-content-between
-              .align-items-center.d-flex
-                span#chosen-file.info-text-for-button Izberi datoteko
-              div
-                label(for="upload")
-                  button#button-import.btn.btn-primary(type="button") IZBERI
-                input#upload(
-                  type="file"
-                  name="dictionaryImportFile"
-                  accept=".xml"
-                )
-
-            .col-md.d-flex.align-items-center
-              span.name-info-txt Izberite slovarske podatke, ki ste jih shranili na svojem računalniku.
-          .file-type.mt-4
-            span.new-user-info NAČIN UVOZA
-            .row
-              .col-sm-6.ms-2
-                .checkbox
-                  input#flexCheckDefault.form-check-input(
-                    type="checkbox"
-                    name="deleteExistingEntries"
-                  )
-                  label.form-check-label(for="flexCheckDefault")
-                    span.user-email Izbriši obstoječe slovarske sestavke.
-              .col
-                span.name-info-txt Če izberete to možnost, se bodo vsi doslejšnji slovarski sestavki ob uvozu nove datoteke izbrisali.
-          .file-type.mt-4
-            span.new-user-info FAZA UREJANJA
-            #file-type-selection.file-types
-              .row
-                .col-sm-6.ms-2
-                  .form-check.radio-button.ms-0.ps-3
-                    input#in-edit-radio.form-check-input(
-                      type="radio"
-                      name="entryStatus"
-                      value="inEdit"
-                      checked
-                    )
-                    label.form-check-label.ms-0(for="in-edit-radio")
-                      | V urejanju
-                  #complete-radio.form-check.radio-button.ms-3
-                    input#complete-radio.form-check-input(
-                      type="radio"
-                      name="entryStatus"
-                      value="complete"
-                    )
-                    label.form-check-label.ms-0(for="complete-radio")
-                      | Urejeno
-                .col
-                  span.name-info-txt Z izbiro te možnosti boste pobrisali samo slovarske sestavke, ki so v določeni fazi urejanja.
-          .file-type.mt-4
-            span.new-user-info FORMAT ZAPISA
-            #file-type-selection.file-types
-              .row
-                .col-sm-6.ms-2.text-nowrap
-                  .form-check.radio-button.ms-0.ps-3
-                    input#file-format-xml.form-check-input(
-                      type="radio"
-                      name="importFileFormat"
-                      value="xml"
-                      checked
-                    )
-                    label.form-check-label.ms-0(for="file-format-xml")
-                      | XML
-                  .form-check.radio-button.ms-2
-                    input#file-format-csv.form-check-input(
-                      type="radio"
-                      name="importFileFormat"
-                      value="csv"
-                    )
-                    label.form-check-label.ms-0(for="file-format-csv")
-                      | CSV
-                  .form-check.radio-button.ms-2
-                    input#file-format-tsv.form-check-input(
-                      type="radio"
-                      name="importFileFormat"
-                      value="tsv"
-                    )
-                    label.form-check-label.ms-0(for="file-format-tsv")
-                      | TSV
-                  .form-check.radio-button.ms-2
-                    input#file-format-txt.form-check-input(
-                      type="radio"
-                      name="importFileFormat"
-                      value="txt"
-                    )
-                    label.form-check-label.ms-0(for="file-format-txt")
-                      | TXT
-                .col
-                  span.name-info-txt Izberite format datoteke, v kateri je slovar shranjen na vašem računalniku.
-          .file-type.mt-4
-            button.btn.btn-primary.mt-4 UVOZI
-        .latest-uploads.mt-4
-          .d-flex.w-100.justify-content-between
-            .d-flex
-              span.info-text-for-button Zadnji uvozi test
-            .d-flex
-              include /utilities/pager
-              +pager
-
-          -
-            const localeOptions = {
-              day: '2-digit',
-              month: '2-digit',
-              year: 'numeric',
-              hour: '2-digit',
-              minute: '2-digit',
-              second: '2-digit'
-            }
-          if imports.length
-            .table-responsive
-              table.styled-table
-                thead
-                  tr
-                    th= 'DATUM'
-                    th= 'VRSTA'
-                    th= 'ŠT. GESEL'
-                    th= 'STATUS'
-                    th= ''
-
-                    each element in imports
-                      tr
-                        td= element.timeStarted.toLocaleDateString('sl-SL', localeOptions)
-                        td= element.fileFormat
-                        td= element.countValidEntries
-                        td= element.status
-          else
-            p Ni še dodanih uvozov.
-
-  include /common/footer
+  include /utilities/dictionary-import-mixin
+  +dictionary-import(dictionary.id)

express/views/pages/dictionaries/list.pug

@@ -11,7 +11,7 @@ block body
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
   if user
-    - const c = { sideMenu: false, h2: 'Urejanje', h1: 'Moji slovarji', description: 'Nabor vseh slovarjev, ki jih uporabnik lahko ureja kot glavni urednik ali pa ima dodeljeno pravico urejanja, pregledovanja, popravljanja ipd.', buttons: [{ type: 'link', content: 'Nov slovar', url: '/slovarji/nov' }] }
+    - const c = { sideMenu: false, h2: t('Urejanje'), h1: t('Moji slovarji'), description: t('Nabor vseh slovarjev, ki jih uporabnik lahko ureja kot glavni urednik ali pa ima dodeljeno pravico urejanja, pregledovanja, popravljanja ipd.'), buttons: [{ type: 'link', content: t('Nov slovar'), url: '/slovarji/nov' }] }
     +mainHeader(c)
     .content-hold-prerequisites
       #offset-main.ps-3.pe-3
@@ -26,56 +26,64 @@ block body
             div(
               class=index ? 'container-fluid dictionary-content mt-4 pb-2 pt-1' : 'container-fluid dictionary-content mt-3 pb-2 pt-1'
             )
+              //- TODO I18n 
               p.dictionary-title.mb-2.mt-2.ms-2= dictionary.nameSl
               hr.me-2.mt-0.ms-2.mb-4
               .container-fluid
                 .d-sm-flex
                   .d-lg-flex
                     .d-sm-flex.mt-2
-                      span.dictionary-attributes.me-3.text-nowrap Število terminov
+                      span.dictionary-attributes.me-3.text-nowrap= t('Število terminov')
                       span.dictionary-value.me-5= dictionary.countEntries
                     .d-sm-flex.mt-2
-                      span.dictionary-attributes.me-3.ms-xl-5.text-nowrap Zadnja sprememba
+                      span.dictionary-attributes.me-3.ms-xl-5.text-nowrap= t('Zadnja sprememba')
                       span.dictionary-value.me-md-5.me-2.d-block= dictionary.timeModified.toLocaleDateString('sl-SL', localeOptions)
                   .d-lg-flex
                     .d-sm-flex.mt-2
-                      span.dictionary-attributes.me-3.ms-xl-5.d-inline Status
-                      span.dictionary-value.me-5= dictionary.status === 'closed' ? 'zaprt' : dictionary.status === 'reviewed' ? 'v predogledu' : 'odprt'
+                      span.dictionary-attributes.me-3.ms-xl-5.d-inline= t('Status')
+                      span.dictionary-value.me-5= dictionary.status === 'closed' ? t('zaprt') : dictionary.status === 'reviewed' ? t('v predogledu') : t('odprt')
                     .d-sm-flex.mt-2
-                      span.dictionary-attributes.me-3.ms-lg-0.ms-xl-5.d-inline Komentarji
+                      span.dictionary-attributes.me-3.ms-lg-0.ms-xl-5.d-inline= t('Komentarji')
                       span.dictionary-value.me-5= dictionary.countComments
                 .container-fluid.d-md-flex.p-0.mt-3.justify-content-between
                   .d-xl-flex.justify-content-between
-                    a.btn.btn-secondary.mb-2.mt-2.w-100.w-sm-none(
-                      href=`/slovarji/${dictionary.id}/podatki`
-                    )
-                      img.d-inline(src="/images/vector.svg" alt="")
-                      span.ms-1.text-nowrap Uredi lastnosti
-                    a.btn.btn-secondary.mb-2.mt-2.ms-xl-4.w-100.w-sm-none(
+                    if dictionary.isAdmin
+                      a.btn.border-header.mb-2.mt-2.w-100.w-sm-none(
+                        href=`/slovarji/${dictionary.id}/podatki`
+                      )
+                        img.d-inline(src="/images/vector.svg" alt="")
+                        span.ms-1.text-nowrap= t('Uredi lastnosti')
+                    else
+                      a.btn.border-header.mb-2.mt-2.w-100.w-sm-none.disabled(
+                        href=`/slovarji/${dictionary.id}/podatki`
+                      )
+                        img.d-inline(src="/images/vector.svg" alt="")
+                        span.ms-1.text-nowrap= t('Uredi lastnosti')
+                    a.btn.border-header.mb-2.mt-2.ms-xl-4.w-100.w-sm-none(
                       href=`/slovarji/${dictionary.id}/vsebina`
                     )
                       img.d-inline(src="/images/book-colorized.svg" alt="")
-                      span.ms-1.text-nowrap Uredi vsebino
+                      span.ms-1.text-nowrap= t('Uredi vsebino')
                   .ms-md-4.ms-xl-auto.d-xl-flex.justify-content-between
-                    a.btn.btn-secondary.mb-2.mt-2.me-4.w-100.w-sm-none(
+                    a.btn.border-header.mb-2.mt-2.me-4.w-100.w-sm-none(
                       href=`/slovarji/${dictionary.id}/uvoz/datoteka`
                     )
                       img.d-inline(src="/images/fi_upload.svg" alt="")
-                      span.ms-1 Uvoz
-                    a.btn.btn-secondary.mb-2.mt-2.w-100.w-sm-none(
+                      span.ms-1= t('Uvoz')
+                    a.btn.border-header.mb-2.mt-2.w-100.w-sm-none(
                       href=`/slovarji/${dictionary.id}/izvoz`
                     )
                       img.d-inline(src="/images/fi_download.svg" alt="")
-                      span.ms-1 Izvoz
+                      span.ms-1= t('Izvoz')
         else
           .d-flex.justify-content-center.mt-5
-            p Nimate slovarjev za urejanje.
+            p= t('Nimate slovarjev za urejanje.')
   else
-    - const c = { sideMenu: false, h2: 'Urejanje', h1: 'Moji slovarji', description: 'Nabor vseh slovarjev, ki jih uporabnik lahko ureja kot glavni urednik ali pa ima dodeljeno pravico urejanja, pregledovanja, popravljanja ipd.' }
+    - const c = { sideMenu: false, h2: t('Urejanje'), h1: t('Moji slovarji'), description: t('Nabor vseh slovarjev, ki jih uporabnik lahko ureja kot glavni urednik ali pa ima dodeljeno pravico urejanja, pregledovanja, popravljanja ipd.') }
     +mainHeader(c)
     .content-hold-prerequisites.pe-md-5.ps-4.pe-2
       #offset-main.pe-3.ps-2
         .d-flex.justify-content-center.mt-5
-          p Za urejanje slovarjev morate biti prijavljeni.
+          p= t('Za urejanje slovarjev morate biti prijavljeni.')
 
   include /common/footer

express/views/pages/dictionaries/new.pug

@@ -11,7 +11,7 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = {sideMenu:false, h2: 'Urejanje', h1: 'Nov slovar', description: 'Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.', helpLink: { linkHref: '/pomoc#help-editor', linkText: 'Več ...' }, buttons: [{ type: 'cancel', content: 'Prekliči', classAtr:"btn btn-secondary header-btn-secondary link-back" },{ type: 'button', content: 'Ustvari', form: 'form-dictionary-new' }] }
+  - const c = {sideMenu:false, h2: t('Urejanje'), h1: t('Nov slovar'), description: t('Izpolnite polja in na kratko opišite vsebino terminološkega slovarja.'), helpLink: { linkHref: '/pomoc#help-editor', linkText: 'Več ...' }, buttons: [{ type: 'cancel', content: 'Prekliči', classAtr:"btn btn-secondary header-btn-secondary link-back" },{ type: 'button', content: t('Ustvari'), form: 'form-dictionary-new' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.container-fluid.mt-4.ps-sm-3

express/views/pages/dictionaries/structure.pug

@@ -12,12 +12,12 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Struktura slovarskega sestavka', description: 'V tem razdelku lahko določite elemente slovarskega sestavka. Z izbiro elementov se vam prikazuje podoba slovarskega sestavka. Izbiro lahko tudi med urejanjem vsebine kadarkoli spremenite.', helpLink: { linkHref: '/pomoc', linkText: 'Več ...' }, buttons: [{ type: 'disabled', content: 'Shrani', form: 'form-dictionary-structure' }] }
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Struktura slovarskega sestavka'), description: t('V tem razdelku lahko določite elemente slovarskega sestavka. Z izbiro elementov se vam prikazuje podoba slovarskega sestavka. Izbiro lahko tudi med urejanjem vsebine kadarkoli spremenite.'), helpLink: { linkHref: '/pomoc#help-structure-dict', linkText: t('Več ...') }, buttons: [{ type: 'disabled', content: t('Shrani'), form: 'form-dictionary-structure' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container
       form#form-dictionary-structure.needs-validation(method="post" novalidate)
         include /utilities/dictionary-structure-input
+      include /common/footer
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/dictionaries/users.pug

@@ -12,12 +12,13 @@ block body
   +sideNavigation(d)
 
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: 'Uporabniki', description: 'Registrirani uporabniki lahko dobijo različne vloge na portalu. Kot administrator jim lahko dodelite tudi vlogo skrbnika slovarjev in/ali skrbnika svetovalnice.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'admin-dictionary-users' }] }
+  //- TODO I18n 
+  - const c = { sideMenu: true, h2: dictionary.nameSl, h1: t('Uporabniki'), description: t('Registrirani uporabniki lahko dobijo različne vloge na portalu. Kot administrator jim lahko dodelite tudi vlogo skrbnika slovarjev in/ali skrbnika svetovalnice.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'admin-dictionary-users' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.main-container.mt-1
       form#admin-dictionary-users.container-xxl.ms-0.ps-0(method="post")
-        span.users-subtitle-txt.ms-0 Faze urejanja
+        span.users-subtitle-txt.ms-0= t('Faze urejanja')
         .row.align-items-center.mt-2
           .col-sm-6
             .switch-forms-and-key-word.d-md-flex.mt-2
@@ -28,10 +29,10 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="preposition") Predlog
+                  label.form-check-label(for="preposition")= t('Predlog')
 
           .col-sm
-            span.name-info-txt V slovarju so samo terminološki kandidati. Slovarja ne morete objaviti.
+            span.name-info-txt= t('V slovarju so samo terminološki kandidati. Slovarja ne morete objaviti.')
 
         .row.align-items-center
           .col-sm-6
@@ -43,11 +44,11 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="editing") V urejanju
+                  label.form-check-label(for="editing")= t('V urejanju')
 
           .col-sm
-            span.name-info-txt Slovarski sestavek je v fazi, ko se dodajajo in oblikujejo elementi, ki ste jih izbrali v strukturi slovarskega sestavka.
-            a.ms-1.name-info-txt(href="/pomoc#help-users-dict" target="_blank") Več...
+            span.name-info-txt= t('Slovarski sestavek je v fazi, ko se dodajajo in oblikujejo elementi, ki ste jih izbrali v strukturi slovarskega sestavka.')
+            a.ms-1.name-info-txt(href="/pomoc#help-users-dict" target="_blank")= t('Več...')
 
         .row.align-items-center
           .col-sm-6
@@ -59,9 +60,9 @@ block body
                     disabled
                     checked
                   )
-                  label.form-check-label(for="edited") Urejeno
+                  label.form-check-label(for="edited")= t('Urejeno')
           .col-sm
-            span.name-info-txt Slovarski sestavek je pregledan in dokončan.
+            span.name-info-txt= t('Slovarski sestavek je pregledan in dokončan.')
 
         .row.align-items-center.mt-2
           .col-sm-6
@@ -74,16 +75,16 @@ block body
                       name="hasTerminologyReview"
                       checked
                     )
-                    label.form-check-label(for="terminology_review") Strokovno pregledano
+                    label.form-check-label(for="terminology_review")= t('Strokovno pregledano')
                 else
                   .form-check.form-switch.d-flex
                     input#terminology_review.form-check-input(
                       type="checkbox"
                       name="hasTerminologyReview"
                     )
-                    label.form-check-label(for="terminology_review") Strokovno pregledano
+                    label.form-check-label(for="terminology_review")= t('Strokovno pregledano')
           .col-sm
-            span.name-info-txt Slovar je pregledal področni strokovnjak.
+            span.name-info-txt= t('Slovar je pregledal področni strokovnjak.')
 
         .row.align-items-center.mt-2
           .col-sm-6
@@ -96,35 +97,35 @@ block body
                       name="hasLanguageReview"
                       checked
                     )
-                    label.form-check-label(for="language_review") Jezikovno pregledano
+                    label.form-check-label(for="language_review")= t('Jezikovno pregledano')
                 else
                   .form-check.form-switch.d-flex
                     input#language_review.form-check-input(
                       type="checkbox"
                       name="hasLanguageReview"
                     )
-                    label.form-check-label(for="language_review") Jezikovno pregledano
+                    label.form-check-label(for="language_review")= t('Jezikovno pregledano')
 
           .col-sm
-            span.name-info-txt Slovar je pregledal jezikoslovec.
+            span.name-info-txt= t('Slovar je pregledal jezikoslovec.')
 
         .container-xl.mt-4.ms-0.ps-0
-          span.users-subtitle-txt.ms-0.mt-3 Uporabniške pravice/vloge
+          span.users-subtitle-txt.ms-0.mt-3= t('Uporabniške pravice/vloge')
             table#user-roles-table.table-users.table-borderless.align-middle.mt-3
               thead
                 tr
                   th.col-2
-                    span.user-rights-column-title Uporabnik
+                    span.user-rights-column-title= t('Uporabnik')
                   th.col-2
-                    span.user-rights-column-title Administracija
+                    span.user-rights-column-title= t('Administracija')
                   th.col-2.text-center
-                    span.user-rights-column-title Urejanje
+                    span.user-rights-column-title= t('Urejanje')
                   th.col-2
-                    span#txt-term-rev.user-rights-column-title Strokovni pregled
+                    span#txt-term-rev.user-rights-column-title= t('Strokovni pregled')
                   th.col-2
-                    span#txt-lang-rev.user-rights-column-title Jezikovni pregled
+                    span#txt-lang-rev.user-rights-column-title= t('Jezikovni pregled')
                   th.col-1.justify-content-center
-                    span.hidden-text Izbriši polje
+                    span.hidden-text= t('Izbriši polje')
 
               if userRights
                 each el in userRights
@@ -207,7 +208,7 @@ block body
       form#form-add-user.container-xl.new-user-input.mt-4.ps-0.ms-0(
         action="/api/v1/users/addUser"
       )
-        span.new-user-info NOV UPORABNIK
+        span.new-user-info= t('NOV UPORABNIK')
         .row.d-flex.justify-content-lg-start.align-items-center.mt-2.ms-0.ps-0
           .col-lg-6.ms-0.ps-0.me-2
             input.name-input.d-inline.form-control.ms-0.ps-0(
@@ -216,13 +217,13 @@ block body
               autocomplete="off"
             )
           .col.ms-xl-4.ms-0.ps-0.d-flex.justify-content-start.mt-2.mt-lg-0
-            button.btn.btn-primary Dodaj
+            button.btn.btn-primary= t('Dodaj')
 
       - const minEntriesNum = parseInt(minEntries)
       - const countEntries = parseInt(entriesCount)
       .container-xxl.ms-0.ps-0
-        .row.align-items-center
-          .col-sm-6.mt-4
+        .row.align-items-center.mt-4
+          .col-sm-6
             .switch-forms-and-key-word.d-md-flex
               .form-check.form-switch.d-flex
                 if publishApproval === 'F'
@@ -263,21 +264,20 @@ block body
                       form="admin-dictionary-users"
                       checked
                     )
-                label.form-check-label(for="publish-switch") Slovar odprt
+                label.form-check-label(for="publish-switch")= t('Slovar odprt')
 
           .col-sm
-            span.name-info-txt Slovar je pregledal jezikoslovec.
+            span.name-info-txt= t('Slovar je odprt.')
         if dictionary.status === 'published' && countEntries < minEntriesNum
           .col-sm-6
-            span.mt-3.d-md-inline.d-block.normal-red-note Število slovarskih sestavkov je manjše od zahtevanega števila - povečajte število slovarskih sestavkov, sicer ga skrbnik slovarjev lahko zapre
+            span.mt-3.d-md-inline.d-block.normal-red-note= t('Število slovarskih sestavkov je manjše od zahtevanega števila - povečajte število slovarskih sestavkov, sicer ga skrbnik slovarjev lahko zapre')
         if publishApproval === 'T' && dictionary.status === 'reviewed'
           .col-sm-6
-            span.mt-3.d-md-inline.d-block.normal-red-note Slovar je v odpiranju - čaka na potrditev skrbnika slovarjev
+            span.mt-3.d-md-inline.d-block.normal-red-note= t('Slovar je v odpiranju - čaka na potrditev skrbnika slovarjev')
 
+      include /common/footer
     include /utilities/modal-alert
     include /utilities/modal-response
     +responseModal
   include /utilities/modal-alert-mixin
-  +alertModal('unsaved-data', 'Shrani', 'Ne', 'modal-save-btn', 'modal-dont-save-btn', 'Imate neshranjene spremebe. Ali jih želite shraniti?')
-
-  include /common/footer
+  +alertModal('unsaved-data', t('Shrani'), t('Ne'), 'modal-save-btn', 'modal-dont-save-btn', t('Imate neshranjene spremebe. Ali jih želite shraniti?'))

express/views/pages/extraction/docs-edit.pug

@@ -11,7 +11,7 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { noSidebar: false, hrefurl: '.', h2: 'Luščenje iz lastnih besedil | dodaj opravilo ', h1: 'Uporabnikovi dokumenti', description: 'Uporabnik na tem mestu izdela specializirani korpus iz besedil, ki jih je zbral in shranil sam. Besedila naj bodo izbrana po načelih tvorjenja specializiranih korpusov. Za uspešno luščenje priporočamo najmanj 10 besedil. Vsa besedila naj bodo shranjena v besedilnem formatu (.txt). Luščenje podpira tudi formate .docx in .pdf, vendar so rezultati slabši.', buttons: [{ type: 'cancel', content: 'Nazaj', classAtr: 'btn btn-secondary header-btn-secondary link-back' }] }
+  - const c = { noSidebar: false, hrefurl: '.', h2: t('Luščenje iz lastnih besedil | dodaj opravilo '), h1: t('Uporabnikovi dokumenti'), description: t('Uporabnik na tem mestu izdela specializirani korpus iz besedil, ki jih je zbral in shranil sam. Besedila naj bodo izbrana po načelih tvorjenja specializiranih korpusov. Za uspešno luščenje priporočamo najmanj 10 besedil. Vsa besedila naj bodo shranjena v besedilnem formatu (.txt). Luščenje podpira tudi formate .docx in .pdf, vendar so rezultati slabši.'), buttons: [{ type: 'cancel', content: t('Naprej'), classAtr: 'btn border-header header-btn-secondary link-back' }] }
   +mainHeader(c)
   .content-hold-prerequisites.mt-2
     #offset-main
@@ -19,24 +19,24 @@ block body
         .table-responsive
           table.styled-table
             thead
-              tr
+              tr#thead
                 th= 'ID'
-                th= 'IME DATOTEKE'
-                th= 'VELIKOST'
-                th= 'DATUM'
+                th= t('IME DATOTEKE')
+                th= t('VELIKOST')
+                th= t('DATUM')
                 th= ''
             tbody#files-list
               each document, index in extractionDocuments
                 tr
-                  td= index + 1
-                  td.filename= document.filename
-                  td= document.size
-                  td= new Date(document.timeModified).toLocaleDateString('sl-SL')
-                  td
-                    button.p-0.delete-file.delete-btn-table(type="button")
-                      img(src="/images/red-trash-icon.svg" alt="Izbriši")
-                      span.ms-2 Briši
-      .row.ms-2.me-2.align-items-center.mt-4
+                  td.file-index= index + 1
+                  td.file-name= document.filename
+                  td.file-size= document.size
+                  td.file-date-modified= new Date(document.timeModified).toLocaleDateString('sl-SL')
+                  td.file-last-cell
+                    button.p-0.delete-file.delete-btn-table
+                      img(src="/images/red-trash-icon.svg" alt="")
+                      span.ms-2= t('Briši')
+      #upload-files-container.row.ms-2.me-2.align-items-center.mt-4
         form#upload-files.col-sm-5.upload-a-file-field.p-2.align-items-center.d-flex(
           method="post"
           enctype="multipart/form-data"
@@ -44,7 +44,7 @@ block body
           input(type="hidden" name="extractionId" value=id)
           .col-sm-5.upload-inner-border.w-100.justify-content-center.d-sm-flex.p-3.drag-area
             div
-              button.btn.btn-primary(type="button") Dodaj datoteko
+              button.btn.btn-primary(type="button")= t('Dodaj datoteko')
               input#upload(
                 type="file"
                 name="extractionFile"
@@ -53,7 +53,7 @@ block body
                 hidden
               )
         .col.d-flex.align-items-center.ms-md-3
-          span.gray-info Dodaj besedilo za luščenje terminoloških kandidatov iz lastnega specializiranega korpusa. Ko boste dodali vsa besedila, ki ste jih izbrali, morate izbiro shraniti.
-  include /utilities/modal-spinner
+          span.gray-info= t('Dodaj besedilo za luščenje terminoloških kandidatov iz lastnega specializiranega korpusa. Ko boste dodali vsa besedila, ki ste jih izbrali, morate izbiro shraniti.')
+  //- include /utilities/modal-spinner
   include /utilities/modal-alert
   include /common/footer

express/views/pages/extraction/edit-oss.pug

@@ -11,14 +11,14 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { noSidebar: false, hrefurl: '/luscenje', h2: 'Luščenje iz korpusa besedil OSS', h1: 'Korpus OSS', description: 'Luščenje terminoloških kandidatov iz besedil, ki so že predhodno oblikoslovno označena, nudi dobre rezultate, vendar je treba nabor besedil omejiti. Svetujemo vam, da zoožite področje in dodatno omejite izbiro s tipi besedil in časovnim razponom, v katerih so nastala. Ko vnesete podatke, morate vse spremembe shraniti. Po vnosu podatkov, s katerimi boste omejili nabor izbranih besedil, morate pritisniti gumb Najdi. Izbiro boste shranili lahko le v primeru, da ne bo število najdenih dokumentov preveliko.', buttons: [{ type: 'cancel', url: '/luscenje', content: 'Nazaj', classAtr: 'btn btn-secondary header-btn-secondary' }] }
+  - const c = { noSidebar: false, hrefurl: '/luscenje', h2: t('Luščenje iz korpusa besedil OSS'), h1: t('Korpus OSS'), description: t('Luščenje terminoloških kandidatov iz besedil, ki so že predhodno oblikoslovno označena, nudi dobre rezultate, vendar je treba nabor besedil omejiti. Svetujemo vam, da zoožite področje in dodatno omejite izbiro s tipi besedil in časovnim razponom, v katerih so nastala. Ko vnesete podatke, morate vse spremembe shraniti. Po vnosu podatkov, s katerimi boste omejili nabor izbranih besedil, morate pritisniti gumb Najdi. Izbiro boste shranili lahko le v primeru, da ne bo število najdenih dokumentov preveliko.'), buttons: [{ type: 'cancel', url: '/luscenje', content: t('Naprej'), classAtr: 'btn border-header header-btn-secondary' }] }
   +mainHeader(c)
   .content-hold-prerequisites
     #offset-main.mt-2
       form#form-edit-oss(method="post")
         .title
           .subject-name
-            label.smaller-black-uppercase(for="name") IME
+            label.smaller-black-uppercase(for="name")= t('IME')
           .row
             .col-sm-6
               input.name-input.form-control.d-inline(
@@ -27,11 +27,11 @@ block body
                 value=extraction.name
               )
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Izberite takšno ime, ki vam bo pomagalo slediti rezultatom, če boste luščenje besedil opravili večkrat.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Izberite takšno ime, ki vam bo pomagalo slediti rezultatom, če boste luščenje besedil opravili večkrat.')
 
         .cerif.mt-4
           .subject-name
-            label.smaller-black-uppercase PODROČJE
+            label.smaller-black-uppercase= t('PODROČJE')
           .row 
             .col-sm-6
               select.name-input.form-control.d-inline(name="domain")
@@ -42,17 +42,18 @@ block body
                     selected=domain.id === extraction.domainId
                   )= domain.nameSl
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Izberite področje iz seznama področij, da zmanjšate obseg besedil, iz katerih bo potekalo luščenje.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Izberite področje iz seznama področij, da zmanjšate obseg besedil, iz katerih bo potekalo luščenje.')
 
         .cerif.mt-4
           .subject-name
-            label.smaller-black-uppercase VRSTA DOKUMENTA
+            label.smaller-black-uppercase= t('VRSTA DOKUMENTA')
           .row
             .col-sm-6
               select.pick-multiple.name-input.form-control.d-inline(
                 name="documentType"
                 multiple
               )
+                //- TODO i18n - Angleški šifrant, baza, itd.?
                 option
                 option(
                   value=101
@@ -295,11 +296,11 @@ block body
                   selected=extraction.documentType.includes(325)
                 ) Druga izvedena dela
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Izberite vrsto dokumenta iz seznama, npr. članek, diplomsko delo.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Izberite vrsto dokumenta iz seznama, npr. članek, diplomsko delo.')
 
         .year.mt-4
           .subject-name
-            label.smaller-black-uppercase LETO
+            label.smaller-black-uppercase= t('LETO')
           .row
             .col-sm-6
               select.enter-multiple.name-input.form-control.d-inline(
@@ -309,11 +310,11 @@ block body
                 each year in extraction.year
                   option(value=year selected)= year
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Dodajte leto izida besedil, ki jih želite luščiti. Lahko dodate več posameznih let. Če boste polje pustili prazno, bodo vključena vsa leta. Če bo besedil preveč, boste morali omejiti izbiro.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('Dodajte leto izida besedil, ki jih želite luščiti. Lahko dodate več posameznih let. Če boste polje pustili prazno, bodo vključena vsa leta. Če bo besedil preveč, boste morali omejiti izbiro.')
 
         .words.mt-4
           .subject-name
-            label.smaller-black-uppercase KLJUČNE BESEDE
+            label.smaller-black-uppercase= t('KLJUČNE BESEDE')
           .row
             .col-sm-6
               select.enter-multiple.name-input.form-control.d-inline(
@@ -323,15 +324,15 @@ block body
                 each keyword in extraction.keywords
                   option(value=keyword selected)= keyword
             .col-sm.d-flex.align-items-center
-              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 S ključnimi besedami, ki so vključene v večino znanstvenih in strokovnih, lahko bolj natančno izberete besedila, ki jih želite uporabiti za luščenje terminoloških kandidatov.
+              span.d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3= t('S ključnimi besedami, ki so vključene v večino znanstvenih in strokovnih, lahko bolj natančno izberete besedila, ki jih želite uporabiti za luščenje terminoloških kandidatov.')
         .table-kas.mt-5.d-sm-flex
           .d-flex.flex-column.col-sm-6
             .personal-documents.justify-content-between.d-flex.align-items-center
-              span.smaller-black-uppercase (STOP) Termini
+              span.smaller-black-uppercase= t('(STOP) Termini')
               a#edit-stop-terms.btn.btn-primary.button-edit.align-items-center.d-flex.justify-content-center.me-2(
                 type="link"
                 href=`${id}/stop-termini`
-              ) Uredi
+              )= t('Uredi')
             div
               table.table.mt-2
                 tbody
@@ -341,23 +342,23 @@ block body
                       td.text-sm-start.normal-gray= file.filename
                       td.text-sm-end.normal-gray= file.size
           .col.d-flex.ms-2
-            .d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3 Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. Vse spremembe morate shraniti. #[a.smaller-gray-info(href="/pomoc#help-stop-lists") Več...]
+            .d-md-inline.d-block.smaller-gray-info.ms-xxl-3.ms-md-3!= t('Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. Vse spremembe morate shraniti. <a class="smaller-gray-info" href="/pomoc#help-stop-lists">Več...</a>')
 
       .col-sm-4.mt-5
-        button#search-btn.btn.btn-primary(type="button") Najdi
+        button#search-btn.btn.btn-primary(type="button")= t('Najdi')
 
       #search-result
         .task.task-completed.p-3.mb-3.mt-4.d-none
           .d-sm-flex.justify-content-between
             .d-sm-grid
-              span.normal-gray Število dokumentov
+              span.normal-gray= t('Število dokumentov')
               span#results-count.bold-weight-black 
             .d-sm-flex.align-items-center
               button#save-params.btn.btn-primary.align-items-center.d-flex(
                 disabled
               )
                 img(src="/images/external-link-white.svg")
-                span.ms-1 Shrani
+                span.ms-1= t('Shrani')
 
   include /utilities/modal-spinner
   include /utilities/modal-alert

express/views/pages/extraction/edit-own.pug

@@ -2,6 +2,7 @@ extends /layout
 
 block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/extraction.js")
+  script(nonce=cspNonce src="/javascripts/extraction-edit-own.js")
 
 block body
   section#fixed-top-section
@@ -10,14 +11,14 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { noSidebar: false, hrefurl: '/luscenje', h2: 'Luščenje iz lastnih besedil', h1: 'Dodaj opravilo', description: 'Luščenje terminoloških kandidatov iz besedil, ki jih uporabnik namensko izbere, je najučinkovitejše. Primerno izbrano ime opravila, vam omogoča, da lahko sledite, katera luščenja ste že opravili. Ko vnesete podatke, morate vse spremembe shraniti. Zaradi omejenega prostora za shranjevanje lahko shranite največ pet zadnjih luščenj. ', buttons: [{ type: 'cancel', url:'/luscenje', content: 'Prekliči', classAtr:"btn btn-secondary header-btn-secondary" }, { type: 'button', content: 'Shrani', form: 'extraction-name' }] }
+  - const c = { noSidebar: false, hrefurl: '/luscenje', h2: t('Luščenje iz lastnih besedil'), h1: t('Dodaj opravilo'), description: t('Luščenje terminoloških kandidatov iz besedil, ki jih uporabnik namensko izbere, je najučinkovitejše. Primerno izbrano ime opravila, vam omogoča, da lahko sledite, katera luščenja ste že opravili. Ko vnesete podatke, morate vse spremembe shraniti. Zaradi omejenega prostora za shranjevanje lahko shranite največ pet zadnjih luščenj. '), buttons: [{ type: 'cancel', url:'/luscenje', content: t('Naprej'), classAtr:"btn border-header header-btn-secondary" }, { type: 'button', content: t('Shrani'), classAtr:'btn btn-primary disabled header-btn', form: 'extraction-name' }] }
   +mainHeader(c)
   .root-container
     .content-hold-prerequisites.mt-2
       #offset-main
         form#extraction-name(method="post")
           .subject-name
-            label.smaller-black-uppercase(for="name") IME
+            label.smaller-black-uppercase(for="name")= t('IME')
           .row.pe-0
             .col-sm-6.pe-0
               input#name.name-input.form-control.d-inline(
@@ -26,16 +27,16 @@ block body
                 value=extraction.name
               )
             .col-sm.d-flex.align-items-center.ms-sm-4.ps-sm-0.mt-1.mt-sm-0
-              span.d-md-inline.d-block.smaller-gray-info Izberite takšno ime, ki vam bo pomagalo slediti rezultatom, če boste luščenje besedil opravili večkrat.
+              span.d-md-inline.d-block.smaller-gray-info= t('Izberite takšno ime, ki vam bo pomagalo slediti rezultatom, če boste luščenje besedil opravili večkrat.')
 
         .table-documents.mt-4.d-sm-flex
           .col-sm-6.d-flex.flex-column
             .personal-documents.justify-content-between.d-flex.align-items-center
-              span.smaller-black-uppercase Lastni dokumenti
+              span.smaller-black-uppercase= t('Lastni dokumenti')
               a.btn.btn-primary.button-edit.align-items-center.d-flex.justify-content-center(
                 type="link"
                 href=`/luscenje/${id}/besedila`
-              ) Uredi
+              )= t('Uredi')
             div
               table.table.mt-2
                 tbody
@@ -45,16 +46,16 @@ block body
                       td.text-sm-start.normal-gray= document.filename
                       td.text-sm-end.normal-gray= document.size
           .col-sm.d-flex.ms-sm-4.mt-1.mt-sm-0
-            span.d-md-inline.d-block.smaller-gray-info Preden naložite besedila, jih shranite v besedilni obliki (končnica .txt).
+            span.d-md-inline.d-block.smaller-gray-info= t('Preden naložite besedila, jih shranite v besedilni obliki (končnica .txt).')
 
         .table-kas.mt-4.d-sm-flex
           .col-sm-6.d-flex.flex-column
             .personal-documents.justify-content-between.d-flex.align-items-center
-              span.smaller-black-uppercase (STOP) Termini
+              span.smaller-black-uppercase= t('(STOP) Termini')
               a.btn.btn-primary.button-edit.align-items-center.d-flex.justify-content-center(
                 type="link"
                 href=`/luscenje/${id}/stop-termini`
-              ) Uredi
+              )= t('Uredi')
             div
               table.table.mt-2
                 tbody
@@ -64,6 +65,6 @@ block body
                       td.text-sm-start.normal-gray= file.filename
                       td.text-sm-end.normal-gray= file.size
           .col-sm.d-flex.ms-sm-4.mt-1.mt-sm-0
-            .d-md-inline.d-block.smaller-gray-info Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. #[a.smaller-gray-info(href="/pomoc#help-stop-lists") Več...]
+            .d-md-inline.d-block.smaller-gray-info!= t('Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. Vse spremembe morate shraniti. <a class="smaller-gray-info" href="/pomoc#help-stop-lists">Več...</a>')
 
   include /common/footer

express/views/pages/extraction/list.pug

@@ -12,7 +12,7 @@ block body
   +sideNavigationFake
   if user
     include /utilities/dictionaries-main-panel-header
-    - const c = { sideMenu: false, h2: 'Luščenje', h1: 'Seznam luščenj', description: 'Nabor vseh luščenj, s katerimi lahko uporabnik iz izbranih besedil pridobi sezname terminoloških kandidatov. Posamezne terminološke kandidate lahko preveri tudi v konkordančniku.' }
+    - const c = { sideMenu: false, h2: t('Luščenje'), h1: t('Seznam luščenj'), description: t('Nabor vseh luščenj, s katerimi lahko uporabnik iz izbranih besedil pridobi sezname terminoloških kandidatov. Posamezne terminološke kandidate lahko preveri tudi v konkordančniku.') }
     +mainHeader(c)
     -
       const localeDayOptions = {
@@ -28,26 +28,30 @@ block body
       }
     .content-hold-prerequisites
       #offset-main.mt-2
-        form(method="post")
-          input(type="hidden" name="extractionType" value="own")
-          .row.align-items-center
-            .col-xl-6.white-border-background.p-4.d-flex.ms-lg-3
-              span.smaller-blue-subheading.me-auto.mt-3 Luščenje iz lastnih besedil
-              button.btn.btn-primary.ps-5.pe-5 DODAJ
-            .col-sm.mt-2.mt-xl-0.ms-2
-              span.span.d-md-inline.d-block.gray-info Luščenje terminoloških kandidatov iz besedil, ki jih ima uporabnik shranjena pri sebi. Za boljšo učinkovitost svetujemo format .txt.
-        form(method="post")
-          input(type="hidden" name="extractionType" value="oss")
-          .row.mt-4.align-items-center
-            .col-xl-6.white-border-background.p-4.d-flex.ms-lg-3
-              span.smaller-blue-subheading.me-auto.mt-3 Luščenje iz korpusa besedil OSS
-              button.btn.btn-primary.ps-5.pe-5 DODAJ
-            .col-md.mt-2.mt-xl-0.ms-2
-              span.span.d-md-inline.d-block.gray-info Luščenje terminoloških kandidatov iz besedil, ki jih uporabnik izbere med vsemi besedili, vključenimi v #[a.gray-info(href="https://openscience.si/") Nacionalni portal odprte znanosti].
+        if extractions.length >= 5
+          .d-flex.justify-content-center.mt-3
+            p= t('Če želite dodati novo luščenje, morate najprej pobrisati vsaj eno od obstoječih, saj je na posameznega uporabnika dovoljenih največ 5 luščenj.')
+        else
+          form(method="post")
+            input(type="hidden" name="extractionType" value="own")
+            .row.align-items-center
+              .col-xl-6.white-border-background.px-0.py-4.d-flex.ms-xl-3
+                span.smaller-blue-subheading.ms-3.me-auto.mt-3= t('Luščenje iz lastnih besedil')
+                button.btn.btn-primary.ps-5.pe-5.me-3= t('DODAJ')
+              .col-sm.mt-2.mt-xl-0.ps-1.ms-lg-3
+                span.span.d-md-inline.d-block.gray-info= t('Luščenje terminoloških kandidatov iz besedil, ki jih ima uporabnik shranjena pri sebi. Za boljšo učinkovitost svetujemo format .txt.')
+          form(method="post")
+            input(type="hidden" name="extractionType" value="oss")
+            .row.mt-4.align-items-center
+              .col-xl-6.white-border-background.px-0.py-4.d-flex.ms-xl-3
+                span.smaller-blue-subheading.ms-3.me-auto.mt-3= t('Luščenje iz korpusa besedil OSS')
+                button.btn.btn-primary.ps-5.pe-5.me-3= t('DODAJ')
+              .col-md.mt-2.mt-xl-0.ps-1.ms-lg-3
+                span.span.d-md-inline.d-block.gray-info!= t('Luščenje terminoloških kandidatov iz besedil, ki jih uporabnik izbere med vsemi besedili, vključenimi v <a class="gray-info" href="https://openscience.si/" target="_blank">Nacionalni portal odprte znanosti</a>.')
 
-        #extraction-list.all-tasks.mt-5.ms-2.ps-0
+        #extraction-list.all-tasks.mt-4.ps-0
           if !extractions.length
-            p Nimate luščenj za urejanje.
+            p= t('Nimate luščenj za urejanje.')
           else
             each el in extractions
               if el.status === 'new'
@@ -56,26 +60,26 @@ block body
                     .d-grid.task-name
                       span.bold-weight-black= el.name
                     .d-flex.align-items-center
-                      button.btn.btn-secondary.extraction-btn.btn-begin.align-items-center.d-flex(
+                      button.btn.border-header.extraction-btn.btn-begin.align-items-center.d-flex(
                         disabled=!el.canBegin ? true : false
                       )
                         img(src="/images/fi_arrow-right-circle.svg")
-                        span.ms-1 ZAČNI
+                        span.ms-1= t('ZAČNI')
                   hr.mt-2.mb-3
-                  .d-flex.justify-content-sm-between
+                  .d-flex.justify-content-sm-between.align-items-center
                     .d-sm-flex.align-items-center.mb-0
                       img(src="/images/alert-circle.svg")
-                      span.normal-gray.ms-1.me-2.me-sm-0 Nov
-                    .d-flex.align-items-center
+                      span.normal-gray.ms-1.me-2.me-sm-0= t('Nov')
+                    .d-flex.align-items-center.ms-auto
                       a.btn.p-0.align-items-center.me-lg-3.edit-task(
                         href=`luscenje/${el.id}`
                       )
                         img(src="/images/u_edit-alt.svg" alt="Edit")
-                        span.ms-1.normal-gray Uredi
+                        span.ms-1.normal-gray= t('Uredi')
                       .ms-3
                         button.p-0.btn.delete-task.btn-delete(type="button")
                           img(src="/images/red-trash-icon.svg" alt="")
-                          span.normal-gray.ms-2 Briši
+                          span.normal-gray.ms-2= t('Briši')
 
               if el.status === 'in progress'
                 .task.task-in-progress.p-3.mb-3(data-id=el.id)
@@ -87,7 +91,7 @@ block body
                         .d-grid.ms-1.align-items-center
                           .d-flex.align-items-center
                             img.me-1(src="/images/fi_calendar.svg")
-                            span.smaller-gray-uppercase.align-items-center Začetek
+                            span.smaller-gray-uppercase.align-items-center= t('Začetek')
                           .d-grid.ms-4.align-items-center
                             span.bold-weight-black= el.timeStarted.toLocaleString('sl-SI', localeDayOptions)
                             span.normal-gray= el.timeStarted.toLocaleString('sl-SI', localeHourOptions)
@@ -95,20 +99,20 @@ block body
                   .d-flex.justify-content-between
                     .d-sm-flex.align-items-center.mb-0.flex-grow-1
                       img(src="/images/clock.svg")
-                      span.normal-gray.ms-1 V obdelavi
+                      span.normal-gray.ms-1= t('V obdelavi')
 
               if el.status === 'failed'
                 .task.task-cancelled.p-3.mb-3(data-id=el.id)
-                  .d-lg-flex.justify-content-between
-                    .d-flex.flex-column
+                  .d-lg-flex
+                    .d-flex.flex-column.task-name
                       span.bold-weight-black= el.name
-                    .d-sm-flex
+                    .d-sm-flex.dates-div
                       .d-flex
                         .d-sm-flex.start-date
                           .d-sm-grid.ms-1.align-items-center.mt-2.mt-md-0
                             .d-sm-flex.align-items-center
                               img.me-1(src="/images/fi_calendar.svg")
-                              span.smaller-gray-uppercase.align-items-center Začetek
+                              span.smaller-gray-uppercase.align-items-center= t('Začetek')
                             .d-grid.ms-2.ms-sm-4.align-items-center
                               span.bold-weight-black= el.timeStarted.toLocaleString('sl-SI', localeDayOptions)
                               span.normal-gray= el.timeStarted.toLocaleString('sl-SI', localeHourOptions)
@@ -116,24 +120,22 @@ block body
                           .d-md-grid.ms-md-1.align-items-center
                             .d-md-flex.align-items-center
                               img.me-1(src="/images/fi_calendar.svg")
-                              span.smaller-gray-uppercase.align-items-center Konec
+                              span.smaller-gray-uppercase.align-items-center= t('Konec')
                             .d-grid.ms-4.align-items-center
                               span.bold-weight-black= el.timeFinished.toLocaleString('sl-SI', localeDayOptions)
                               span.normal-gray= el.timeFinished.toLocaleString('sl-SI', localeHourOptions)
 
-                    //- TODO: Once duplication is implemented remove "disabled" attribute from btn
-                    .d-flex.align-items-center.justify-content-lg-end.mt-2.mt-sm-0.ms-2.ms-md-0
-                      button.btn.btn-secondary.double-task.align-items-center.d-flex(
-                        disabled
-                      )
+                    //- TODO: Once duplication is implemented remove ".invisible" class
+                    .d-flex.align-items-center.justify-content-lg-end.mt-2.mt-sm-0.ms-2.ms-md-0.invisible
+                      button.btn.border-header.double-task.align-items-center.d-flex
                         img(src="/images/fi_copy_border.svg")
-                        span.ms-1 PODVOJI
+                        span.ms-1= t('PODVOJI')
                   hr.mt-2.mb-3
                   .d-flex.justify-content-sm-between
                     .d-sm-flex.align-items-center.mb-sm-0.me-3.me-sm-0
                       img(src="/images/alert-triangle.svg")
-                      span.normal-gray.ms-sm-1.ms-0 Prekinjen
-                    .d-flex.align-items-center.mb-sm-0.me-3.mt-0
+                      span.normal-gray.ms-sm-1.ms-0= t('Prekinjen')
+                    .d-flex.mb-sm-0.mt-0
                       //- a.edit-task.btn.p-0(href=`luscenje/${el.id}`)
                       //-   img(src="/images/u_edit-alt.svg" alt="Edit")
                       //-   span.normal-gray.ms-sm-1.ms-0 Uredi
@@ -143,19 +145,19 @@ block body
                       .ms-3
                         button.p-0.btn.delete-task.btn-delete(type="button")
                           img(src="/images/red-trash-icon.svg" alt="")
-                          span.normal-gray.ms-2 Briši
+                          span.normal-gray.ms-2= t('Briši')
               if el.status === 'finished'
                 .task.task-completed.p-3.mb-3(data-id=el.id)
-                  .d-lg-flex.justify-content-between
+                  .d-sm-flex
                     .d-flex.flex-column.task-name
                       span.bold-weight-black= el.name
-                    .d-sm-flex
+                    .d-sm-flex.dates-div
                       .d-flex
                         .d-sm-flex.start-date
                           .d-sm-grid.ms-1.align-items-center.mt-2.mt-md-0
                             .d-sm-flex.align-items-center
                               img.me-1(src="/images/fi_calendar.svg")
-                              span.smaller-gray-uppercase.align-items-center Začetek
+                              span.smaller-gray-uppercase.align-items-center= t('Začetek')
                             .d-grid.ms-2.ms-sm-4.align-items-center
                               span.bold-weight-black= el.timeStarted.toLocaleString('sl-SI', localeDayOptions)
                               span.normal-gray= el.timeStarted.toLocaleString('sl-SI', localeHourOptions)
@@ -163,58 +165,60 @@ block body
                           .d-md-grid.ms-md-1.align-items-center
                             .d-md-flex.align-items-center
                               img.me-1(src="/images/fi_calendar.svg")
-                              span.smaller-gray-uppercase.align-items-center Konec
+                              span.smaller-gray-uppercase.align-items-center= t('Konec')
                             .d-grid.ms-4.align-items-center
                               span.bold-weight-black= el.timeFinished.toLocaleString('sl-SI', localeDayOptions)
                               span.normal-gray= el.timeFinished.toLocaleString('sl-SI', localeHourOptions)
-                      .d-sm-flex.align-items-center.ms-sm-5.mt-2.mt-md-0
-                        img(src="/images/fi_check-circle.svg")
-                        span.ms-2 Končan
-                    .d-sm-flex.align-items-center.mt-2.mt-md-0.ms-auto.me-3
-                      a.edit-task.btn.p-0(href=`luscenje/${el.id}`)
-                        img(src="/images/u_edit-alt.svg")
-                        span.ms-1 UREDI
+
+                    .d-flex.align-items-center.ms-2.ms-sm-auto.mt-2.mt-md-0
+                      img(src="/images/fi_check-circle.svg")
+                      span.ms-2= t('Končan')
+                    //- .d-sm-flex.align-items-center.mt-2.mt-md-0.ms-auto.me-3
+                    //-   a.edit-task.btn.p-0.ms-auto(href=`luscenje/${el.id}`)
+                    //-     img(src="/images/u_edit-alt.svg")
+                    //-     span.ms-1 UREDI
                   hr.mt-2.mb-3
                   .d-lg-flex.justify-content-between
-                    .d-lg-flex.align-content-center.mb-0.flex-grow-1
-                      a#terminology-candidates.btn.btn-primary.align-items-center(
+                    .d-lg-flex.align-items-center.mb-0.flex-grow-1
+                      a.terminology-candidates.btn.btn-primary.align-items-center(
                         href=`luscenje/${el.id}/kandidati`
                       )
                         img(src="/images/book-white.svg")
-                        span.ms-1 Terminološki kandidati [#{ el.termCandidatesCount }]
+                        //- TODO I18n - Možna kakšna napaka, trenutno ne morem testirati luščenja
+                        span.ms-1 #{ t('Terminološki kandidati') } [#{ el.termCandidatesCount }]
                       if el.status === 'finished' && el.corpusId
-                        a.btn.btn-secondary.ps-2.pe-2.mt-2.mt-lg-0.ms-md-1(
+                        a.btn.border-header.ext-secondary-btn.mt-2.mt-lg-0.ms-md-1(
                           href=`/korpus/${el.corpusId}`
                           target="_blank"
                         )
                           img(src="/images/list.svg")
-                          span.normal-gray.ms-1 Uporabniški korpus
+                          span.normal-gray.ms-1= t('Uporabniški korpus')
                       if el.status === 'finished' && el.ossParams
-                        a.btn.btn-secondary.ps-2.pe-2.mt-2.mt-lg-0.ms-md-1(
-                          href="https://www.clarin.si/noske/run.cgi/corp_info?corpname=oss&struct_attr_stats=1"
+                        a.btn.border-header.ext-secondary-btn.mt-2.mt-lg-0.ms-md-1(
+                          href="https://www.clarin.si/ske/#dashboard?corpname=oss"
                           target="_blank"
                         )
                           img(src="/images/list.svg")
-                          span.normal-gray.ms-1 Korpus KAS+
-                    .d-flex.align-items-center.mb-0.me-3.mt-2.mt-lg-0
-                      .align-items-center.double-task
-                        img(src="/images/fi_copy_border.svg" alt="Copy")
-                        span.normal-gray.ms-1 Podvoji
+                          span.normal-gray.ms-1= t('Korpus OSS')
+                    .d-flex.align-items-center.mb-0.mt-2.mt-lg-0.justify-content-end
+                      //- .align-items-center.double-task
+                      //-   img(src="/images/fi_copy_border.svg" alt="Copy")
+                      //-   span.normal-gray.ms-1 Podvoji
                       .ms-3
                         button.p-0.btn.delete-task.btn-delete(type="button")
                           img(src="/images/red-trash-icon.svg" alt="")
-                          span.normal-gray.ms-2 Briši
+                          span.normal-gray.ms-2= t('Briši')
     include /utilities/modal-alert
     include /utilities/modal-alert-mixin
-    +alertModal("max-extractions", "Razumem", "Prekliči", "ok-btn-modal", "cancel-btn", 'TODO text več kot 5 luščenj!')
+    +alertModal("max-extractions", t("Razumem"), t("Prekliči"), "ok-btn-modal", "cancel-btn", t('Ne morete imeti več kot 5 luščenj!'))
     include /utilities/modal-response
-    +responseModal("begin-response", "Razumem", "understand-btn", "Luščenje je bilo dano v fazo obdelave.")
+    +responseModal("begin-response", t("Razumem"), "understand-btn", t("Luščenje je bilo dano v fazo obdelave."), t("Ko bo luščenje uspešno zaključeno, boste na svoj elektronski naslov, ki ste ga navedli ob registraciji, prejeli obvestilo."))
   else
     include /utilities/dictionaries-main-panel-header
-    - const c = { sideMenu: false, h2: 'Luščenje', h1: 'Seznam luščenj', description: 'Nabor vseh luščenj, s pomočjo katerih uporabnik iz vhodnih besedil pridobi sezname terminoloških kandidatov in dostop do konkordančnika po teh besedilih.' }
+    - const c = { sideMenu: false, h2: t('Luščenje'), h1: t('Seznam luščenj'), description: t('Nabor vseh luščenj, s pomočjo katerih uporabnik iz vhodnih besedil pridobi sezname terminoloških kandidatov in dostop do konkordančnika po teh besedilih.') }
     +mainHeader(c)
     .content-hold-prerequisites
       #offset-main
         .d-flex.justify-content-center.mt-5
-          p Za luščenje terminoloških kandidatov morate biti prijavljeni.
+          p= t('Za luščenje terminoloških kandidatov morate biti prijavljeni.')
   include /common/footer

express/views/pages/extraction/stop-terms-edit.pug

@@ -11,7 +11,7 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { noSidebar: false, hrefurl: '.', h2: 'Luščenje | dodaj opravilo', h1: 'Seznam neželenih terminov', description: 'Seznam terminoloških kandidatov bo natančnejši, če boste dodali tudi seznam neželenih besed, ki naj jih luščilnik izloči iz seznama. Seznam lahko vsebuje splošne termine, npr. tabela, kazalnik, ali pogoste slovnične besede, zlasti veznike, pomožne glagole.', buttons: [{ type: 'cancel', content: 'Nazaj', classAtr: 'btn btn-secondary header-btn-secondary link-back' }] }
+  - const c = { noSidebar: false, hrefurl: '.', h2: t('Luščenje | dodaj opravilo'), h1: t('Seznam neželenih terminov'), description: t('Seznam terminoloških kandidatov bo natančnejši, če boste dodali tudi seznam neželenih besed, ki naj jih luščilnik izloči iz seznama. Seznam lahko vsebuje splošne termine, npr. tabela, kazalnik, ali pogoste slovnične besede, zlasti veznike, pomožne glagole.'), buttons: [{ type: 'cancel', content: t('Naprej'), classAtr: 'btn border-header header-btn-secondary link-back' }] }
   +mainHeader(c)
   .content-hold-prerequisites.mt-2
     #offset-main
@@ -19,24 +19,24 @@ block body
         .table-responsive
           table.styled-table
             thead
-              tr
+              tr#thead
                 th= 'ID'
-                th= 'IME DATOTEKE'
-                th= 'VELIKOST'
-                th= 'DATUM'
+                th= t('IME DATOTEKE')
+                th= t('VELIKOST')
+                th= t('DATUM')
                 th= ''
             tbody#files-list
               each document, index in stopTermsFiles
                 tr
-                  td= index + 1
-                  td.filename= document.filename
-                  td= document.size
-                  td= new Date(document.timeModified).toLocaleDateString('sl-SL')
-                  td
-                    button.p-0.delete-file.delete-btn-table(type="button")
-                      img(src="/images/red-trash-icon.svg" alt="Izbriši")
-                      span.ms-2 Briši
-      .row.ms-2.me-2.align-items-center.mt-4
+                  td.file-index= index + 1
+                  td.file-name= document.filename
+                  td.file-size= document.size
+                  td.file-date-modified= new Date(document.timeModified).toLocaleDateString('sl-SL')
+                  td.file-last-cell
+                    button.p-0.delete-file.delete-btn-table
+                      img(src="/images/red-trash-icon.svg" alt="")
+                      span.ms-2= t('Briši')
+      #upload-files-container.row.ms-2.me-2.align-items-center.mt-4
         form#upload-files.col-sm-5.upload-a-file-field.p-2.align-items-center.d-flex(
           method="post"
           enctype="multipart/form-data"
@@ -44,7 +44,7 @@ block body
           input(type="hidden" name="extractionId" value=id)
           .col-sm-5.upload-inner-border.w-100.justify-content-center.d-sm-flex.p-3.drag-area
             div
-              button.btn.btn-primary(type="button") Dodaj datoteko
+              button.btn.btn-primary(type="button")= t('Dodaj datoteko')
               input#upload(
                 type="file"
                 name="extractionFile"
@@ -53,7 +53,7 @@ block body
                 hidden
               )
         .col.d-flex.align-items-center.ms-md-3
-          span.gray-info Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. Na koncu morate spremembe shraniti. #[a.smaller-gray-info(href="/pomoc#help-stop-lists") Več...]
-  include /utilities/modal-spinner
+          span.gray-info!= t('Dodate lahko seznam besed, ki jih v seznam terminoloških kandidatov ne želite vključiti. Seznam naj bo shranjen v formatu .txt. Na koncu morate spremembe shraniti. <a class="smaller-gray-info" href="/pomoc#help-stop-lists" target="_blank">Več ...</a>')
+  //- include /utilities/modal-spinner
   include /utilities/modal-alert
   include /common/footer

express/views/pages/extraction/term-candidates.pug

@@ -12,13 +12,11 @@ block body
   include /common/side-menu-fake
   +sideNavigationFake
   include /utilities/dictionaries-main-panel-header
-  - const c = { noSidebar: false, hrefurl: '.', h2: 'Luščenje', h1: 'Terminološki kandidati', description: 'Seznam terminoloških kandidatov, ki so rezultat izbranega luščenja.', buttons: [{ type: 'cancel', url: '/luscenje', content: 'Nazaj', classAtr: 'btn btn-secondary header-btn-secondary' }] }
+  - const c = { noSidebar: false, hrefurl: '.', h2: t('Luščenje'), h1: t('Terminološki kandidati'), description: t('Seznam terminoloških kandidatov, ki so rezultat izbranega luščenja.'), buttons: [{ type: 'cancel', url: '/luscenje', content: t('Naprej'), classAtr: 'btn border-header header-btn-secondary' }] }
   +mainHeader(c)
   .content-hold-prerequisites.me-2
     #offset-main.mt-3
-      .d-flex.w-100.justify-content-between.mb-4
-        .d-flex
-          include /components/search-and-filter/inline-search
+      .d-flex.w-100.justify-content-end.mb-4
         .d-flex
           include /utilities/pager
           +pager
@@ -26,30 +24,30 @@ block body
       .table-responsive
         table.styled-table
           thead
-            tr
-              th= '#'
-              th= 'KANONIČNA OBLIKA'
-              th= 'RANKING'
-              th= 'POGOSTOST OBJAVLJANJA'
+            tr#thead
+              th.td-index= '#'
+              th.td-cannon= t('KANONIČNA OBLIKA')
+              th= t('UTEŽ')
+              th= t('POJAVITVE')
           tbody#page-results
             each termCandidate, index in firstPageOfTermCandidates
               tr
                 td= index + 1
                 td= termCandidate.kanonicnaoblika
                 td= termCandidate.ranking
-                td= termCandidate.pogostostpojavljanja
+                td= termCandidate.pogostostpojavljanja[0]
 
       form(action=`/api/v1/extraction/${extractionId}/term-candidates-export`)
         .row.mt-4
           .me-0.pe-0.d-flex.align-items-center
-            span.radio-button-labels Izvozi termine od številke
+            span.radio-button-labels= t('Izvozi termine od številke')
             input.without-arrows.form-control.terminology-input.ms-1(
               type="number"
               name="from"
               maxlength="5"
               min="0"
             )
-            span.radio-button-labels.ms-1 do številke
+            span.radio-button-labels.ms-1= t('do številke')
             input.without-arrows.form-control.terminology-input.ms-1(
               type="number"
               name="to"
@@ -99,7 +97,7 @@ block body
         //-         span.name-info-txt.ms-5 Navodilo k posamičnemu polju. Anim duis ullamco Lorem reprehenderit.
         .d-sm-flex.mt-4
           button.btn.btn-primary.me-2
-            | Izvozi
+            = t('Izvozi')
 
   include /common/footer
 

express/views/pages/help-pug-demo-frame.pug

@@ -1,3 +1,6 @@
+// DEMO??
+//- TODO MARK FOR DELETION
+
 extends /layout
 
 block body

express/views/pages/help-pug-demo.pug

@@ -1,3 +1,7 @@
+//- TODO MARK FOR DELETION
+
+
+
 h2 Iskanje
 
 p bold #[b adasdasda]

express/views/pages/help.pug

@@ -15,5 +15,8 @@ block body
           data-bs-target="#list-example"
           tabindex="0"
         )
-        include /utilities/help-text
-  include /common/footer
+        if determinedLanguage === 'sl'
+          include /utilities/help-text_sl
+        else
+          include /utilities/help-text_en
+      include /common/footer

express/views/pages/index.pug

@@ -1,8 +1,8 @@
 extends /layout
 
 block pageSpecificScipts
-  script(nonce=cspNonce src="/javascripts/collapsable-comments.js")
-  script(nonce=cspNonce src="/javascripts/comments.js")
+  //- script(nonce=cspNonce src="/javascripts/collapsable-comments.js")
+  //- script(nonce=cspNonce src="/javascripts/comments.js")
 
 block body
   .index-footer
@@ -11,7 +11,8 @@ block body
       .index-nav
         ul.nav
           li.nav-item
-            img.logo(src="/images/logo.png" alt="Logo")
+            a(href="https://www.slovenscina.eu/")
+              img.logo(src="/images/logo.png" alt="Logo")
 
           include ../components/navigation/main-navigation-right-mixin
 
@@ -24,9 +25,9 @@ block body
       //- p Terminološki portal je samostojna, odprto dostopna spletna storitev, v katero so vključeni terminološki viri na samem portalu, na integriranem iskalniku pa so dostopni tudi zadetki iz spletišča Terminologišče in portala Termania. Registriranim uporabnikom je na voljo tudi <b>luščilnik terminoloških kandidatov</b> iz specializiranih korpusov, <b>konkordančnik</b> za specializirana besedila, označevalnik terminov v strokovnih besedilih, <b>urejevalnik</b> terminoloških virov, <b>terminološka svetovalnica</b> in stran s <b>pomočjo in navodili</b> za uporabo posameznih funkcij portala. Terminološki portal je moderiran.
       p!= portalDescription
       p.pt-5.fw-500.d-flex
-        span.d-flex Zadnji objavljeni slovarji
+        span.d-flex #{ t("Zadnji objavljeni slovarji") }
         span.navigation-text-color.d-flex.flex-grow-1.justify-content-end
-          a.text-decoration-none(href="/slovarji") Vsi slovarji &gt;
+          a.text-decoration-none(href="/slovarji") #{ t("Vsi slovarji") } &gt;
 
       include /components/dictionary/dictionary-list
       +table(latestDicts)
@@ -41,9 +42,9 @@ block body
           a(href="/slovarji/id_slovarja/o-slovarju") Davčni slovar
           span= ', '
           a(href="/slovarji/id_slovarja/o-slovarju") Glosar akademske integritete
-      p.pt-5
+      //- p.pt-5
 
-      include /utilities/comments-with-collapsable-pager
+      //- include /utilities/comments-with-collapsable-pager //- uncomment scripts for comments if uncomment this
       //- +pager
 
   include /common/footer

express/views/pages/my-dictionaries-root.pug

@@ -1,3 +1,5 @@
+//- TODO MARK FOR DELETION
+
 extends ../layout
 
 block body

express/views/pages/privacy-policy_en.pug

@@ -0,0 +1,82 @@
+extends /layout
+
+block body
+  section.sticky-top
+    include /common/main-navigation
+    +main-navigation(false)
+  .consultancy-padding-main.p-squeeze-lg.mt-2
+    h1 Privacy policy
+    p This Privacy policy defines collection, storage, and processing of personal data, collected by the University of Ljubljana during user registration on the #[b Slovenian Terminology Portala].
+    .mt-4
+    h2 Data controller
+    p Data controller as defined by the EU General Data Protection Regulation and the applicable act that regulates personal data protection is:
+    span University of Ljubljana
+    span Kongresni trg 12, 1000 Ljubljana, Slovenija
+    a(href="mailto:dpo@uni-lj.si") dpo@uni-lj.si
+    .mt-4
+    h4 Data protection officer
+    p Data protection officer (DPO) and the person who can answer all questions related to processing of personal data in the scope of the Development of Slovene in a Digital Environment Project is Nina Komočar Urbanija. You can send all your questions, queries, and demands to exercise your rights related to your personal data in the scope of the Development of Slovene in a Digital Environment Project:
+    span.ms-4 -	via e-mail to #[a(href="mailto:dpo@uni-lj.si") dpo@uni-lj.si],
+    span.ms-4 -	via mail to the address of the Data controller: DPO, University of Ljubljana, Kongresni trg 12, 1000 Ljubljana, Slovenija.
+    .mt-4
+    h2 Personal data and our purposes for processing it
+    p To use advanced functions of the Slovenian Terminology Portal, you must register via registration form on the webpage #[a(href="http://terminoloski.slovenscina.eu" target="_blank") http://terminoloski.slovenscina.eu]. By filling in and submitting this form, you will send the University of Ljubljana the following contact data:
+    ul
+      li #[b User name]
+      li #[b First Name]
+      li #[b Last Name]
+      li #[b E-mail]
+    p We need the contact data collected via the registration form to personalize your content and enable some of the Terminology Portal functions (e.g. storing extraction results), and to communicate with you regarding any questions related to the functions of the Terminology Portal.
+    p If you decide not to submit the above mentioned contact data, your registration will not be completed and you will not be able to use all functions offered by the Terminology Portal.
+    p The University of Ljubljana respects your privacy and is committed to act with diligence and in accordance with the applicable data protection regulations when collecting, storing and processing personal data.
+    p We use appropriate technological and organizational processes to protect the data we collect, to prevent unauthorized access to the collected data and any data disclosures, and to ensure accuracy and appropriate use of the data.
+    .mt-4
+    h2 Legal basis for data processing - consent
+    p The University of Ljubljana processes the personal data you provide during the registration process on the #[b Slovenian Terminology Portal] with your clear and unambiguous consent based on Article 6 (1), (a) of the EU General Data Protection Regulation (GDPR).
+    span You consent to the processing of your personal data by filling in the required data and clicking "Register" on the Slovenian Terminology Portal web page found at the link #[a(href="http://terminoloski.slovenscina.eu" target="_blank") http://terminoloski.slovenscina.eu].
+    span You can withdraw your consent at any time by deleting your user account in the "Account settings" tab.
+    span If you withdraw your consent and close your user account, we will stop using your personal data to communicate with you.
+    span Potential withdrawal of the consent does not impact the legality of personal data processing in the time period before the consent was withdrawn.
+    .mt-4
+    h2 Your rights
+    span In accordance with the provisions of the EU General Data Protection Regulation (GDPR), you have the right to access your personal data, the right to rectification, the right to erasure ("the right to be forgotten"), the right to data portability, the right to request the restriction of the processing of personal data and the right to object. You can check and change your personal data at any time by clicking the link "Change profile settings".
+    p To exercise all of your rights or to obtain additional information, please contact our Data Protection Officer at the e-mail address: #[a(href="mailto:dpo@uni-lj.si") dpo@uni-lj.si]. We will process your application and respond to it in accordance with the GDPR.
+    p If you believe your rights or any data protection regulations are being violated, you can complain to the competent national authority:
+    p You can send the complaint to the Information Officer (Dunajska cesta 22, 1000 Ljubljana, e-mail: #[a(href="mailto:gp.ip@ip-rs.si") gp.ip@ip-rs.si] phone: 012309730, website: #[a(href="www.ip-rs.si" target="_blank") www.ip-rs.si] )
+    .mt-4
+    h2 Personal data storage period
+    p The University of Ljubljana stores your personal data (first name, last name, e-mail address) for as long as this is necessary for the purpose of your use of the Slovenian Terminology Portal, i.e. from your registration until the closure of your user account.
+    .mt-4
+    h2 Personal Data Users
+    p Contracted Data Processor who maintains and hosts the website for the University of Ljubljana.
+    .mt-4
+    h2 Transfer of personal data to third countries or international organizations
+    p Personal data in not transferred to third countries or international organizations.
+    .mt-4
+    h2 Cookies
+    .mt-3
+    h4 What are cookies?
+    p Cookies are files in which website settings are stored. Websites store cookies on the devices the users use to access the internet in order to recognize individual devices and the settings individual users used when accessing the website. Cookies allow websites to remember whether the user has already visited a specific website. Advanced applications use cookies to personalize certain settings to individual users. The browser used by the user in in complete control of the cookie storing process. This means that the user can limit or deny which cookies are stored as desired.
+    h4 Why are cookies necessary?
+    p Cookies are essential for providing user-friendly on-line services. None of the most common e-commerce functions would be possible without cookies. Cookies make the interactions between the user and the website faster and simpler. They allow the website to remember the user’s preferences and experiences, making website browsing a more efficient and pleasant experience. There are several reasons to use cookies. Cookies can be used to store information on the status of individual web pages (details about the personalizations of individuals pages), to enable certain on-line services (e.g. on-line stores), to gather statistical data about the users and visits of the website, the visitors’ habits, etc. This means that cookies allow us to measure the effectiveness of our website design. You can read more about the recommended and allowed use of cookies on websites on the #[a(href="https://www.ip-rs.si" target="_blank") Information Officer website].
+    h4 List of cookies on our website
+    .mt-2
+    h4 First party cookies
+    p #[b sid] - System cookie. It is also used for user sign-in. It is essential for correct functioning of the website. The cookie remains present for up to two hours after your last activity on the portal.
+    p #[b remember_me] - It is used for long-term user sign-in, if the user selects “Remember me" during the signing in process. The cookie remains present for 1 year after your last activity on the portal.
+    p The cookies used on our website do not collect any personal data that could be used to recognize you personally and cannot harm your computer, tablet or mobile phone. The cookies make our website work and help us understand which information are the most useful for our visitors.
+    .mt-4
+    h2 Consent
+    p By using this website you agree to let the website place cookies to your computer or mobile device.
+    .mt-4
+    h2 Managing and deleting cookies
+    p If you want to change the way cookies are used in your browser, including blocking or deleting the cookies, you can do that by changing the browser settings. If you want to manage your cookies, most of the browsers allow you to accept or deny all cookies, allow you to accept only a certain type of cookies, or notify you when a website wants to install cookies in the browser. The cookies stored by the browser can also simply be deleted. If you change or delete the file with the cookies on your browser, or change or update your browser or device, it is possible that you will have to disable the cookies again. The process for managing and deleting cookies is different in every browser. If you need help, consult your browser’s help section.
+    .mt-4
+    h2 Here are the instructions to edit cookies in some browsers:
+    ul
+      li #[a(href="https://support.google.com/chrome/answer/95647?hl=sl" target="_blank") Google Chrome]
+      li #[a(href="https://support.microsoft.com/en-us/windows/delete-and-manage-cookies-168dab11-0753-043d-7c16-ede5947fc64d#ie=ie-10" target="_blank") Internet Explorer]
+      li #[a(href="https://support.apple.com/guide/safari/manage-cookies-sfri11471/mac" target="_blank") Safari]
+      li #[a(href="https://support.mozilla.org/en-US/kb/enhanced-tracking-protection-firefox-desktop?redirectslug=enable-and-disable-cookies-website-preferences&redirectlocale=en-US" target="_blank") Firefox]
+      li #[a(href="https://help.opera.com/en/latest/web-preferences" target="_blank") Opera]
+  include /common/footer

express/views/pages/privacy-policy_sl.pug

@@ -8,7 +8,7 @@ block body
     h1 Politika zasebnosti
     p Ta politika zasebnosti ureja zbiranje, hrambo in obdelavo osebnih podatkov, ki jih Univerza v Ljubljani zbira od vas, ko se registrirate za uporabo #[b Slovenskega terminološkega portala].
     .mt-4
-    h2 Upravljalec
+    h2 Upravljavec
     p Upravljavec osebnih podatkov, kot ga določata Splošna uredba EU o varstvu osebnih podatkov in veljavni zakon, ki ureja varstvo osebnih podatkov, je:
     span Univerza v Ljubljani
     span Kongresni trg 12, 1000 Ljubljana, Slovenija

express/views/pages/profile/change-password.pug

@@ -11,15 +11,15 @@ block body
   - const d = { selection: 'change-profile-password' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h1: 'Spremeni geslo', description: 'Tukaj lahko spremenite geslo za prijavo.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'profileForm' }] }
+  - const c = { sideMenu: true, h1: title, description: t('Tukaj lahko spremenite geslo za prijavo.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'profileForm' }] }
   +mainHeader(c)
 
   .content-hold-prerequisites
-    #offset-main.main-container.mt-2.pe-5
+    #offset-main.main-container.mt-2
       form.needs-validation(method="post" novalidate)
         div
           .subject-name
-            label.input-name-txt(for="password-old") STARO GESLO
+            label.input-name-txt(for="password-old") #{ t('STARO GESLO') }
           .row
             .col-sm-6.align-items-center
               input#password-old.name-input.form-control.d-inline(
@@ -27,14 +27,14 @@ block body
                 name="password-old"
                 value=""
               )
-              .invalid-feedback Napačno geslo.
+              .invalid-feedback #{ t('Napačno geslo.') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
         .mt-4
           .subject-name
-            label.input-name-txt(for="dictionary-title-en") NOVO GESLO
+            label.input-name-txt(for="dictionary-title-en") #{ t('NOVO GESLO') }
           .row
             .col-sm-6
               input#password-new.name-input.form-control.d-inline(
@@ -43,14 +43,14 @@ block body
                 minLength="1"
                 value=""
               )
-              .invalid-feedback Geslo je prekratko.
+              .invalid-feedback #{ t('Geslo je prekratko.') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
         .mt-4
           .subject-name
-            label.input-name-txt(for="dictionary-title-en") PONOVI NOVO GESLO
+            label.input-name-txt(for="dictionary-title-en") #{ t('PONOVI NOVO GESLO') }
           .row
             .col-sm-6
               input#password-repeat.name-input.form-control.d-inline(
@@ -59,9 +59,9 @@ block body
                 minLength="1"
                 value=""
               )
-              .invalid-feedback Geslo se ne ujema.
+              .invalid-feedback #{ t('Geslo se ne ujema.') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
-  include /common/footer
+      include /common/footer

express/views/pages/profile/change-profile-settings.pug

@@ -11,15 +11,15 @@ block body
   - const d = { selection: 'change-profile-settings' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h1: 'Nastavitve računa', description: 'Tukaj lahko spremenite nekatere nastavitve, vezane na posameznega uporabnika.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'profileForm' }] }
+  - const c = { sideMenu: true, h1: title, description: t('Tukaj lahko spremenite nekatere nastavitve, vezane na posameznega uporabnika.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'profileForm' }] }
   +mainHeader(c)
 
   .content-hold-prerequisites
-    #offset-main.main-container.mt-2.pe-5
+    #offset-main.main-container.mt-2
       form#profileForm.needs-validation(method="post" novalidate)
         div
           .subject-name
-            label.input-name-txt(for="number-of-results") ŠTEVILO ZADETKOV NA STRANI
+            label.input-name-txt(for="number-of-results") #{ t('ŠTEVILO ZADETKOV NA STRANI') }
           .row
             .col-sm-6.align-items-center
               select#numberOfHits.form-control.d-inline(name="numberOfHits")
@@ -31,4 +31,4 @@ block body
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
-  include /common/footer
+      include /common/footer

express/views/pages/profile/delete-profile.pug

@@ -0,0 +1,94 @@
+extends /layout
+
+block pageSpecificScipts
+  script(nonce=cspNonce src="/javascripts/admin.js")
+  script(nonce=cspNonce src="/javascripts/profile-scripts.js")
+
+block body
+  section#fixed-top-section
+    include /common/main-navigation
+    +main-navigation(false)
+  include /pages/profile/my-profile-side-menu-mixin
+  - const d = { selection: 'delete-profile' }
+  +sideNavigation(d)
+  include /utilities/dictionaries-main-panel-header
+  - const c = { sideMenu: true, h1: title, description: t('Tukaj lahko izbrišete svoj račun.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'profileForm' }] }
+  +mainHeader(c)
+
+  .content-hold-prerequisites
+    #offset-main.main-container.mt-2
+      form#profileForm.needs-validation(method="post" novalidate)
+        div
+          .subject-name
+            label.input-name-txt(for="profile-username") #{ t('UPORABNIŠKO IME') }
+          .row
+            .col-sm-6.align-items-center
+              input#profile-username.name-input.form-control.d-inline(
+                type="text"
+                name="username"
+                disabled
+                value=user.userName
+              )
+              .invalid-feedback
+
+            .col-sm.d-flex.align-items-center
+              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
+
+        .mt-4
+          .subject-name
+            label.input-name-txt(for="profile-name") #{ t('IME') }
+          .row
+            .col-sm-6
+              input#profile-name.name-input.form-control.d-inline(
+                type="text"
+                name="name"
+                minLength="1"
+                disabled
+                value=user.firstName
+              )
+              .invalid-feedback #{ t('Niste vpisali imena') }
+
+            .col-sm.d-flex.align-items-center
+              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
+
+        .mt-4
+          .subject-name
+            label.input-name-txt(for="profile-surname") #{ t('PRIIMEK') }
+          .row
+            .col-sm-6
+              input#profile-surname.name-input.form-control.d-inline(
+                type="text"
+                name="surname"
+                minLength="1"
+                disabled
+                value=user.lastName
+              )
+              .invalid-feedback #{ t('Niste vpisali priimka.') }
+
+            .col-sm.d-flex.align-items-center
+              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
+
+        //- .mt-4
+          .subject-name
+            label.input-name-txt(for="profile-surname") ELEKTRONSKI NASLOV
+          .row
+            .col-sm-6
+              input#profile-surname.name-input.form-control.d-inline(
+                type="text"
+                name="email"
+                minLength="1"
+                value=user.email
+              )
+              .invalid-feedback Neveljavni elektronski naslov.
+
+            .col-sm.d-flex.align-items-center
+              span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
+        .mt-5.delete-btn-section
+          button.btn.btn-delete-style(
+            data-bs-target="#alert-modal"
+            data-bs-toggle="modal"
+          )
+            img.i32x32(src="/images/exclamation-triangle-white.svg" alt="DEL")
+            span.ps-2.text-white #{ t('IZBRIŠI') }
+      include /common/footer
+  include /utilities/modal-alert

express/views/pages/profile/my-profile-side-menu-mixin.pug

@@ -5,27 +5,33 @@ mixin sideNavigation(sideNavigationData)
         button#nav-button.nav-button
           img#burger-menu-img(
             src="/images/burger-menu-button-icon.svg"
-            alt="Meni"
+            alt=t('Meni')
           )
-        span.nav-title Moj Profil
+        span.nav-title #{ t('Moj Profil') }
       #mobile-right-holder
     nav
-      ul.admin-nav-content.slidable
+      ul.admin-nav-content.slidable.scroller-style
         li(
           class=sideNavigationData.selection === 'change-profile-data' ? 'focused-menu' : 'admin-nav-item'
         )
           a.active(href="/moj-racun") 
-            img(src="/images/user-gray.svg" alt="Basic")
-            p Osnovni podatki
+            img(src="/images/user-gray.svg" alt=t('Basic'))
+            p #{ t('Osnovni podatki') }
         li(
           class=sideNavigationData.selection === 'change-profile-password' ? 'focused-menu' : 'admin-nav-item'
         )
           a.active(href="/spremeni-geslo") 
-            img(src="/images/lock-gray.svg" alt="Settings")
-            p Spremeni geslo
+            img(src="/images/lock-gray.svg" alt=t('Settings'))
+            p #{ t('Spremeni geslo') }
         li(
           class=sideNavigationData.selection === 'change-profile-settings' ? 'focused-menu' : 'admin-nav-item'
         )
           a.active(href="/nastavitve-racuna") 
-            img(src="/images/cog.svg" alt="Settings")
-            p Nastavitve
+            img(src="/images/cog.svg" alt=t('Settings'))
+            p #{ t('Nastavitve') }
+        li(
+          class=sideNavigationData.selection === 'delete-profile' ? 'focused-menu' : 'admin-nav-item'
+        )
+          a.active(href="/izbrisi-racun") 
+            img(src="/images/user-x.svg" alt=t('Delete profile'))
+            p #{ t('Izbriši račun') }

express/views/pages/profile/my-profile.pug

@@ -11,15 +11,15 @@ block body
   - const d = { selection: 'change-profile-data' }
   +sideNavigation(d)
   include /utilities/dictionaries-main-panel-header
-  - const c = { sideMenu: true, h1: 'Osnovni podatki', description: 'Tukaj lahko spremenite ime, priimek in elektronski naslov uporabnika.', buttons: [{ type: 'disabled', content: 'Shrani', form: 'profileForm' }] }
+  - const c = { sideMenu: true, h1: title, description: t('Tukaj lahko spremenite ime, priimek in elektronski naslov uporabnika.'), buttons: [{ type: 'disabled', content: t('Shrani'), form: 'profileForm' }] }
   +mainHeader(c)
 
   .content-hold-prerequisites
-    #offset-main.main-container.mt-2.pe-5
+    #offset-main.main-container.mt-2
       form#profileForm.needs-validation(method="post" novalidate)
         div
           .subject-name
-            label.input-name-txt(for="profile-username") UPORABNIŠKO IME
+            label.input-name-txt(for="profile-username") #{ t('UPORABNIŠKO IME') }
           .row
             .col-sm-6.align-items-center
               input#profile-username.name-input.form-control.d-inline(
@@ -35,7 +35,7 @@ block body
 
         .mt-4
           .subject-name
-            label.input-name-txt(for="profile-name") IME
+            label.input-name-txt(for="profile-name") #{ t('IME') }
           .row
             .col-sm-6
               input#profile-name.name-input.form-control.d-inline(
@@ -44,14 +44,14 @@ block body
                 minLength="1"
                 value=user.firstName
               )
-              .invalid-feedback Niste vpisali imena
+              .invalid-feedback #{ t('Niste vpisali imena') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
         .mt-4
           .subject-name
-            label.input-name-txt(for="profile-surname") PRIIMEK
+            label.input-name-txt(for="profile-surname") #{ t('PRIIMEK') }
           .row
             .col-sm-6
               input#profile-surname.name-input.form-control.d-inline(
@@ -60,14 +60,14 @@ block body
                 minLength="1"
                 value=user.lastName
               )
-              .invalid-feedback Niste vpisali priimka.
+              .invalid-feedback #{ t('Niste vpisali priimka.') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
 
         .mt-4
           .subject-name
-            label.input-name-txt(for="profile-surname") ELEKTRONSKI NASLOV
+            label.input-name-txt(for="profile-surname") #{ t('ELEKTRONSKI NASLOV') }
           .row
             .col-sm-6
               input#profile-surname.name-input.form-control.d-inline(
@@ -76,8 +76,8 @@ block body
                 minLength="1"
                 value=user.email
               )
-              .invalid-feedback Neveljavni elektronski naslov.
+              .invalid-feedback #{ t('Neveljavni elektronski naslov.') }
 
             .col-sm.d-flex.align-items-center
               span.d-md-inline.d-block.name-info-txt.ms-xxl-3.ms-md-3.mt-3.mt-sm-0
-  include /common/footer
+      include /common/footer

express/views/pages/reset-password/reset-password.pug

@@ -0,0 +1,45 @@
+extends /layout
+
+block pageSpecificScipts
+  script(nonce=cspNonce src="/javascripts/reset-password.js")
+
+block body
+  section#fixed-top-section
+    include /common/main-navigation
+    +main-navigation(false)
+  include /utilities/generic-main-panel-header
+  - let c
+  if (isValidToken)
+    - c = { h1: t('Ponastavi geslo'), description: t('Vnesite novo geslo. Ko ga potrdite, se boste v vaš uporabniški račun lahko spet prijavili z novim geslom.') }
+  else
+    - c = { h1: t('Obvestilo'), description: '' }
+
+  +mainHeader(c)
+  .content-hold-prerequisites.ps-3.pe-3
+    #offset-main.container-fluid.mt-4.errc.px-0
+      .p-squeeze-lg
+        .rpm-corr
+          if (isValidToken)
+            // h1.navigation-text-color.mt-3 Ponastavi Geslo
+            form#reset-and-redirect.max-512px(
+              action="/reset-password"
+              method="POST"
+            )
+              input#reset-password.mb-3.form-control(
+                type="password"
+                placeholder=t('Geslo')
+              )
+              input#reset-password-repeat.mb-3.form-control(
+                type="password"
+                placeholder=t('Ponovi Geslo')
+              )
+              .d-flex.justify-content-between
+                button#cancel-btn.btn.btn-secondary.h-40px(type="button") #{ t('Prekliči') }
+                button#reset-password-btn.btn.btn-primary.h-40px(type="submit") #{ t('Potrdi') }
+              input#token.d-none(value=token)
+          else
+            //h1.navigation-text-color.mt-3 Obvestilo
+            p #{ t('Povezava ni (več) veljavna. Prosimo, da ponovno zahtevate ponastavitev gesla.') }
+
+    include /utilities/modal-reset-password-success
+  include /common/footer

express/views/pages/search/no-results.pug

@@ -18,9 +18,14 @@ block body
       .ps-lg-5.pe-lg-4
         .p-squeeze-lg.text-center
           img.mx-auto(src="/images/search-error.svg" alt="Search Error")
-          h1.text-blue-info-title Ni zadetkov
-          p.pb-5.mt-5.px-10-large.text-center Vaše iskanje ni bilo uspešno. Vpišite novo iskalno poizvedbo in poizkusite znova.
-          //- p.mt-5.px-20-large.h-41
-            button.btn.btn-secondary.d-inline-block.h-41.mx-2 Opcija A
-            button.btn.btn-primary.d-inline-block.h-41.mx-2 Opcija B
+          h1.text-blue-info-title #{ t("Ni zadetkov") }
+          p.pb-5.mt-5.px-10-large.text-center #{ t("Vaše iskanje ni bilo uspešno. Vpišite novo iskalno poizvedbo in poizkusite znova.") }
+          //- p.mt-5.px-20-large.h-41px
+            button.btn.btn-secondary.d-inline-block.h-41px.mx-2 Opcija A
+            button.btn.btn-primary.d-inline-block.h-41px.mx-2 Opcija B
+      .mt-4.row
+        .col.d-flex.justify-content-center
+          if (consultancyHits > 0)
+            #consulancy-results-container
+              include /components/search-and-filter/consultancy-results-content
   include /common/footer

express/views/pages/search/result-detail-dictionary.pug

@@ -4,6 +4,7 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/search-results.js")
   script(nonce=cspNonce src="/javascripts/search-results-content.js")
   script(nonce=cspNonce src="/javascripts/comments.js")
+  script(nonce=cspNonce src="/javascripts/collapsable-comments.js")
 
 block body
   section#fixed-top-section
@@ -16,7 +17,7 @@ block body
   //- include /utilities/dictionaries-main-panel-header
 
   include /utilities/dictionary-info-panel
-  - const c = { sideMenu: true, h2: '', h1: finalData.dictName, description: '', buttons: [{ type: 'link', url: `/iskanje?q=*&d=${dictId}`, content: 'Išči po slovarju' }] }
+  - const c = { sideMenu: true, h2: '', h1: finalData.dictName, description: '', buttons: [{ type: 'link', url: `/iskanje?q=*&d=${dictId}`, content: t('Išči po slovarju') }] }
   +mainHeader(c)
 
   //- empty header for code to work
@@ -32,13 +33,14 @@ block body
                 //- span SL
             //- .col-md-9
             .col
-              span!= finalData.description ? finalData.description : 'Ta slovar nima opisa'
+              span!= finalData.description ? finalData.description : t('Ta slovar nima opisa')
 
             //- .col-md-2
 
       .result-comment-section
-        .comments-content.col-12.col-md-12.py-md-3.bd-content
+        .comments-content.col-12.col-md-12.pt-md-3.bd-content
           #offset-main
-            include /utilities/comments-with-pager
+            //- include /utilities/comments-with-pager
+            include /utilities/comments-with-collapsable-pager
 
-  include /common/footer
+      include /common/footer

express/views/pages/search/result-detail.pug

@@ -4,6 +4,7 @@ block pageSpecificScipts
   script(nonce=cspNonce src="/javascripts/search-results.js")
   script(nonce=cspNonce src="/javascripts/search-results-content.js")
   script(nonce=cspNonce src="/javascripts/comments.js")
+  script(nonce=cspNonce src="/javascripts/collapsable-comments.js")
 
 block body
   section#fixed-top-section
@@ -21,7 +22,7 @@ block body
     #offset-main.main-container.ps-1.mt-2
       #chevrons-left.d-flex
         .header-container-divider-left
-          h1#site-heading O terminu
+          h1#site-heading #{ t("O terminu") }
 
       hr#disposable-break.mt-0
       .d-flex.mb-4.w-100.flex-column
@@ -42,8 +43,10 @@ block body
             +entryPreview
 
       .result-comment-section
-        .comments-content.col-12.col-md-12.py-md-3.bd-content
+        .comments-content.col-12.col-md-12.pt-md-3.mb-0.pb-0.bd-content
           #offset-main
-            include /utilities/comments-with-pager
+            //- include /utilities/comments-with-pager
+            include /utilities/comments-with-collapsable-pager
+            //- +pager
 
-  include /common/footer
+      include /common/footer

express/views/pages/search/results.pug

@@ -19,9 +19,9 @@ block body
   #offset-padding.offset-padding.header-section-root 
 
   .content-hold-prerequisites.mt-4
-    #offset-main.main-container.ps-1.mt-2
+    #offset-main.main-container.ps-1
       .d-flex.mb-4.w-100
         include /components/search-and-filter/result-panel
         +result-panel(entries)
 
-  include /common/footer
+      include /common/footer

express/views/pages/search/special-keys-demo.pug

@@ -1,3 +1,5 @@
+//- TODO MARK FOR DELETION
+
 extends /layout
 
 block pageSpecificScipts

express/views/pages/terms-of-use_en.pug

@@ -0,0 +1,20 @@
+extends /layout
+
+block body
+  section.sticky-top
+    include /common/main-navigation
+    +main-navigation(false)
+  .consultancy-padding-main.p-squeeze-lg.mt-2
+    h1 TERMS OF USE - SLOVENIAN TERMINOLOGY PORTAL
+    p Welcome to Slovenian Terminology Portal, which was developed as part of the #[i Development of Slovene in a Digital Environment Project], co-financed by the Ministry of Culture of the Republic of Slovenia and the European Regional Development Fund.
+    p The website was created to allow integrated use and editing of Slovenian terminology resources in one place.
+    p We ask all visitors of our website to comply with the Terms of Use listed below. By visiting this website, you agree to accept the Terms of Use in their entirety.
+    p Users can use the Slovenian Terminology Portal under the #[a(href="https://creativecommons.org/licenses/by/4.0/legalcode.sl" target="_blank") CC BY 4.0] licence. All resources you edit and publish on the Slovenian Terminology Portal will also be available to other registered users under the CC BY 4.0 licence.
+    .mt-2
+    h2 Personal Data Protection
+    p Slovenian Terminology Portal uses cookies. You can read more about how we handle personal data in our #[a(href="/politika-zasebnosti" target="_blank") Privacy Policy].
+    p Thank you for visiting Slovenian Terminology Portal.
+    .mt-2
+    h2 Contact
+    p If you have any questions related to our Terms of Use, please contact us at #[a(href="mailto:info@terminoloski.slovenscina.eu") info@terminoloski.slovenscina.eu].
+  include /common/footer

express/views/pages/terms-of-use_sl.pug

@@ -14,5 +14,7 @@ block body
     h2 Varstvo osebnih podatkov
     p Slovenski terminološki portal uporablja piškotke. Več o obdelavi osebnih podatkov je navedeno v #[a(href="/politika-zasebnosti" target="_blank") Politiki zasebnosti].
     p Zahvaljujemo se vam za obisk.
-
+    .mt-2
+    h2 Kontakt
+    p Za kakršnakoli vprašanja v povezavi s pogoji uporabe nas, prosimo, kontaktirajte na #[a(href="mailto:info@terminoloski.slovenscina.eu") info@terminoloski.slovenscina.eu].
   include /common/footer