From 403a555607a744f550dd9ffd8ab292b23dce0d65 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 16 Aug 2023 11:49:14 +0000 Subject: [PATCH 1/5] Infobox --- .../src/main/resources/i18n/messages_de.properties | 8 ++++---- .../src/main/resources/i18n/messages_en.properties | 8 ++++---- .../src/main/resources/i18n/messages_fr.properties | 10 +++++----- .../src/main/resources/i18n/messages_it.properties | 8 ++++---- .../src/main/resources/i18n/messages_rm.properties | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties index b7ad6f1..635ad76 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties @@ -530,11 +530,11 @@ de: wallet_eol_banner_invalid_from_first_february_popup_bold_text: Dieses Covid-Zertifikat kann ab dem 31. Jan. 2022 nicht mehr verwendet werden, da die Gültigkeitsdauer dann bereits abgelaufen sein wird. wallet_eol_banner_invalid_from_first_february_popup_link_text: Mehr erfahren wallet_eol_banner_invalid_from_first_february_popup_link_url: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/warum-wird-die-gueltigkeitsdauer-der-zertifikate-fuer-eine-impfung-oder-eine - infobox_generic_title: Zertifikat sichern! - infobox_generic_text: Wenn Sie die App löschen, Ihr Smartphone wechseln oder verlieren, gehen auch Ihre Covid-Zertifikate verloren.\nBewahren Sie Ihre Zertifikate daher auch ausserhalb der App auf, indem Sie diese als PDF exportieren. + infobox_generic_title: Wichtige Info + infobox_generic_text: Ab dem 1.9.2023 wird diese App nicht mehr weiterentwickelt. Bereits vorhandene Zertifikate sind jedoch lokal in der App gespeichert. Sie können deshalb in eingeschränkter Form weiterhin angezeigt werden. Ein PDF-Export der bestehenden Zertifikate bis zum 31.8.2023 wird empfohlen. infobox_generic_button: Mehr erfahren - infobox_generic_url_android: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/ich-habe-das-covid-zertifikat-ausschliesslich-elektronisch-der-covid-certificate - infobox_generic_url_ios: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/ich-habe-das-covid-zertifikat-ausschliesslich-elektronisch-der-covid-certificate + infobox_generic_url_android: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/faq-category-node/7122/76904 + infobox_generic_url_ios: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/faq-category-node/7122/76904 wallet_scanner_how_it_works_accessibility_icon1: Erstens wallet_scanner_how_it_works_accessibility_icon2: Zweitens wallet_scanner_how_it_works_accessibility_icon3: Drittens diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties index 81386ff..688018a 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties @@ -530,11 +530,11 @@ en: wallet_eol_banner_invalid_from_first_february_popup_bold_text: This COVID certificate can no longer be used after 31 Jan 2022 as the period of validity will already have expired. wallet_eol_banner_invalid_from_first_february_popup_link_text: More information wallet_eol_banner_invalid_from_first_february_popup_link_url: https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/en/covid-certificate/why-period-validity-certificates-vaccination-or-recovery-being-shortened-365-270 - infobox_generic_title: Back up your certificate! - infobox_generic_text: If you uninstall the app or change or lose your smartphone, you will also lose your COVID certificates.\nThis means you should also keep a copy of your certificates outside the app by exporting them as PDFs. + infobox_generic_title: Important information + infobox_generic_text: As of 1 September 2023, this app will not be developed any further. However, existing certificates are stored locally in the app. These can still be displayed in a restricted format. We recommend exporting any existing certificates in PDF format by 31 August 2023. infobox_generic_button: Find out more - infobox_generic_url_android: https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/en/covid-certificate/i-only-have-my-covid-certificate-electronically-covid-certificate-app-how-can-i - infobox_generic_url_ios: https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/en/covid-certificate/i-only-have-my-covid-certificate-electronically-covid-certificate-app-how-can-i + infobox_generic_url_android: https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/en/faq-category-node/7122/76904 + infobox_generic_url_ios: https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/en/faq-category-node/7122/76904 wallet_scanner_how_it_works_accessibility_icon1: First wallet_scanner_how_it_works_accessibility_icon2: Second wallet_scanner_how_it_works_accessibility_icon3: Third diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties index 29f8b12..36b2237 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties @@ -530,11 +530,11 @@ fr: wallet_eol_banner_invalid_from_first_february_popup_bold_text: Ce certificat COVID ne peut plus être utilisé à partir du 31 janvier 2022. wallet_eol_banner_invalid_from_first_february_popup_link_text: En savoir plus wallet_eol_banner_invalid_from_first_february_popup_link_url: https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/fr/certificat-covid/pourquoi-la-duree-de-validite-des-certificats-de-vaccination-ou-de-guerison-t-elle - infobox_generic_title: Sauvegardez vos certificats! - infobox_generic_text: Si vous supprimez l’application, changez de smartphone ou le perdez, vos certificats COVID seront également perdus.\nConservez donc vos certificats en dehors de l’application en les exportant au format PDF. - infobox_generic_button: Plus d’informations - infobox_generic_url_android: https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/fr/certificat-covid/mon-certificat-covid-nest-disponible-quau-format-electronique-dans-lapplication - infobox_generic_url_ios: https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/fr/certificat-covid/mon-certificat-covid-nest-disponible-quau-format-electronique-dans-lapplication + infobox_generic_title: Information importante + infobox_generic_text: À partir du 1er, septembre 2023, cette application ne sera plus mise à jour. Les certificats que vous avez déjà enregistrés sont toutefois stockés localement. Vous pourrez donc continuer de les afficher sous une forme restreinte. Nous vous recommandons toutefois de les exporter au format PDF d’ici au 31 août 2023. + infobox_generic_button: En savoir plus + infobox_generic_url_android: https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/fr/faq-category-node/7122/76904 + infobox_generic_url_ios: https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/fr/faq-category-node/7122/76904 wallet_scanner_how_it_works_accessibility_icon1: Première wallet_scanner_how_it_works_accessibility_icon2: Deuxième wallet_scanner_how_it_works_accessibility_icon3: Deuxième diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties index 92720da..2309ad1 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties @@ -530,11 +530,11 @@ it: wallet_eol_banner_invalid_from_first_february_popup_bold_text: La scadenza della durata di validità di questo certificato COVID è il 31 gennaio 2022. Pertanto il certificato non è più utilizzabile dopo quella data. wallet_eol_banner_invalid_from_first_february_popup_link_text: Per saperne di più wallet_eol_banner_invalid_from_first_february_popup_link_url: https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/it/certificato-covid/perche-la-durata-di-validita-dei-certificati-di-vaccinazione-o-di-guarigione-e - infobox_generic_title: Mettete al sicuro il vostro certificato! - infobox_generic_text: Se cancellate l’app, cambiate o smarrite il vostro smartphone, anche i vostri certificati COVID andranno persi. \nConservate quindi i vostri certificati anche al di fuori dell’app esportandoli in formato PDF. + infobox_generic_title: Informazione importante + infobox_generic_text: Dal 1.9.2023 quest’app non verrà più aggiornata. I certificati rimarranno tuttavia salvati localmente nell’app, così da poter essere visualizzati in forma limitata. Si raccomanda di esportarli in formato PDF entro il 31.8.2023. infobox_generic_button: Per maggiori informazioni - infobox_generic_url_android: https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/it/certificato-covid/ho-il-certificato-covid-esclusivamente-formato-elettronico-nellapp-covid - infobox_generic_url_ios: https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/it/certificato-covid/ho-il-certificato-covid-esclusivamente-formato-elettronico-nellapp-covid + infobox_generic_url_android: https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/it/faq-category-node/7122/76904 + infobox_generic_url_ios: https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/it/faq-category-node/7122/76904 wallet_scanner_how_it_works_accessibility_icon1: Primo wallet_scanner_how_it_works_accessibility_icon2: Secondo wallet_scanner_how_it_works_accessibility_icon3: Terzo diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties index ea07eb3..585cd8e 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties @@ -530,11 +530,11 @@ rm: wallet_eol_banner_invalid_from_first_february_popup_bold_text: Quest certificat COVID na po betg pli vegnir duvrà a partir dals 31-01-2022, perquai che la durada da valaivladad è lura gia scadida. wallet_eol_banner_invalid_from_first_february_popup_link_text: Dapli infurmaziuns wallet_eol_banner_invalid_from_first_february_popup_link_url: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/warum-wird-die-gueltigkeitsdauer-der-zertifikate-fuer-eine-impfung-oder-eine - infobox_generic_title: Tegnair en salv il certificat! - infobox_generic_text: Sche Vus stizzais l'app, midais u perdais Voss smartphone, van er a perder Voss certificats COVID. \nTegnai perquai en salv Voss certificats er ordaifer l'app cun exportar quels sco PDF. + infobox_generic_title: Infurmaziuns impurtantas + infobox_generic_text: A partir dal 01-09-2023 na vegn questa app betg pli sviluppada vinavant. Certificats gia avant maun èn dentant memorisads localmain en l'app. Els pon perquai vegnir mussads vinavant en furma restrenschida. In export dals certificats existents sco PDF vegn recumandà fin ils 31-08-2023. infobox_generic_button: Dapli infurmaziuns - infobox_generic_url_android: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/ich-habe-das-covid-zertifikat-ausschliesslich-elektronisch-der-covid-certificate - infobox_generic_url_ios: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/covid-zertifikat/ich-habe-das-covid-zertifikat-ausschliesslich-elektronisch-der-covid-certificate + infobox_generic_url_android: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/faq-category-node/7122/76904 + infobox_generic_url_ios: https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/haeufig-gestellte-fragen.html?faq-url=/covid/de/faq-category-node/7122/76904 wallet_scanner_how_it_works_accessibility_icon1: Emprim wallet_scanner_how_it_works_accessibility_icon2: Segund wallet_scanner_how_it_works_accessibility_icon3: Terz From b382fecabf64959f6212c364f2cc89c590a09399 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 16 Aug 2023 15:00:22 +0000 Subject: [PATCH 2/5] add verifier infobox --- .../backend/config/shared/helper/InfoBoxHelper.java | 12 ++++++++++++ .../src/main/resources/i18n/messages_de.properties | 2 ++ .../src/main/resources/i18n/messages_en.properties | 2 ++ .../src/main/resources/i18n/messages_fr.properties | 2 ++ .../src/main/resources/i18n/messages_it.properties | 2 ++ .../src/main/resources/i18n/messages_rm.properties | 2 ++ .../ws/controller/VerifierConfigController.java | 3 +++ 7 files changed, 25 insertions(+) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/java/ch/admin/bag/covidcertificate/backend/config/shared/helper/InfoBoxHelper.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/java/ch/admin/bag/covidcertificate/backend/config/shared/helper/InfoBoxHelper.java index 2b4e462..611c011 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/java/ch/admin/bag/covidcertificate/backend/config/shared/helper/InfoBoxHelper.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/java/ch/admin/bag/covidcertificate/backend/config/shared/helper/InfoBoxHelper.java @@ -53,4 +53,16 @@ public Map getGenericInfoBox(boolean forAndroid) { return result; } + public Map getVerifierInfoBox(boolean forAndroid) { + Map result = new EnumMap<>(Language.class); + for (Language language : Language.values()) { + Locale l = language.toLocale(); + InfoBox infoBox = new InfoBox(); + infoBox.setTitle(msg.getMessage("infobox_verifier_title", l)); + infoBox.setMsg(msg.getMessage("infobox_verifier_text", l)); + infoBox.setIsDismissible(true); + result.put(language, infoBox); + } + return result; + } } diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties index 635ad76..cd6ece8 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties @@ -648,3 +648,5 @@ de: wallet_faq_questions_question_2_2: Ich verreise ins Ausland und brauche für die Einreise ein Covid-Zertifikat. Was muss ich beachten? wallet_faq_questions_answer_2_2: Im Ausland gelten jeweils die Gültigkeitsregeln des entsprechenden Landes, sowohl für die Einreise wie auch innerhalb des Ziellandes. Für die Verwendung des Zertifikats innerhalb des Ziellandes können andere Regeln als bei der Einreise gelten. Diese Regeln können kurzfristig ändern. Informieren Sie sich daher kurz vor Ihrer Abreise auf der Webseite der Behörden Ihres Transit- oder Ziellandes, ob dort noch Regeln im Zusammenhang mit Covid-19 gelten und wenn ja, welche. wallet_error_not_fully_protected_national_rules: Unvollständige Impfserie gemäss internationalen Standards. + infobox_verifier_title: Wichtige Info + infobox_verifier_text: Nach dem 1.9.2023 wird diese App nicht mehr in Betrieb sein. Ab dann können keine Zertifikate mehr geprüft werden. Sie können die App löschen. diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties index 688018a..9a2fc1a 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_en.properties @@ -648,3 +648,5 @@ en: wallet_faq_questions_question_2_2: I am travelling abroad and need a COVID certificate to enter the country. What must I bear in mind? wallet_faq_questions_answer_2_2: When abroad, it is the validity rules of the country in question that apply, both for entering the country and within the country itself. The rules applicable to the use of the certificate within the destination country may differ from those that apply upon entry. These rules can change at short notice. Shortly before departing you should therefore check the authorities’ website for your transit or destination country to see whether rules relating to COVID-19 are still in force and, if so, which ones. wallet_error_not_fully_protected_national_rules: Vaccination series incomplete by international standards. + infobox_verifier_title: Important information + infobox_verifier_text: This app is being discontinued as of 1 September 2023. As of this date, certificates can no longer be checked. The app can be deleted. diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties index 36b2237..aecf7a8 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_fr.properties @@ -648,3 +648,5 @@ fr: wallet_faq_questions_question_2_2: Je pars à l’étranger et j’ai besoin d’un certificat COVID pour entrer dans le pays de destination. À quoi dois-je faire attention ? wallet_faq_questions_answer_2_2: À l’étranger, les règles de validité du pays concerné s’appliquent, aussi bien à l’entrée qu’à l’intérieur du territoire. L’utilisation du certificat à l’intérieur du pays de destination peut être soumise à d’autres règles que celles fixées pour l’entrée. Ces règles peuvent changer à très court terme. Vérifiez donc peu avant votre départ sur le site Internet des autorités de votre pays de transit ou de destination si des règles en rapport avec le COVID-19 sont toujours appliquées, et si oui, lesquelles. wallet_error_not_fully_protected_national_rules: Schéma vaccinal incomplet selon les normes internationales. + infobox_verifier_title: Information importante + infobox_verifier_text: Passé le 1er septembre 2023, cette application ne sera plus en service. Il ne sera dès lors plus possible de vérifier les certificats. Vous pouvez supprimer l’application. diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties index 2309ad1..e42daef 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_it.properties @@ -648,3 +648,5 @@ it: wallet_faq_questions_question_2_2: Devo recarmi all’estero e ho bisogno di un certificato COVID. Cosa devo fare? wallet_faq_questions_answer_2_2: All’estero si applicano le regole di validità del rispettivo Paese, sia per l’entrata sia all’interno del Paese stesso. Per l’impiego del certificato all’interno del Paese di destinazione possono applicarsi altre regole rispetto a quelle vigenti per l’entrata. Queste regole possono cambiare in tempi brevi. Pertanto, prima di partire, si informi consultando il sito web delle autorità del Paese di transito o di destinazione se nel Paese vigono ancora regole relative alla COVID-19 e, in caso affermativo, quali sono. wallet_error_not_fully_protected_national_rules: Serie di vaccinazioni incompleta secondo gli standard internazionali. + infobox_verifier_title: Informazione importante + infobox_verifier_text: Dal 1.9.2023 quest’app non sarà più in funzione e i certificati non potranno più essere verificati. L’app può essere eliminata. diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties index 585cd8e..980dada 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_rm.properties @@ -648,3 +648,5 @@ rm: wallet_faq_questions_question_2_2: Jau fatsch in viadi a l'exteriur e dovrel in certificat COVID per entrar en il pajais. Tge stoss jau resguardar? wallet_faq_questions_answer_2_2: A l'exteriur valan mintgamai las reglas da valaivladad dal pajais respectiv, e quai tant per entrar en il pajais sco er per activitads entaifer il pajais da destinaziun. Per l'utilisaziun dal certificat entaifer il pajais da destinaziun pon valair autras reglas che per l'entrada en il pajais. Questas reglas pon midar a curta vista. As infurmai perquai curt avant Vossa partenza sur la pagina d'internet da las autoritads da Voss pajais da transit u da destinaziun, sch'i valan là anc reglas en connex cun COVID-19, e sche gea, tgeninas. wallet_error_not_fully_protected_national_rules: Seria da vaccinaziun incumpletta tenor ils standards internaziunals. + infobox_verifier_title: Infurmaziuns impurtantas + infobox_verifier_text: Suenter il 01-09-2023 n'è questa app betg pli en funcziun. A partir da quel mument na pon nagins certificats pli vegnir controllads. Vus pudais stizzar l'app. diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java index 0656864..9dafee1 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java @@ -14,6 +14,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.model.Faq; import ch.admin.bag.covidcertificate.backend.config.shared.model.VerifierConfigResponse; import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages; @@ -45,6 +46,7 @@ public class VerifierConfigController { private final CovidCertNewsHelper covidCertNewsHelper; private final boolean timeshiftDetectionEnabled; private final int checkModeReselectAfterHours; + private final InfoBoxHelper infoBoxHelper; public VerifierConfigController( Messages messages, @@ -94,6 +96,7 @@ public VerifierConfigController( configResponse.setCovidCertificateNewsText(covidCertNewsHelper.getNewsText()); configResponse.setInfoCovidCertificateNews(covidCertNewsHelper.getNews()); Version clientAppVersion = new Version(appversion); + configResponse.setInfoBox(infoBoxHelper.getVerifierInfoBox(clientAppVersion.isAndroid())); if (clientAppVersion.isSmallerVersionThan(FORCE_UPDATE_BELOW_1_2_0)) { configResponse.setForceUpdate(true); } From b8184f709715fb187bce120e1cdf0b6eacd466de Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 16 Aug 2023 15:30:20 +0000 Subject: [PATCH 3/5] fix verifier-ws --- .../config/verifier/ws/config/VerifierWsBaseConfig.java | 6 ++++-- .../verifier/ws/controller/VerifierConfigController.java | 4 +++- .../backend/config/verifier/ws/BaseControllerTest.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java index ed6e292..25b2ad5 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java @@ -13,6 +13,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages; import ch.admin.bag.covidcertificate.backend.config.verifier.ws.controller.VerifierConfigController; import org.springframework.beans.factory.annotation.Value; @@ -31,8 +32,9 @@ public VerifierConfigController verifierConfigController( @Value("${ws.verifier.timeshiftDetection.enabled:false}") boolean timeShiftDetectionEnabled, @Value("${ws.verifier.checkModeReselectionAfterHours:48}") - int checkModeReselectionAfterHours) { + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { return new VerifierConfigController( - messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours); + messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } } diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java index 9dafee1..27867d0 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java @@ -54,13 +54,15 @@ public VerifierConfigController( FaqHelper faqHelper, CovidCertNewsHelper covidCertNewsHelper, boolean timeshiftDetectionEnabled, - int checkModeReselectAfterHours) { + int checkModeReselectAfterHours, + InfoBoxHelper infoBoxHelper) { this.messages = messages; this.checkModeInfoHelper = checkModeInfoHelper; this.faqHelper = faqHelper; this.covidCertNewsHelper = covidCertNewsHelper; this.timeshiftDetectionEnabled = timeshiftDetectionEnabled; this.checkModeReselectAfterHours = checkModeReselectAfterHours; + this.infoBoxHelper = infoBoxHelper; } @Documentation( diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java index 9fc6d65..d06f1d2 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java @@ -153,7 +153,7 @@ public void testForUpdateNote() throws Exception { .getResponse(); ConfigResponse resp = testHelper.toConfigResponse(result, acceptMediaType, TestHelper.PATH_TO_CA_PEM); - ConfigAsserter.assertNoUpdate(resp); + ConfigAsserter.assertInfoBox(resp); } @Test From add101134a8e4ecec1126885b456f4d7322c1905 Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 16 Aug 2023 17:45:24 +0200 Subject: [PATCH 4/5] fix mock configs --- .../verifier/ws/config/mock/MockFaqLinkConfig.java | 11 +++++++---- .../ws/config/mock/MockForceUpdateConfig.java | 11 +++++++---- .../verifier/ws/config/mock/MockInfoBoxConfig.java | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockFaqLinkConfig.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockFaqLinkConfig.java index 886432f..9f567c0 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockFaqLinkConfig.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockFaqLinkConfig.java @@ -3,6 +3,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.model.Faq; import ch.admin.bag.covidcertificate.backend.config.shared.model.FaqEntry; import ch.admin.bag.covidcertificate.backend.config.shared.model.Language; @@ -31,9 +32,10 @@ public VerifierConfigController verifierConfigController( @Value("${ws.verifier.timeshiftDetection.enabled:false}") boolean timeshiftDetectionEnabled, @Value("${ws.verifier.checkModeReselectionAfterHours:48}") - int checkModeReselectionAfterHours) { + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { return new MockConfigController( - messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours); + messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } public class MockConfigController extends VerifierConfigController { @@ -44,8 +46,9 @@ public MockConfigController( FaqHelper faqHelper, CovidCertNewsHelper covidCertNewsHelper, boolean timeShiftDetectionEnabled, - int checkModeReselectionAfterHours) { - super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours); + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { + super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } @Override diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockForceUpdateConfig.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockForceUpdateConfig.java index 866e04a..f0ca7c1 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockForceUpdateConfig.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockForceUpdateConfig.java @@ -3,6 +3,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.model.VerifierConfigResponse; import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages; import ch.admin.bag.covidcertificate.backend.config.shared.semver.Version; @@ -34,9 +35,10 @@ public VerifierConfigController verifierConfigController( @Value("${ws.verifier.timeshiftDetection.enabled:false}") boolean timeshiftDetectionEnabled, @Value("${ws.verifier.checkModeReselectionAfterHours:48}") - int checkModeReselectionAfterHours) { + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { return new MockConfigController( - messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours); + messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } public class MockConfigController extends VerifierConfigController { @@ -47,8 +49,9 @@ public MockConfigController( FaqHelper faqHelper, CovidCertNewsHelper covidCertNewsHelper, boolean timeShiftDetectionEnabled, - int checkModeReselectionAfterHours) { - super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours); + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { + super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } @Override diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockInfoBoxConfig.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockInfoBoxConfig.java index c95a298..75ea37c 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockInfoBoxConfig.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/mock/MockInfoBoxConfig.java @@ -3,6 +3,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.MockHelper; import ch.admin.bag.covidcertificate.backend.config.shared.model.VerifierConfigResponse; import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages; @@ -28,9 +29,10 @@ public VerifierConfigController verifierConfigController( @Value("${ws.verifier.timeshiftDetection.enabled:false}") boolean timeshiftDetectionEnabled, @Value("${ws.verifier.checkModeReselectionAfterHours:48}") - int checkModeReselectionAfterHours) { + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { return new MockConfigController( - messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled , checkModeReselectionAfterHours); + messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled , checkModeReselectionAfterHours, infoBoxHelper); } public class MockConfigController extends VerifierConfigController { @@ -41,8 +43,9 @@ public MockConfigController( FaqHelper faqHelper, CovidCertNewsHelper covidCertNewsHelper, boolean timeshiftDetectionEnabled, - int checkModeReselectionAfterHours) { - super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours); + int checkModeReselectionAfterHours, + InfoBoxHelper infoboxHelper) { + super(messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeshiftDetectionEnabled, checkModeReselectionAfterHours, infoboxHelper); } @Override From 24be2de5a5fc5649b51b9b20ff9397dfeb1a11b1 Mon Sep 17 00:00:00 2001 From: Fabian Aggeler Date: Thu, 17 Aug 2023 13:04:19 +0200 Subject: [PATCH 5/5] Updated translations --- .../src/main/resources/i18n/messages_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties index cd6ece8..393e59e 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-shared/src/main/resources/i18n/messages_de.properties @@ -649,4 +649,4 @@ de: wallet_faq_questions_answer_2_2: Im Ausland gelten jeweils die Gültigkeitsregeln des entsprechenden Landes, sowohl für die Einreise wie auch innerhalb des Ziellandes. Für die Verwendung des Zertifikats innerhalb des Ziellandes können andere Regeln als bei der Einreise gelten. Diese Regeln können kurzfristig ändern. Informieren Sie sich daher kurz vor Ihrer Abreise auf der Webseite der Behörden Ihres Transit- oder Ziellandes, ob dort noch Regeln im Zusammenhang mit Covid-19 gelten und wenn ja, welche. wallet_error_not_fully_protected_national_rules: Unvollständige Impfserie gemäss internationalen Standards. infobox_verifier_title: Wichtige Info - infobox_verifier_text: Nach dem 1.9.2023 wird diese App nicht mehr in Betrieb sein. Ab dann können keine Zertifikate mehr geprüft werden. Sie können die App löschen. + infobox_verifier_text: Ab dem 1.9.2023 wird diese App nicht mehr in Betrieb sein. Ab dann können keine Zertifikate mehr geprüft werden. Sie können die App löschen.