first message

GlobalChanges · Mar 29, 2021 · 994c7c0 · 994c7c0
1 parent 4c57c4b
commit 994c7c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -69,7 +69,7 @@
                        class="nav-link shadow-soft shadow-button border border-light bg-primary  mt-n5 mx-auto"> 
                       <i class="fa-3x fas fa-images clouds"></i><br><br><h5 :class="('gallery' == currentPage) ? 'clouds' : 'ocean'">Gallery</h5></a>
                 </li>
-                <li class="nav-item text-center mr-lg-5">
+                <li class="nav-item text-center">
                     <a href="#" @click="setPage('map')" :class="('map' == currentPage) && 'shadow-button-active'" 
                        class="nav-link shadow-soft shadow-button border border-light bg-primary  mt-n5 mx-auto"> 
                       <i class="fa-3x fas fa-map-marked-alt clouds"></i><br><br><h5 :class="('map' == currentPage) ? 'clouds' : 'ocean'">Map</h5></a>
@@ -80,14 +80,14 @@
         <div class="d-flex align-items-center">
             <ul class="navbar-nav navbar-nav-hover align-items-lg-center">
               <li class="nav-item text-center sm-text" >
-                <a href="#" @click="setLanguage('de')" :class="('de' == currentLanguage) && 'shadow-button-active'" 
+                <a href="#" @click="setLanguage('de')" :class="checkLanguage('de') && 'shadow-button-active'" 
                    class="nav-link shadow-soft shadow-button border border-light bg-primary  mt-n5 mx-auto"> 
-                  <img src="./img/language-de.png" width="40px" height="30px" /><br><br><h5 :class="('de' == currentLanguage) ? 'clouds' : 'ocean'">Deutsch</h5></a>
+                  <img src="./img/language-de.png" width="40px" height="30px" /><br><br><h5 :class="checkLanguage('de') ? 'clouds' : 'ocean'">Deutsch</h5></a>
             </li>
             <li class="nav-item text-center sm-text">
-                <a href="#" @click="setLanguage('en')" :class="('en' == currentLanguage) && 'shadow-button-active'" 
+                <a href="#" @click="setLanguage('en')" :class="checkLanguage('en') && 'shadow-button-active'" 
                    class="nav-link shadow-soft shadow-button border border-light bg-primary  mt-n5 mx-auto"> 
-                   <img src="./img/language-en.png" width="40px" height="30px" /><br><br><h5 :class="('en' == currentLanguage) ? 'clouds' : 'ocean'">English</h5></a>
+                   <img src="./img/language-en.png" width="40px" height="30px" /><br><br><h5 :class="checkLanguage('en') ? 'clouds' : 'ocean'">English</h5></a>
             </li>
             </ul>
             <button class="navbar-toggler ml-2" type="button" data-toggle="collapse"
@@ -198,7 +198,7 @@ <h6 class="dropdown-header">Countries</h6>
  </div> 
 
  <div class="row" v-show="checkPage('about')">
-  About
+  {{ $t("message.about") }}
  </div>
 
  <div class="row" v-show="checkPage('map')">

diff --git a/docs/js/gcpe.js b/docs/js/gcpe.js
@@ -135,8 +135,8 @@ var vueGCPE = new Vue({
         filterTopic: "Alle",
         filterMethod: "Alle",
         filterYear: "Alle",
-        currentLanguage: "de",
-        languageMessages: {en: {}, de: {}}
+        //currentLanguage: "de",
+        //languageMessages: {en: {}, de: {}}
   },
   methods: {
      setPage: function(page) {
@@ -147,9 +147,13 @@ var vueGCPE = new Vue({
        return ((this.currentPage == page) || (this.currentPage == "all"));  
      },
      setLanguage: function(language) {
-      this.currentLanguage = language;
+      //this.currentLanguage = language;
+      this.$i18n.locale = language;
       return false; 
      },
+     checkLanguage: function(language) {
+       return (this.$i18n.locale == language);
+     },
      resetPosters: function() { 
        this.allPosterData = [];
        this.allPosterContinents = [];
@@ -336,7 +340,8 @@ var vueGCPE = new Vue({
      },
      addLocale: function(language, locale) {
       //languageMessages[language] = locale;  //better merge
-      this.$i18n.setLocaleMessage(language, locale);
+      //this.$i18n.setLocaleMessage(language, locale);
+      this.$i18n.mergeLocaleMessage(language, locale);
      },
      setLocationFilter: function(location) {
        this.filterLocation = location;