Merge pull request #409 from minvws/develop

Update content 20-10
minvws · Oct 20, 2020 · 91b2af0 · 91b2af0
2 parents 2eb6a0d + 5d8fcb8
commit 91b2af0
Show file tree

Hide file tree

Showing 174 changed files with 1,270 additions and 1,075 deletions.
diff --git a/_data/translations.yml b/_data/translations.yml
@@ -172,8 +172,8 @@ header-language-picker-current-lang:
 #   en: 
 
 govlogo:
-  nl: Home
-  en: Home
+  nl: Logo Rijksoverheid, homepage
+  en: Logo Dutch Government, homepage
   ar: الصفحة الرئيسية
   bg: Начална страница
   de: Home
@@ -182,6 +182,18 @@ govlogo:
   pl: Strona główna
   ro: Pagina inițială
   tr: Anasayfa
+
+header__logo-badge:
+  nl: Logo CoronaMelder app
+  en: Logo CoronaMelder app
+  ar: CoronaMelder شعار تطبيق 
+  bg: Лого на приложението CoronaMelder
+  de: Logo CoronaMelder-App
+  es: Logo del app CoronaMelder
+  fr: Logo du l’appli CoronaMelder
+  pl: Logo aplikację CoronaMelder
+  ro: Siglă aplicația CoronaMelder
+  tr: CoronaMelder uygulamasını logosu
 
 phone-action:
   nl: <a href="tel:0800-1280">0800-1280</a>
@@ -378,9 +390,9 @@ english:
   tr: (ingilizce)
 
 info-lead:
-  nl: Het coronavirus is er nog altijd. Dus is het belangrijk om juist nu alert te blijven. Daarom is CoronaMelder nu te gebruiken voor heel Nederland.
+  nl: Het coronavirus is er nog altijd. Dus is het belangrijk om juist nu alert te blijven. Daarom is CoronaMelder nu te gebruiken voor heel Nederland. Op 19 oktober hadden <strong>3.348.754</strong> mensen de app gedownload.
   en: Coronavirus is still around and we need to stay alert, especially right now. The CoronaMelder app can help us all to do this and it is now available throughout the whole of the Netherlands.
-  ar: لا يزال فيروس كورونا موجودًا حتى يومنا هذا. من المهم إذًا أن تبقى يقظًا الآن. متاحًا في هولندا كلها CoronaMelder لذلك أصبح
+  ar: لا يزال فيروس كورونا موجودًا حتى يومنا هذا. من المهم إذًا أن تبقى يقظًا الآن. لذلك أصبح CoronaMelder متاحًا في هولندا كلها.
   bg: Коронавирусът е все още тук. От особена важност сега е да запазиш бдителността си. Именно за тази цел приложението CoronaMelder вече е достъпно в цяла Нидерландия.
   de: Das Coronavirus ist immer noch unter uns. Es ist wichtig, gerade jetzt wachsam zu bleiben. Deshalb ist CoronaMelder nun landesweit in den Niederlanden verfügbar.
   es: El coronavirus sigue entre nosotros. En estos momentos es muy importante no bajar la guardia. Para eso tenemos la app CoronaMelder, disponible ya para todos los Países Bajos.

diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
@@ -4,31 +4,35 @@
   {%- assign langSlug = site.baseurl | append: '/' | append: page.lang -%}
 {%- endif -%}
 
-
-<p class="content-center__home breadcrumbs">
-
+<nav class="content-center__home breadcrumbs" aria-label="Je bent hier"> 
+  <ul> 
   {% for crumb in crumbs offset: 1 %}
   {{% assign start_crumb = '' %}}
     {% if forloop.first %}
-    <a class="breadcrumbs" href="{{langSlug}}">
-      {{ site.data.translations.layout-template-home[page.lang] }}
-    </a>
+    <li class="breadcrumbs-item"> 
+        <a class="breadcrumbs" href="{{langSlug}}">
+          {{ site.data.translations.layout-template-home[page.lang] }}
+        </a>
+        {% if forloop.last == false %}
+          <span class="icon icon-chevron-right"></span>
+        {% endif %}
+    </li> 
     {% elsif forloop.last == false %}
