betterplace-content 0.7.28 → 0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50453c4fd5b07ad995d02e20745b8be683202d0b6fba577c650b1a1b7afb2a0
-  data.tar.gz: 1eeaaeae210c2644727418f4bbe094546e3fdf43da8caf7e51c11be907240f0c
+  metadata.gz: 1e6c945e902a000be82e9045476ca5341e33179a66bc9cc8f9b73e97107bb2ae
+  data.tar.gz: 19638ad0c81503a61c63baa173d1e8487bc0b30cf0142bf9d0d4cc8851511d3f
 SHA512:
-  metadata.gz: 42800bd19f2c2a7c0a62f7f6134fdd7cb3618b10f76d917eb620687fcbb43789fad03d3f5235762707e3d170ffed4dcb15eb450483508df59b2e95c9fe6716da
-  data.tar.gz: 2404b8813f83ed3988ad81be6660097dc05e6cd23dbade3bb94b5b04ab19a73d8ee5fadb2f2423c450dce33cf4689e568359c96f9b47f2bd59bc6ef1c1f948f7
+  metadata.gz: a9b5eae05eee2860fc24098c3952b27d491405495994276d01d5e3483a3d3b30162a13bd2ae709f115bbb28733e1d235459553904b7459d019f3b6b99c140aba
+  data.tar.gz: 4ef07414ca68e55d78baf8933f3833f68ee7004e104c07768642ff77827382983bf6142472e2c5ee1d77a1698bb8f882a85dccb495e4b5bb2d9450b451252881

data/_layouts/default.html

@@ -34,25 +34,8 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 
 <title>{{ page.title | default:'betterplace.org' }}</title>
 
-{% if page.translation_url %}
-
-{% if site.lang == "de" %}
-{% assign self_url = hostname | append: site.baseurl %}
-{% assign translation_url = page.translation_url %}
-{% assign default_url = hostname | append: site.baseurl %}
-{% else %}
-{% assign self_url = hostname | append: site.baseurl %}
-{% assign translation_url = page.translation_url %}
-{% assign default_url = page.translation_url %}
-{% endif %}
-
-<link rel="alternate" hreflang="{{ site.lang }}" href="{{ self_url }}">
-<link rel="alternate" hreflang="{{ site.translation_lang }}" href="{{ translation_url }}">
-<link rel="alternate" hreflang="x-default" href="{{ default_url }}">
-
-{% endif %}
-{% if page.multiple_translation_urls %}
-{% for item in page.multiple_translation_urls %}
+{% if page.alternate_url %}
+{% for item in page.alternate_url %}
 <link rel="alternate" hreflang="{{ item[0] | replace:'_','-' }}" href="{{ item[1] | replace:'https://www.betterplace.org',hostname }}">
 {% endfor %}
 {% endif %}
@@ -97,8 +80,17 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 {% endcapture %}
 
 {% capture language_switch_content %}
-  {% if page.translation_url %}
-    <a onclick="ga(&#39;send&#39;, &#39;event&#39;, &#39;navigation header&#39;, &#39;{{ page.translation_url | replace:'https://www.betterplace.org','' }}&#39;);" class="language-switcher" href="{{ page.translation_url | replace:'https://www.betterplace.org',hostname }}">{{ other_lang }}</a>
+  {% if page.alternate_url %}
+    {% if site.translation_lang == 'de' %}
+      {% if page.alternate_url contains 'de_DE' %}
+        {% assign translation = 'de_DE' %}
+      {% else %}
+        {% assign translation = 'de' %}
+      {% endif %}
+    {% else %}
+      {% assign translation = site.translation_lang %}
+    {% endif %}
+    <a onclick="ga(&#39;send&#39;, &#39;event&#39;, &#39;navigation header&#39;, &#39;{{ page.alternate_url[translation] | replace:'https://www.betterplace.org','' }}&#39;);" class="language-switcher" href="{{ page.alternate_url[translation] | replace:'https://www.betterplace.org',hostname }}">{{ other_lang }}</a>
   {% else %}
     <span style="text-decoration: line-through; color: #cccccc;" class="language-switcher">{{ other_lang }}</span>
   {% endif %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterplace-content
 version: !ruby/object:Gem::Version
-  version: 0.7.28
+  version: 0.7.29
 platform: ruby
 authors:
 - betterplace.org Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll