Merge pull request #418 from minvws/develop

5.0.8 version 2
minvws · Oct 21, 2020 · 3d4b4ea · 3d4b4ea
2 parents 91b2af0 + 43632d6
commit 3d4b4ea
Show file tree

Hide file tree

Showing 32 changed files with 178 additions and 59 deletions.
diff --git a/README.development.md b/README.development.md
@@ -32,6 +32,19 @@ To test locally with htmlproofer (to test validity of html-code):
 bundle exec htmlproofer ./_site --checks-to-ignore=LinkCheck
 ```
 
+### App store buttons
+
+On a mobile device the appropriate (store) buttons should be shown.
+
+- iOS: Show App Store
+- Android: Show Google Play Store button
+- Android: Show Huawei AppGallery button (for example P40 Lite) [https://github.com/minvws/nl-covid19-notification-app-website/issues/403](See GitHub Issue #403)
+- Android: Show Google Play Store and Huawei AppGallery buttons
+
+Huawei user agent string used to test (see HMSCore): 
+- Android: AppGallery: `Mozilla/5.0 (Linux; Android 10; JNY-LX1; HMSCore 5.0.3.304) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 HuaweiBrowser/11.0.2.303 Mobile Safari/537.36`
+- Android: AppGallery and Google Store: `Mozilla/5.0 (Linux; Android 10; VOG-L29; HMSCore 5.0.1.313; GMSCore 20.30.19) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 HuaweiBrowser/10.1.4.303 Mobile Safari/537.36`
+
 ## Vendors
 
 Note: rather than rely on a third party CDN or dependencies that are not part of this repository we choose to include all assets and dependencies. Please go to [the vendor licenses directory](./vendor-licenses) for the vendor licenses.
diff --git a/_data/translations.yml b/_data/translations.yml
@@ -128,6 +128,18 @@ header-googleplaystore:
   ro: Descărcați din Google play
   tr: Google Play'den indirin  
 
+header-huaweiappgallery: 
+  nl: Ontdek het op Huawei App Gallery
+  en: Get it on Huawei App Gallery
+  ar: قم بالتحميل من  Huawei App Gallery
+  bg: Изтегли в Huawei App Gallery
+  de: Über Huawei App Gallery herunterladen
+  es: Descargar de Huawei App Gallery
+  fr: Téléchargez dans la Huawei App Gallery
+  pl: Pobierz w Huawei App Gallery
+  ro: Descărcați din Huawei App Gallery
+  tr: Huawei App Gallery'den indirin  
+
 header-language-picker-label:
   nl: Taal
   en: Language
@@ -390,7 +402,7 @@ 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. Op 19 oktober hadden <strong>3.348.754</strong> mensen de app gedownload.
+  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 20 oktober hadden <strong>3.391.360</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 متاحًا في هولندا كلها.
   bg: Коронавирусът е все още тук. От особена важност сега е да запазиш бдителността си. Именно за тази цел приложението CoronaMelder вече е достъпно в цяла Нидерландия.
@@ -425,18 +437,10 @@ info-app-store-url:
   ro: https://apps.apple.com/gb/app/id1517652429
   tr:  https://apps.apple.com/gb/app/id1517652429
 
-info-google-play-url:
-  nl: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  en: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  ar: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  bg: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en 
-  de: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en 
-  fr: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en 
-  es: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  pl: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  ro: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
-  tr:  https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
+info-google-play-url: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
 
+info-huawei-url: https://appgallery.huawei.com/#/app/C103008211
+
 info-app-store-img:
   nl: app-store-badge-nl.svg
   en: app-store-badge-en.svg
@@ -459,8 +463,20 @@ info-google-play-img:
   es: google-play-badge-es.svg
   pl: google-play-badge-pl.svg
   ro: google-play-badge-ro.svg
-  tr:  google-play-badge-tr.svg
-
+  tr: google-play-badge-tr.svg
+
+info-huawei-img: 
+  nl: huawei.svg
+  en: huawei-en.svg
+  ar: huawei-en.svg
+  bg: huawei-en.svg 
+  de: huawei-en.svg 
+  fr: huawei-en.svg
+  es: huawei-en.svg
+  pl: huawei-en.svg
+  ro: huawei-en.svg
+  tr: huawei-en.svg
+
 footer-samen-logo-url: https://www.rijksoverheid.nl/onderwerpen/coronavirus-covid-19/coronavirus-beeld-en-video/communicatiemiddelen-campagne
 footer-samen-logo:
   nl: Alleen samen krijgen we corona onder controle. Ga naar campagnewebsite

diff --git a/_data/videos.yml b/_data/videos.yml
@@ -14,7 +14,7 @@
     nl: |
       CoronaMelder - Zo beschermen we elkaar
 
-      Dit is'm: CoronaMelder.
+      Dit is 'm: CoronaMelder.
       De officiële corona-app van Nederland.
       De app helpt om elkaar te beschermen tegen corona.
       Je kunt corona doorgeven aan een ander, ook al voordat je je ziek voelt.
@@ -44,7 +44,7 @@
       Alleen samen krijgen we corona onder controle.
 
       Meer weten?
-      Kijk op CoronaMelder.nl
+      Kijk op CoronaMelder.nl of bel 0800-1280
 
 2020-10-07-video-privacy:
   mp4-src:
@@ -81,7 +81,7 @@
       Alleen samen krijgen we corona onder controle
 
       Meer weten?
-      Kijk op coronamelder.nl
+      Kijk op coronamelder.nl of bel 0800-1280
     en: |
       TBD
 2020-10-07-video-hoe-werkt-het:
@@ -131,7 +131,7 @@
       Alleen samen krijgen we corona onder controle.
 
       Meer weten? 
-      Kijk op CoronaMelder.nl
+      Kijk op CoronaMelder.nl of bel 0800-1280
 
 20201008-video-how-the-app-works:
   mp4-src:

diff --git a/_includes/badges.html b/_includes/badges.html
@@ -14,9 +14,17 @@ <h2> {{ site.data.translations.info-lead-title[page.lang] }}:</h2>
       </a>
     </li>
     <li class="app_badge_column__right">
-      <a class="play-store" href="{{ site.data.translations.info-google-play-url[page.lang] }}">
-        <img src="{{ site.baseurl }}/img/{{site.data.translations.info-google-play-img[page.lang]}}" alt="{{ site.data.translations.header-googleplaystore[page.lang] }}" height="65" width="216" />
+      <a class="play-store" href="{{ site.data.translations.info-google-play-url }}">
+        <img src="{{ site.baseurl }}/img/{{site.data.translations.info-google-play-img[page.lang] }}" alt="{{ site.data.translations.header-googleplaystore[page.lang] }}" height="65" width="216" />
       </a>
     </li>
+    {% if include.huawei %}
+    <li class="app_badge_column__right">
+      <a class="huawei-store" href="{{ site.data.translations.info-huawei-url }}">
+        <img src="{{ site.baseurl }}/img/{{site.data.translations.info-huawei-img[page.lang]  }}" alt="{{ site.data.translations.header-huaweiappgallery[page.lang] }}" height="65" width="216" />
+      </a>
+    </li>
+    {% endif %}
+
   </ul>
 </div>
diff --git a/_includes/content/13-gebruik-app-uit-ander-land.md b/_includes/content/13-gebruik-app-uit-ander-land.md
@@ -1,2 +1,3 @@
+No, that is not yet possible. We work with the other countries on interaction between the apps. We will soon be testing this interaction. After that, everyone can keep on using an app from their own country. You will then receive a warning in the Dutch CoronaMelder if, for example, you have been close to a German who has tested positive in Germany for a longer period of time.
 
-TBA
+Until then, switching between the apps is the best choice. The worry of forgetting to change back has been partly resolved. If the Dutch CoronaMelder is not active for a day or more, you will receive a notification that the app is not active.
diff --git a/_includes/header.html b/_includes/header.html
@@ -14,8 +14,7 @@
     <div class="logobar">
       <div class="logo">
         <a href="{{ langSlug }}">
-          <img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }} 
-          {% if page.title %}: {{ page.title }}{% endif %}">
+          <img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }}">
         </a>
       </div>
       <a href="{{ langSlug }}/faq" class="header__layout__faq-link">

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -30,12 +30,12 @@
 
     </div>
     {% include stories.html %}
-    {% include badges.html class="layout-app-badges--center-wrap" %}
+    {% include badges.html class="layout-app-badges--center-wrap" huawei="true" %}
     {% include information.html %}
     {% if page.lang == 'en' %}{% include video.html %}{% endif %}
     {% if page.lang == 'nl' %}{% include video.html %}{% endif %}
     {% include faq.html %}
-    {% include badges.html class="layout-app-badges--center-wrap layout-app-badges--background" %}
+    {% include badges.html class="layout-app-badges--center-wrap layout-app-badges--background" huawei="true" %}
   </main>
   {% include footer.html %}
 </body>

diff --git a/_questions/ar/13-gebruik-app-uit-ander-land.md b/_questions/ar/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: ar
 contentLang: en
-published: false
 categories:
 - ar
 - faq

diff --git a/_questions/bg/13-gebruik-app-uit-ander-land.md b/_questions/bg/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: bg
 contentLang: en
-published: false
 categories:
 - bg
 - faq

diff --git a/_questions/de/13-gebruik-app-uit-ander-land.md b/_questions/de/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: de
 contentLang: en
-published: false
 categories:
 - de
 - faq

diff --git a/_questions/en/13-gebruik-app-uit-ander-land.md b/_questions/en/13-gebruik-app-uit-ander-land.md
@@ -2,9 +2,8 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: en
-published: false
 categories:
 - en
 - faq

diff --git a/_questions/es/13-gebruik-app-uit-ander-land.md b/_questions/es/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: es
 contentLang: en
-published: false
 categories:
 - es
 - faq

diff --git a/_questions/fr/13-gebruik-app-uit-ander-land.md b/_questions/fr/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: fr
 contentLang: en
-published: false
 categories:
 - fr
 - faq

diff --git a/_questions/pl/13-gebruik-app-uit-ander-land.md b/_questions/pl/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: pl
 contentLang: en
-published: false
 categories:
 - pl
 - faq

diff --git a/_questions/ro/13-gebruik-app-uit-ander-land.md b/_questions/ro/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: ro
 contentLang: en
-published: false
 categories:
 - ro
 - faq

diff --git a/_questions/tr/13-gebruik-app-uit-ander-land.md b/_questions/tr/13-gebruik-app-uit-ander-land.md
@@ -2,10 +2,9 @@
 layout: content
 index: 13
 set: 2
-title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
+title: I already use a corona app from another European country. Can I use both apps at the same time?
 lang: tr
 contentLang: en
-published: false
 categories:
 - tr
 - faq

diff --git a/ar/toegankelijkheidsverklaring.md b/ar/toegankelijkheidsverklaring.md
@@ -9,7 +9,7 @@ contentLang: en
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>
 

diff --git a/bg/toegankelijkheidsverklaring.md b/bg/toegankelijkheidsverklaring.md
@@ -9,7 +9,7 @@ contentLang: en
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>
 

diff --git a/css/_faq.scss b/css/_faq.scss
@@ -101,8 +101,13 @@
     width: 100%;
 
     &:hover {
-        background-color: rgba(0, 39, 131, 0.07) /* RO donker link2 */;
+        background-color: $color-RO_darkblue; /* RO donker link2 */;
         transition: var(--transition-in);
+        color: white;
+
+        &:after {
+            background: url(../img/chevron-right-white.svg) center center no-repeat;
+        }
     }
 
     &:focus {
@@ -146,5 +151,9 @@
         font-size: 16px;
         color: #333333;
         text-decoration: none;
+
+        &:hover {
+            color: white;
+        }
     }
 }
diff --git a/css/components/app-badges.scss b/css/components/app-badges.scss
@@ -52,7 +52,17 @@
 
 .iOS {
   .play-store { display: none; }
+  .huawei-store { display: none; }
 }
 .android {
   .app-store { display: none; }
+  .play-store { display: none; }
+  .huawei-store { display: none; }
+
+  &.google-play-store {
+    .play-store { display: block; }
+  }
+  &.huawei-app-gallery {
+    .huawei-store { display: block; }
+  }
 }
diff --git a/de/toegankelijkheidsverklaring.md b/de/toegankelijkheidsverklaring.md
@@ -9,7 +9,7 @@ contentLang: en
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>
 

diff --git a/en/toegankelijkheidsverklaring.md b/en/toegankelijkheidsverklaring.md
@@ -8,7 +8,7 @@ title: Accessibility
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>
 

diff --git a/es/toegankelijkheidsverklaring.md b/es/toegankelijkheidsverklaring.md
@@ -9,7 +9,7 @@ contentLang: en
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>
 

diff --git a/fr/toegankelijkheidsverklaring.md b/fr/toegankelijkheidsverklaring.md
@@ -9,7 +9,7 @@ contentLang: en
 Accessibility Statement, dated 9 October 2020
 
 <p class="md-block-lead md-text-color-RO-donkerblauw" markdown="1">
-  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please et us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] }}">[email protected]</a>. <br />
+  The Ministry of Health, Welfare and Sport wants everybody to be able to use this website, which is being updated all the time. However, if you encounter a page which you find inaccessible we ask you to please let us know by emailing  <a href="mailto:[email protected]?subject={{ site.data.translations.accessibility-in-app-email-subject[page.lang] | url_encode | replace: "+", "%20" }}">[email protected]</a>. <br />
   This accessibility statement will shortly be brought up to date.
 </p>