From 7a834bb8fc9fd23928abb52336f1ac7535d3279c Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Wed, 1 Dec 2021 11:54:49 +0100
Subject: [PATCH] translations, use chevron arrows
---
src/components/ArticleFooter.vue | 12 +++----
src/components/DictionaryView.vue | 2 +-
src/components/Header.vue | 4 +--
src/locales/nno.json | 60 ++++++++++++++++++++++++++++++-
src/locales/nor.json | 9 +++++
5 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/src/components/ArticleFooter.vue b/src/components/ArticleFooter.vue
index 701457fc..dcc15cf7 100644
--- a/src/components/ArticleFooter.vue
+++ b/src/components/ArticleFooter.vue
@@ -20,16 +20,16 @@
<v-btn v-if="showLinkCopy"
x-small depressed class="toolbar-button" rounded tabindex="0" @click="copy_link">
- <v-icon small>link</v-icon><span class = "button-text">Kopier lenke</span>
+ <v-icon small>link</v-icon><span class = "button-text">{{$t("article_footer.copy_link")}}</span>
</v-btn>
<v-btn v-if="webShareApiSupported" depressed x-small class="toolbar-button" rounded tabindex="0" @click="shareViaWebShare">
- <v-icon x-small>share</v-icon><span class = "button-text">Del ordet</span>
+ <v-icon x-small>share</v-icon><span class = "button-text">{{$t("article_footer.share")}}</span>
</v-btn>
<v-dialog max-width="600px" v-model="citation_dialog">
<template v-slot:activator="{ on, attrs }">
<v-btn depressed x-small class="toolbar-button" rounded tabindex="0" v-on="on" v-bind="attrs">
- <v-icon x-small>format_quote</v-icon> <span class = "button-text">Siter</span>
+ <v-icon x-small>format_quote</v-icon> <span class = "button-text">{{$t("article_footer.cite")}}</span>
</v-btn>
</template>
@@ -39,13 +39,13 @@
"bm": "Ønsker du å sitere denne artikkelen i Bokmålsordboka, anbefaler vi å oppgi når artikkelen ble hentet (lest), f.eks. slik:"}[this.article.dictionary]}}<br/>
<div id = "citation" v-html="this.create_citation()"/>
<v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="copy_citation"><br>
- <v-icon x-small icon>content_copy</v-icon> <span class = "button-text">Kopier</span>
+ <v-icon x-small icon>content_copy</v-icon> <span class = "button-text">{{$t("article_footer.copy")}}</span>
</v-btn>
<v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="download_ris"><br>
- <v-icon x-small icon>get_app</v-icon> <span class = "button-text">Last ned (RIS)</span>
+ <v-icon x-small icon>get_app</v-icon> <span class = "button-text">{{$t("article_footer.download")}}</span>
</v-btn>
<v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="close_citation_dialog"><br>
- <v-icon x-small icon>close</v-icon> <span class = "button-text">Avbryt</span>
+ <v-icon x-small icon>close</v-icon> <span class = "button-text">{{$t("article_footer.cancel")}}</span>
</v-btn>
</v-card>
</v-dialog>
diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue
index b2784461..14e436ea 100644
--- a/src/components/DictionaryView.vue
+++ b/src/components/DictionaryView.vue
@@ -19,7 +19,7 @@
<div id="single_article_container" v-if="article">
<div class="return_to_results" v-if="search_results && search_results.length">
<router-link :to="article.source" @click.native="return_to_results()">
- <v-icon class="nav_arrow">arrow_left</v-icon>Tilbake til {{article.dictionary == 'bm' ? 'søkeresultater' : 'søkjeresultat'}}
+ <v-icon class="nav_arrow">chevron_left</v-icon>{{$t("back_to_results")}}
</router-link>
</div>
<Article :key="article_key" :article="article" @article-click="article_link_click" />
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 5ee194af..fa7d039e 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -24,7 +24,7 @@
<div class="inflection-wrapper" v-if="inflected">
<v-btn class="show-inflection" width="160px" rounded depressed small @click.native="toggle" :class="$vuetify.breakpoint.name">
- <span>{{inflection_button_text}}</span><span class = "inflection-arrow">{{inflection_arrow}}</span>
+ <span>{{inflection_button_text}}</span><span class = "inflection-arrow"><v-icon right>{{inflection_arrow}}</v-icon></span>
</v-btn>
<div class="inflection-canvas" v-if="inflection_expanded">
<inflectionTable :lemmaList="lemmas_with_word_class_and_lang" :mq="$vuetify.breakpoint.name" />
@@ -88,7 +88,7 @@ export default {
}[this.dictionary][this.inflection_expanded]
},
inflection_arrow: function() {
- return this.inflection_expanded? "â–²" : "â–¼"
+ return this.inflection_expanded? "expand_less" : "expand_more"
},
group_list: function() {
return helpers.group_list(this.lemmas, this.dictionary)
diff --git a/src/locales/nno.json b/src/locales/nno.json
index 077404aa..5040635b 100644
--- a/src/locales/nno.json
+++ b/src/locales/nno.json
@@ -1,3 +1,61 @@
{
-
+ "sub-title": "Bokmålsordboka og Nynorskordboka",
+ "dicts": {
+ "nn": "nynorskorboka (nn)",
+ "bm": "bokmålsordboka (bm)",
+ "bm,nn": "begge ordbøkene"
+ },
+ "menu": {
+ "title": "Meny",
+ "help-and-info": "Hjelp og informasjon",
+ "about": "Om ordbøkene",
+ "reset": "Tilbakestill"
+ },
+ "settings": {
+ "title": "Innstillinger",
+ "showSearchToolbar": "Vis verktøylinje for søkealternativer",
+ "showHGNO": "Vis homografnumre",
+ "showInflectionNo": "Vis bøyningsnumre",
+ "language": "Språk",
+ "locale": "Brukergrensesnitt",
+ "default-dict": "Standard ordbokvisning"
+ },
+ "error": {
+ "dicts": {
+ "nn": "Nynorskorboka",
+ "bm": "Bokmålsordboka",
+ "bm,nn": "ordbøkene"
+ }
+ },
+ "article_footer": {
+ "share": "Del ordet",
+ "copy_link": "Kopier lenke",
+ "cite": "Siter",
+ "description": "Ønskjer du å sitere denne artikkelen i Nynorskordboka, rår vi deg til å gje opp når artikkelen vart henta (lesen), t.d. slik:",
+ "copy": "Kopier",
+ "download": "Last ned",
+ "cancel": "Avbryt"
+ },
+ "close": "Lukk",
+ "choose": "Vel",
+ "back": "Tilbake",
+ "back_to_results": "Tilbake til søkjeresultat",
+ "pos": {
+ "ALL": "alle ordklasser",
+ "NOUN": "substantiv",
+ "PRON": "pronomen",
+ "DET": "determinativ",
+ "ADJ": "adjektiv",
+ "CCONJ": "konjunksjon",
+ "SCONJ": "subjunksjon",
+ "ADV": "adverb",
+ "ADP": "preposisjon",
+ "VERB": "verb",
+ "INTJ": "interjeksjon"
+ },
+ "scope": {
+ "w": "lemmasøk",
+ "x": "fritekstsøk",
+ "wx": "lemmasøk + fritekstsøk"
+ }
}
\ No newline at end of file
diff --git a/src/locales/nor.json b/src/locales/nor.json
index a43b2473..ac4a97b5 100644
--- a/src/locales/nor.json
+++ b/src/locales/nor.json
@@ -27,6 +27,15 @@
"bm,nn": "ordbøkene"
}
},
+ "article_footer": {
+ "share": "Del ordet",
+ "copy_link": "Kopier lenke",
+ "cite": "Siter",
+ "description": "Ønsker du å sitere denne artikkelen i Bokmålsordboka, anbefaler vi å oppgi når artikkelen ble hentet (lest), f.eks. slik:",
+ "copy": "Kopier",
+ "download": "Last ned",
+ "cancel": "avbryt"
+ },
"close": "Lukk",
"choose": "Velg",
"back": "Tilbake",
--
GitLab