Skip to content
This repository was archived by the owner on May 10, 2023. It is now read-only.

Commit 3d4b4ea

Browse files
annekeanneke
authored
Merge pull request #418 from minvws/develop
5.0.8 version 2
2 parents 91b2af0 + 43632d6 commit 3d4b4ea

32 files changed

Lines changed: 178 additions & 59 deletions

‎README.development.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@ To test locally with htmlproofer (to test validity of html-code):
3232
bundle exec htmlproofer ./_site --checks-to-ignore=LinkCheck
3333
```
3434

35+
### App store buttons
36+
37+
On a mobile device the appropriate (store) buttons should be shown.
38+
39+
- iOS: Show App Store
40+
- Android: Show Google Play Store button
41+
- Android: Show Huawei AppGallery button (for example P40 Lite) [https://github.com/minvws/nl-covid19-notification-app-website/issues/403](See GitHub Issue #403)
42+
- Android: Show Google Play Store and Huawei AppGallery buttons
43+
44+
Huawei user agent string used to test (see HMSCore):
45+
- 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`
46+
- 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`
47+
3548
## Vendors
3649

3750
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.

‎_data/translations.yml‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,18 @@ header-googleplaystore:
128128
ro: Descărcați din Google play
129129
tr: Google Play'den indirin
130130

131+
header-huaweiappgallery:
132+
nl: Ontdek het op Huawei App Gallery
133+
en: Get it on Huawei App Gallery
134+
ar: قم بالتحميل من Huawei App Gallery
135+
bg: Изтегли в Huawei App Gallery
136+
de: Über Huawei App Gallery herunterladen
137+
es: Descargar de Huawei App Gallery
138+
fr: Téléchargez dans la Huawei App Gallery
139+
pl: Pobierz w Huawei App Gallery
140+
ro: Descărcați din Huawei App Gallery
141+
tr: Huawei App Gallery'den indirin
142+
131143
header-language-picker-label:
132144
nl: Taal
133145
en: Language
@@ -390,7 +402,7 @@ english:
390402
tr: (ingilizce)
391403

392404
info-lead:
393-
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.
405+
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.
394406
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.
395407
ar: لا يزال فيروس كورونا موجودًا حتى يومنا هذا. من المهم إذًا أن تبقى يقظًا الآن. لذلك أصبح CoronaMelder متاحًا في هولندا كلها.
396408
bg: Коронавирусът е все още тук. От особена важност сега е да запазиш бдителността си. Именно за тази цел приложението CoronaMelder вече е достъпно в цяла Нидерландия.
@@ -425,18 +437,10 @@ info-app-store-url:
425437
ro: https://apps.apple.com/gb/app/id1517652429
426438
tr: https://apps.apple.com/gb/app/id1517652429
427439

428-
info-google-play-url:
429-
nl: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
430-
en: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
431-
ar: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
432-
bg: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
433-
de: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
434-
fr: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
435-
es: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
436-
pl: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
437-
ro: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
438-
tr: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
440+
info-google-play-url: https://play.google.com/store/apps/details?id=nl.rijksoverheid.en
439441

442+
info-huawei-url: https://appgallery.huawei.com/#/app/C103008211
443+
440444
info-app-store-img:
441445
nl: app-store-badge-nl.svg
442446
en: app-store-badge-en.svg
@@ -459,8 +463,20 @@ info-google-play-img:
459463
es: google-play-badge-es.svg
460464
pl: google-play-badge-pl.svg
461465
ro: google-play-badge-ro.svg
462-
tr: google-play-badge-tr.svg
463-
466+
tr: google-play-badge-tr.svg
467+
468+
info-huawei-img:
469+
nl: huawei.svg
470+
en: huawei-en.svg
471+
ar: huawei-en.svg
472+
bg: huawei-en.svg
473+
de: huawei-en.svg
474+
fr: huawei-en.svg
475+
es: huawei-en.svg
476+
pl: huawei-en.svg
477+
ro: huawei-en.svg
478+
tr: huawei-en.svg
479+
464480
footer-samen-logo-url: https://www.rijksoverheid.nl/onderwerpen/coronavirus-covid-19/coronavirus-beeld-en-video/communicatiemiddelen-campagne
465481
footer-samen-logo:
466482
nl: Alleen samen krijgen we corona onder controle. Ga naar campagnewebsite

‎_data/videos.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
nl: |
1515
CoronaMelder - Zo beschermen we elkaar
1616
17-
Dit is'm: CoronaMelder.
17+
Dit is 'm: CoronaMelder.
1818
De officiële corona-app van Nederland.
1919
De app helpt om elkaar te beschermen tegen corona.
2020
Je kunt corona doorgeven aan een ander, ook al voordat je je ziek voelt.
@@ -44,7 +44,7 @@
4444
Alleen samen krijgen we corona onder controle.
4545
4646
Meer weten?
47-
Kijk op CoronaMelder.nl
47+
Kijk op CoronaMelder.nl of bel 0800-1280
4848
4949
2020-10-07-video-privacy:
5050
mp4-src:
@@ -81,7 +81,7 @@
8181
Alleen samen krijgen we corona onder controle
8282
8383
Meer weten?
84-
Kijk op coronamelder.nl
84+
Kijk op coronamelder.nl of bel 0800-1280
8585
en: |
8686
TBD
8787
2020-10-07-video-hoe-werkt-het:
@@ -131,7 +131,7 @@
131131
Alleen samen krijgen we corona onder controle.
132132
133133
Meer weten?
134-
Kijk op CoronaMelder.nl
134+
Kijk op CoronaMelder.nl of bel 0800-1280
135135
136136
20201008-video-how-the-app-works:
137137
mp4-src:

‎_includes/badges.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,17 @@ <h2> {{ site.data.translations.info-lead-title[page.lang] }}:</h2>
1414
</a>
1515
</li>
1616
<li class="app_badge_column__right">
17-
<a class="play-store" href="{{ site.data.translations.info-google-play-url[page.lang] }}">
18-
<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" />
17+
<a class="play-store" href="{{ site.data.translations.info-google-play-url }}">
18+
<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" />
1919
</a>
2020
</li>
21+
{% if include.huawei %}
22+
<li class="app_badge_column__right">
23+
<a class="huawei-store" href="{{ site.data.translations.info-huawei-url }}">
24+
<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" />
25+
</a>
26+
</li>
27+
{% endif %}
28+
2129
</ul>
2230
</div>

‎_includes/content/13-gebruik-app-uit-ander-land.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
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.
12

2-
TBA
3+
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.

‎_includes/header.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<div class="logobar">
1515
<div class="logo">
1616
<a href="{{ langSlug }}">
17-
<img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }}
18-
{% if page.title %}: {{ page.title }}{% endif %}">
17+
<img src="{{ site.baseurl }}/img/logo-RO.svg" alt="{{ site.data.translations.govlogo[page.lang] }}">
1918
</a>
2019
</div>
2120
<a href="{{ langSlug }}/faq" class="header__layout__faq-link">

‎_layouts/home.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030

3131
</div>
3232
{% include stories.html %}
33-
{% include badges.html class="layout-app-badges--center-wrap" %}
33+
{% include badges.html class="layout-app-badges--center-wrap" huawei="true" %}
3434
{% include information.html %}
3535
{% if page.lang == 'en' %}{% include video.html %}{% endif %}
3636
{% if page.lang == 'nl' %}{% include video.html %}{% endif %}
3737
{% include faq.html %}
38-
{% include badges.html class="layout-app-badges--center-wrap layout-app-badges--background" %}
38+
{% include badges.html class="layout-app-badges--center-wrap layout-app-badges--background" huawei="true" %}
3939
</main>
4040
{% include footer.html %}
4141
</body>

‎_questions/ar/13-gebruik-app-uit-ander-land.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
layout: content
33
index: 13
44
set: 2
5-
title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
5+
title: I already use a corona app from another European country. Can I use both apps at the same time?
66
lang: ar
77
contentLang: en
8-
published: false
98
categories:
109
- ar
1110
- faq

‎_questions/bg/13-gebruik-app-uit-ander-land.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
layout: content
33
index: 13
44
set: 2
5-
title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
5+
title: I already use a corona app from another European country. Can I use both apps at the same time?
66
lang: bg
77
contentLang: en
8-
published: false
98
categories:
109
- bg
1110
- faq

‎_questions/de/13-gebruik-app-uit-ander-land.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
layout: content
33
index: 13
44
set: 2
5-
title: Ik gebruik al de Duitse Corona Warn app. Kan ik beide apps tegelijkertijd gebruiken?
5+
title: I already use a corona app from another European country. Can I use both apps at the same time?
66
lang: de
77
contentLang: en
8-
published: false
98
categories:
109
- de
1110
- faq

0 commit comments

Comments
 (0)