-      <a class="breadcrumbs" href="{{langSlug}}/faq">
-        {{ site.data.translations.faq[page.lang] | truncate: 40 }}
-      </a>
+      <li  class="breadcrumbs-item">
+        <a class="breadcrumbs" href="{{langSlug}}/faq">
+          {{ site.data.translations.faq[page.lang] | truncate: 40 }}
+        </a>
+        <span class="icon icon-chevron-right"></span>
+      </li>
     {% else %}
-      {% if page.contentLang == 'en' %}
-        <a class="breadcrumbs disabled" dir="ltr" lang="en">{{ include.title | truncate: 40 }}</a>
-      {% else %}
-        <a class="breadcrumbs disabled">{{ include.title | truncate: 40 }}</a>
-      {% endif %}
-    {% endif %}
-    {% if forloop.last == false %}
-      <span class="icon icon-chevron-right"></span>
-    {% endif %}
-  {% endfor %}
-</p>
-
-
-
+      <li class="breadcrumbs-item"> 
+        {% if page.contentLang == 'en' %}
+          <span class="breadcrumbs disabled" dir="ltr" lang="en" aria-current="page">{{ include.title | truncate: 40 }}</span>
+        {% else %}
+          <span class="breadcrumbs disabled" aria-current="page">{{ include.title | truncate: 40 }}</span>
+        {% endif %}
+      </li> 
+    {% endif %} 
+    {% endfor %}
+  </ul> 
+</nav>
diff --git a/_includes/content/15-wat-zijn-de-resultaten-van-de-praktijktest.md b/_includes/content/15-wat-zijn-de-resultaten-van-de-praktijktest.md
@@ -1,2 +1,2 @@
 
-Before the national launch of CoronaMelder, 5 regions were already tested the app. These tests shows that the app works in the daily practice of the GGDs. They supported over 600 people, who turned out to be infected with the virus, to share this with other users of the app via CoronaMelder. 
+TBA
diff --git a/_includes/content/16-is-de-app-100procent-veilig.md b/_includes/content/16-is-de-app-100procent-veilig.md
diff --git a/_includes/content/16-wat-betekent-het-als-ik-een-melding-krijg.md b/_includes/content/16-wat-betekent-het-als-ik-een-melding-krijg.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/17-hoe-betrouwbaar-is-een-melding.md b/_includes/content/17-hoe-betrouwbaar-is-een-melding.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/17-is-de-app-100procent-betrouwbaar.md b/_includes/content/17-is-de-app-100procent-betrouwbaar.md
diff --git a/_includes/content/18-kan-de-app-precies-de-afstand-bepalen.md b/_includes/content/18-kan-de-app-precies-de-afstand-bepalen.md
@@ -1,2 +1,2 @@
 
-No, the app cannot determine the exact distance, and it is not necessary. The app uses Bluetooth to determine that you are close to other users of the app. If you receive a notification, you were close to someone who turned out to be infected, for more than 15 minutes.
+TBA
diff --git a/_includes/content/19-hoe-goed-kan-de-app-nabijheid-dan-wel-vaststellen.md b/_includes/content/19-hoe-goed-kan-de-app-nabijheid-dan-wel-vaststellen.md
diff --git a/_includes/content/20-wat-regelt-de-wet-over-de-app.md b/_includes/content/20-wat-regelt-de-wet-over-de-app.md
@@ -1,2 +1,2 @@
 
-Use of CoronaMelder is now regulated by law. It states that use of the app is voluntary.
+TBA
diff --git a/_includes/content/21-waar-meld-ik-misbruik.md b/_includes/content/21-waar-meld-ik-misbruik.md
@@ -1,9 +1,6 @@
-
-
 Call CoronaMelder Abuse Line:
-<a href="tel:+31881205100">088-1205 100</a> (free)
-
-**Opening hours:**
+<a href="tel:+31881205100">088-1205 100</a> (local charges)
 
+**Opening hours:**<br />
 Monday to Friday<br />
 9:00 am - 5:00 pm
diff --git a/_includes/content/22-kan-het-testadvies-van-de-app-nog-veranderen.md b/_includes/content/22-kan-het-testadvies-van-de-app-nog-veranderen.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/...ntent/23-hoe-kan-ik-de-app-binnen-mijn-organisatie-onder-de-aandacht-brengen.md b/...ntent/23-hoe-kan-ik-de-app-binnen-mijn-organisatie-onder-de-aandacht-brengen.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/24-kan-ik-de-app-pauzeren.md b/_includes/content/24-kan-ik-de-app-pauzeren.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/25-hulp-bij-installeren.md b/_includes/content/25-hulp-bij-installeren.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/26-coronamelder-in-makkelijke-taal.md b/_includes/content/26-coronamelder-in-makkelijke-taal.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/27-de-campagne-over-coronamelder.md b/_includes/content/27-de-campagne-over-coronamelder.md
@@ -0,0 +1,2 @@
+
+TBA
diff --git a/_includes/content/3-is-de-app-verplicht.md b/_includes/content/3-is-de-app-verplicht.md
@@ -1,2 +1,8 @@
-
 No, you are free to choose whether or not you want to use the app. This is your decision. Nobody can force you to use the app. That includes your employer, or staff in a café or restaurant, for example.
+
+## Does someone oblige you to download CoronaMelder? 
+Then you can report this to the CoronaMelder Abuse Line via telephone number: <a href="tel:+31881205100">088-1205 100</a> (local charges)
+
+**Opening hours**: <br />
+Monday to Friday<br />
+9:00 am - 5:00 pm
diff --git a/_includes/footer-js.html b/_includes/footer-js.html
@@ -1,5 +1,4 @@
 <script src="{{ site.baseurl }}/js/generic.js?v={{ timeslug }}"></script>
-<!-- <script src="{{ site.baseurl }}/js/story.js?v={{ timeslug }}"></script> -->
 <script src="{{ site.baseurl }}/js/vendors/details-element-polyfill.2.4.0.js" crossorigin="anonymous" async></script>
 <script src="{{ site.baseurl }}/js/language-picker.js?v={{ timeslug }}" async></script>
 

diff --git a/_includes/header-slim.html b/_includes/header-slim.html
@@ -23,6 +23,7 @@
         {{ site.data.translations.head-app-name[page.lang] }}
       </div>
     </div>
+    <img src="{{ site.baseurl }}/img/logo-badge.svg" class="header__logo-badge" alt="{{ site.data.translations.header__logo-badge[page.lang] }}" />
   </div>
 </header>
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -14,7 +14,8 @@
     <div class="logobar">
       <div class="logo">
         <a href="{{ langSlug }}">
-          <img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }}: {{ page.title }}">
+          <img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }} 
+          {% if page.title %}: {{ page.title }}{% endif %}">
         </a>
       </div>
       <a href="{{ langSlug }}/faq" class="header__layout__faq-link">
@@ -24,7 +25,7 @@
     </div>
     <div class="container">
       <div class="header__layout">
-        <img src="{{ site.baseurl }}/img/logo-app.svg" class="header__logo-badge" alt="" />
+        <img src="{{ site.baseurl }}/img/logo-app.svg" class="header__logo-badge" alt="{{ site.data.translations.header__logo-badge[page.lang] }}" />
         <div class="header__layout__middle">
           <h1 class="header__text">
             {{ site.data.translations.header-title[page.lang] }}

diff --git a/_layouts/faq-overview.html b/_layouts/faq-overview.html
@@ -27,75 +27,76 @@
       </p>
     {% endif %}
 
-    <div class="content-block" {% if page.contentLang == 'en' %}lang="en" dir="ltr"{% endif %}>
-
+    <div class="content-block">
       <h1 id="frequently-asked-questions">{{ site.data.translations.faq[page.lang] }}</h1>
 
       {% assign questions = site.questions | where:"lang", page.lang | sort: "index"  %}
 
-      <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-howtheapphelps[page.lang]|slugify }}">{{ site.data.translations.faq-category-howtheapphelps[page.lang] }}</h2>
+      <div {% if page.contentLang == 'en' %}lang="en" dir="ltr"{% endif %}>
+        <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-howtheapphelps[page.lang]|slugify }}">{{ site.data.translations.faq-category-howtheapphelps[page.lang] }}</h2>
 
-      <div class="faq-layout__contents __overview">
-          <ul class="faq-layout-contents__list">
-            {% for question in questions %}
-              {% if question.set == 1 %}
-                {% if question.featuredHome != true %}
-                  <li>
-                      <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
-                          {{ question.title }}
-                      </a>
-                  </li>
-                {% elsif question.featuredHome == true and question.showOnFAQoverview %}
-                  <li>
-                      <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
-                          {{ question.title }}
-                      </a>
-                  </li>
+        <div class="faq-layout__contents __overview">
+            <ul class="faq-layout-contents__list">
+              {% for question in questions %}
+                {% if question.set == 1 %}
+                  {% if question.featuredHome != true %}
+                    <li>
+                        <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
+                            {{ question.title }}
+                        </a>
+                    </li>
+                  {% elsif question.featuredHome == true and question.showOnFAQoverview %}
+                    <li>
+                        <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
+                            {{ question.title }}
+                        </a>
+                    </li>
+                  {% endif %}
                 {% endif %}
-              {% endif %}
-          {% endfor %}
-          </ul>
-      </div>
+            {% endfor %}
+            </ul>
+        </div>
 
 
-      <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-howtheappworks[page.lang]|slugify }}">{{ site.data.translations.faq-category-howtheappworks[page.lang] }}</h2>
+        <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-howtheappworks[page.lang]|slugify }}">{{ site.data.translations.faq-category-howtheappworks[page.lang] }}</h2>
 
-      <div class="faq-layout__contents __overview">
-          <ul class="faq-layout-contents__list">
-          {% for question in questions %}
-              {% if question.set == 2 %}
-                {% if question.featuredHome != true %}
-                  <li>
-                      <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
-                          {{ question.title }}
-                      </a>
-                  </li>
-                {% elsif question.featuredHome == true and question.showOnFAQoverview %}
-                  <li>
-                      <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
-                          {{ question.title }}
-                      </a>
-                  </li>
+        <div class="faq-layout__contents __overview">
+            <ul class="faq-layout-contents__list">
+            {% for question in questions %}
+                {% if question.set == 2 %}
+                  {% if question.featuredHome != true %}
+                    <li>
+                        <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
+                            {{ question.title }}
+                        </a>
+                    </li>
+                  {% elsif question.featuredHome == true and question.showOnFAQoverview %}
+                    <li>
+                        <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}">
+                            {{ question.title }}
+                        </a>
+                    </li>
+                  {% endif %}
                 {% endif %}
-              {% endif %}
-          {% endfor %}
-          </ul>
-      </div>
+            {% endfor %}
+            </ul>
+        </div>
 
-      <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-lessAskedQuestions[page.lang]|slugify }}">{{ site.data.translations.faq-category-lessAskedQuestions[page.lang] }}</h2>
+        <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-lessAskedQuestions[page.lang]|slugify }}">{{ site.data.translations.faq-category-lessAskedQuestions[page.lang] }}</h2>
 
-      <div class="faq-layout__contents __overview" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
-          <ul class="faq-layout-contents__list">
-            {% for question in questions %}
-            {% if question.set == 4 %}
-                  <li>
-                      <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
-                          {{ question.title }}
-                      </a>
-                  </li>
-                  {% endif %}
-          {% endfor %}
-          </ul>
+        <div class="faq-layout__contents __overview" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
+            <ul class="faq-layout-contents__list">
+              {% for question in questions %}
+              {% if question.set == 4 %}
+                    <li>
+                        <a class="faq-layout__item" href="{{ site.baseurl }}{{ question.url }}" {% if question.lang != 'ar' %}dir="ltr"{% endif %}>
+                            {{ question.title }}
+                        </a>
+                    </li>
+                    {% endif %}
+            {% endfor %}
+            </ul>
+        </div>
       </div>
     </div>
 
@@ -107,7 +108,6 @@ <h2 class="faq-layout__title" id="{{ site.data.translations.faq-category-lessAsk
       </p>
     {% endif %}
 
-
   </main>
   {% include footer.html %}
 </body>

diff --git a/_questions/ar/15-wat-zijn-de-resultaten-van-de-praktijktest.md b/_questions/ar/15-wat-zijn-de-resultaten-van-de-praktijktest.md
@@ -3,13 +3,13 @@ layout: content
 index: 1
 set: 4
 published: false
-title: What are the results of the regional trials?
+title: Wat zijn de resultaten van de praktijktest?
+summary: 
 lang: ar
 categories:
 - ar
 - faq
 showBreadCrumbs: true
 showContact: true
-contentlang: ar
 ---
 {% include content/15-wat-zijn-de-resultaten-van-de-praktijktest.md %}
diff --git a/...ions/ar/16-is-de-app-100procent-veilig.md → ...-betekent-het-als-ik-een-melding-krijg.md b/...ions/ar/16-is-de-app-100procent-veilig.md → ...-betekent-het-als-ik-een-melding-krijg.md
@@ -3,12 +3,12 @@ layout: content
 index: 2
 set: 4
 published: false
-title: Is the app 100% secure?
+title: Wat betekent het als ik een melding krijg? 
 lang: ar
 categories:
 - ar
 - faq
 showBreadCrumbs: true
 showContact: true
 ---
-{% include content/16-is-de-app-100procent-veilig.md %}
+{% include content/16-wat-betekent-het-als-ik-een-melding-krijg.md %}
diff --git a/...ar/17-is-de-app-100procent-betrouwbaar.md → ...s/ar/17-hoe-betrouwbaar-is-een-melding.md b/...ar/17-is-de-app-100procent-betrouwbaar.md → ...s/ar/17-hoe-betrouwbaar-is-een-melding.md
@@ -3,13 +3,12 @@ layout: content
 index: 3
 set: 4
 published: false
-title: Is the app 100% reliable?
+title: Hoe betrouwbaar is een melding?
 lang: ar
 categories:
 - ar
 - faq
 showBreadCrumbs: true
 showContact: true
-contentlang: ar
 ---
-{% include content/17-is-de-app-100procent-betrouwbaar.md %}
+{% include content/17-hoe-betrouwbaar-is-een-melding.md %}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		Before the national launch of CoronaMelder, 5 regions were already tested the app. These tests shows that the app works in the daily practice of the GGDs. They supported over 600 people, who turned out to be infected with the virus, to share this with other users of the app via CoronaMelder.
		TBA
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		No, the app cannot determine the exact distance, and it is not necessary. The app uses Bluetooth to determine that you are close to other users of the app. If you receive a notification, you were close to someone who turned out to be infected, for more than 15 minutes.
		TBA
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		Use of CoronaMelder is now regulated by law. It states that use of the app is voluntary.
		TBA
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
             {{ site.data.translations.head-app-name[page.lang] }}
           </div>
         </div>
+        <img src="{{ site.baseurl }}/img/logo-badge.svg" class="header__logo-badge" alt="{{ site.data.translations.header__logo-badge[page.lang] }}" />
       </div>
     </header>
@@ Expand Down @@