Skip to content
Snippets Groups Projects
Commit a2814ce2 authored by Ole Voldsæter's avatar Ole Voldsæter
Browse files

nob & nno -> bob & nob

parent 07c336df
No related branches found
No related tags found
No related merge requests found
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
</template> </template>
</autocomplete> </autocomplete>
<span class="lang-select-intro">SØK PÅ</span> <span class="lang-select-intro">SØK PÅ</span>
<input type="radio" id="radio_both" value="nob,nno" v-model="lang"> <input type="radio" id="radio_both" value="bob,nob" v-model="lang">
<label for="radio_both">Begge</label> <label for="radio_both">Begge</label>
<input type="radio" id="radio_bob" value="bob" v-model="lang">
<label for="radio_bob">Bokmål</label>
<input type="radio" id="radio_nob" value="nob" v-model="lang"> <input type="radio" id="radio_nob" value="nob" v-model="lang">
<label for="radio_nob">Bokmål</label> <label for="radio_nob">Nynorsk</label>
<input type="radio" id="radio_nno" value="nno" v-model="lang">
<label for="radio_nno">Nynorsk</label>
- -
<input type="radio" id="radio_norsk" value="norsk_ordbok" v-model="lang"> <input type="radio" id="radio_norsk" value="norsk_ordbok" v-model="lang">
<label for="radio_norsk">Norsk Ordbok</label> <label for="radio_norsk">Norsk Ordbok</label>
...@@ -72,7 +72,7 @@ export default { ...@@ -72,7 +72,7 @@ export default {
return { return {
article_key: 0, article_key: 0,
search_results: [], search_results: [],
lang: 'nob', lang: 'bob,nob',
waiting: true, waiting: true,
article: {lemmas: [], body:{pronunciation: [], definitions: [], etymology: []}} article: {lemmas: [], body:{pronunciation: [], definitions: [], etymology: []}}
} }
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
} }
}, },
mounted: function(){ mounted: function(){
this.lang = this.$route.params.lang || this.$route.query.lang || 'nob,nno' this.lang = this.$route.params.lang || this.$route.query.lang || 'bob,nob'
var self = this; var self = this;
if(this.$route.query.q) { if(this.$route.query.q) {
axios.get(api_endpoint + '/' + self.lang + '/_search?q=' + self.$route.query.q + ' ' + self.$route.query.q + '*&size=20') axios.get(api_endpoint + '/' + self.lang + '/_search?q=' + self.$route.query.q + ' ' + self.$route.query.q + '*&size=20')
...@@ -177,7 +177,7 @@ export default { ...@@ -177,7 +177,7 @@ export default {
}, },
watch: { watch: {
$route(to, from) { $route(to, from) {
this.lang = this.$route.params.lang || this.$route.query.lang || 'nob,nno' this.lang = this.$route.params.lang || this.$route.query.lang || 'bob,nob'
} }
} }
} }
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
</template> </template>
<script> <script>
//import axios from "axios";
import DefElement from './DefElement.vue' import DefElement from './DefElement.vue'
import Definition from './Definition.vue' import Definition from './Definition.vue'
import Header from './Header.vue' import Header from './Header.vue'
......
...@@ -14,8 +14,8 @@ import languages from '../utils/languages.js' ...@@ -14,8 +14,8 @@ import languages from '../utils/languages.js'
import helpers from '../utils/helpers.js' import helpers from '../utils/helpers.js'
let labels = { let labels = {
'nob': 'Bokmål', 'bob': 'Bokmål',
'nno': 'Nynorsk', 'nob': 'Nynorsk',
'norsk_ordbok': 'Norsk Ordbok' 'norsk_ordbok': 'Norsk Ordbok'
} }
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<section> <section>
<h2 v-if="hits.length">Søkeresultater</h2> <h2 v-if="hits.length">Søkeresultater</h2>
<div class="flex-container"> <div class="flex-container">
<ul class="hits" v-if="results_nob.length"> <ul class="hits" v-if="results_bob.length">
<li><h4>Bokmål</h4></li> <li><h4>Bokmål</h4></li>
<Preview v-for="(result, index) in results_nob" :key="index" :searchHit="result" @click.native="article_link_click(result)"> <Preview v-for="(result, index) in results_bob" :key="index" :searchHit="result" @click.native="article_link_click(result)">
</Preview> </Preview>
</ul> </ul>
<ul class="hits" v-if="results_nno.length"> <ul class="hits" v-if="results_nob.length">
<li><h4>Nynorsk</h4></li> <li><h4>Nynorsk</h4></li>
<Preview v-for="(result, index) in results_nno" :key="index" :searchHit="result" @click.native="article_link_click(result)"> <Preview v-for="(result, index) in results_nob" :key="index" :searchHit="result" @click.native="article_link_click(result)">
</Preview> </Preview>
</ul> </ul>
<ul class="hits" v-if="results_norsk.length"> <ul class="hits" v-if="results_norsk.length">
...@@ -32,12 +32,12 @@ export default { ...@@ -32,12 +32,12 @@ export default {
lang: String lang: String
}, },
computed: { computed: {
results_bob: function(){
return this.hits.filter(hit => hit._index == 'bob')
},
results_nob: function(){ results_nob: function(){
return this.hits.filter(hit => hit._index == 'nob') return this.hits.filter(hit => hit._index == 'nob')
}, },
results_nno: function(){
return this.hits.filter(hit => hit._index == 'nno')
},
results_norsk: function(){ results_norsk: function(){
return this.hits.filter(hit => hit._index == 'norsk_ordbok') return this.hits.filter(hit => hit._index == 'norsk_ordbok')
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment