diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index 4aca85df95b37927fa3f945672823f8fbfd91d5d..57612e0f72e8c6275f64f2d3db3c9300c0561a73 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -6,25 +6,25 @@ <SearchToolbar @updatePos="update_pos" @updateScope="update_scope"/> </div> - <div id="above_results" v-if="$route.name" :class="$vuetify.breakpoint.name"> + <div id="notifications" v-if="$route.name" :class="$vuetify.breakpoint.name"> <div id="suggestions" v-if="!article && !no_results"> <div class="search_notification" v-if="inflection_suggestions && inflection_suggestions.length"><v-icon left color="primary">info</v-icon><em>{{$route.query.q}}</em> er en bøyd form av <span v-for="(item,index) in inflection_suggestions" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(item[0])">{{item[0]}}</router-link>{{index == inflection_suggestions.length-1? '.' : ', '}}</span> </div> - <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.nn && search_results.nn.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Nynorskordboka: + <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.nn && search_results.nn.length == 0)"><v-icon left color="primary">info</v-icon>{{$t('notifications.similar_nn')}} <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> </div> - <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.bm && search_results.bm.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Bokmålsordboka: + <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.bm && search_results.bm.length == 0)"><v-icon left color="primary">info</v-icon>{{$t('notifications.similar_bm')}} <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> </div> </div> <div id="return_to_results" v-if="article"> <router-link id="return_link" v-if="$store.state.searchRoute" :to="$store.state.searchRoute" @click.native="return_to_results()"> - <v-icon left class="nav_arrow">chevron_left</v-icon>{{$t("back_to_results")}} + <v-icon left class="nav_arrow">chevron_left</v-icon>{{$t("notifications.back")}} </router-link> <a id="return_link" v-if="!$store.state.searchRoute" href="/"> - <v-icon left class="nav_arrow">search</v-icon>Søk i ordbøkene + <v-icon left class="nav_arrow">search</v-icon>{{$t('notificaitons.search')}} </a> </div> @@ -72,11 +72,11 @@ </div> <div class="no_results" v-if="no_results && !error"> <div> - <p><v-icon left color=primary>error</v-icon> <strong>Ingen treff <span v-if="pos_selected"> i søk på {{$t('pos_plural.'+pos_selected)}}</span></strong></p> - <p v-if="!article && !no_results && inflection_suggestions && inflection_suggestions.length"><em>{{$route.query.q}}</em> er en bøyd form av + <p><v-icon left color=primary>error</v-icon> <strong>{{$t('notifications.no_results')}}<span v-if="pos_selected">{{$t('notifications.no_pos_results')}}{{$t('pos_plural.'+pos_selected)}}</span></strong></p> + <p v-if="!article && !no_results && inflection_suggestions && inflection_suggestions.length"><em>{{$route.query.q}}</em>{{$t('notifications.inflected')}} <span v-for="(item,index) in inflection_suggestions" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(item[0])">{{item[0]}}</router-link>{{index == inflection_suggestions.length-1? '.' : ', '}}</span> - <p class="suggest_lang" v-if="lang=='bm'">Har du søkt i feil ordbok?<br>Prøv å søke i <router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('nn')">Nynorskordboka</router-link></p> - <p class="suggest_lang" v-if="lang=='nn'">Har du søkt i feil ordbok?<br>Prøv å søke i <router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('bm')">Bokmålsordboka</router-link></p> + <p class="suggest_lang" v-if="lang=='bm'">{{$t('notifications.suggest_dict[0]')}}<br>{{$t('notifications.suggest_dict[1]')}}<router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('nn')">{{$t('dicts.nn')}}</router-link></p> + <p class="suggest_lang" v-if="lang=='nn'">{{$t('notifications.suggest_dict[0]')}}<br>{{$t('notifications.suggest_dict[1]')}}<router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('bm')">{{$t('dicts.bm')}}</router-link></p> <article v-if="similar && similar.length" :class="'v-sheet v-card rounded-xl did_you_mean ' + $vuetify.breakpoint.name"> <span class="dict-label">Mente du:</span> <v-list> @@ -636,19 +636,19 @@ div.welcome article { margin: auto; } -#search_results, #spinner, #above_results, #single_article_container, div.welcome, div.search_container, .error, .no_results { +#search_results, #spinner, #notifications, #single_article_container, div.welcome, div.search_container, .error, .no_results { padding-left: calc((100vw - 1200px) / 2); padding-right: calc((100vw - 1200px) / 2); } -#above_results .search_notification { +#notifications .search_notification { padding-top: 24px; padding-bottom: 0px; margin-left: 10px; font-size: 18px; } -#above_results.sm .search_notification, #above_results.xs .search_notification { +#notifications.sm .search_notification, #notifications.xs .search_notification { padding-top: 10px; } diff --git a/src/locales/nob.json b/src/locales/nob.json index 36453f354e44806927e219697708d0a3f495f32e..6964548f92c606cde59b11137c8e1b6c1c815424 100644 --- a/src/locales/nob.json +++ b/src/locales/nob.json @@ -40,6 +40,20 @@ }, "reset": "Slett lagrede innstillinger" }, + "notifications": { + "inflected": "er en bøyd form av", + "similar": "", + "similar_bm": "Legg til lignende treff fra Bokmålsordboka:", + "similar_nn": "Legg til lignende treff fra Nynorskordboka:", + "search": "Søk i ordbøkene", + "back": "Tilbake til søk", + "no_results": "Ingen treff", + "no_pos_results": " i søk på", + "suggest_dict": [ + "Har du søkt i feil ordbok?", + "Prøv å søke i " + ] + }, "article": { "show_inflection": "Vis bøyning", "hide_inflection": "Skjul bøyning", @@ -64,7 +78,6 @@ "close": "Lukk", "choose": "Velg", "back": "Tilbake", - "back_to_results": "Tilbake til søk", "pos": { "NOUN": "substantiv", "PRON": "pronomen",