Skip to content

Commit

Permalink
Merge branch '27-adjust_footer' into 'main'
Browse files Browse the repository at this point in the history
Resolve "Volgorde footer wijzigen"

Closes MinBZK#27

See merge request ictu/devops/algoritmeregister/algoritmeregister!11
  • Loading branch information
tcrapts-ictu committed Dec 6, 2022
2 parents 4addeab + 1684da0 commit 056bf78
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
6 changes: 6 additions & 0 deletions frontend/components/views/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
<div class="footer row--footer" role="contentinfo">
<div class="container columns">
<div>
<<<<<<< HEAD
{{ t('footer.text') }}&nbsp;<NuxtLink :to="'/footer/over'">{{
t('footer.textAskApply')
}}</NuxtLink>
=======
{{ t('footer.text') }} {{ t('footer.textAskApply') }} '<NuxtLink
:to="'footer/over'"
>{{ t('footer.paths.over') }}</NuxtLink
>'.
>>>>>>> main
</div>
<div></div>
<div v-for="footerKey in footerKeys" :key="footerKey">
Expand Down
4 changes: 4 additions & 0 deletions frontend/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
"noResults": "No algorithm was found for this search request.",
"footer": {
"text": "Note: this website is under development. Information will change often. Do you want to help?",
<<<<<<< HEAD
"textAskApply": "Please apply.",
=======
"textAskApply": "Please apply at",
>>>>>>> main
"paths": {
"algoritme": "Overview",
"over": "About this website",
Expand Down
4 changes: 4 additions & 0 deletions frontend/locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
"noResults": "Geen algoritmes gevonden voor de huidige zoekopdracht.",
"footer": {
"text": "Let op: deze website is in ontwikkeling. De informatie verandert vaak. Wil je meehelpen?",
<<<<<<< HEAD
"textAskApply": "Meld je dan aan.",
=======
"textAskApply": "Meld je aan bij",
>>>>>>> main
"paths": {
"algoritme": "Algoritmeoverzicht",
"over": "Over deze website",
Expand Down

0 comments on commit 056bf78

Please sign in to comment.