Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
add verifier infobox
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Gstoehl committed Aug 16, 2023
1 parent 403a555 commit b382fec
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,16 @@ public Map<Language, InfoBox> getGenericInfoBox(boolean forAndroid) {
return result;
}

public Map<Language, InfoBox> getVerifierInfoBox(boolean forAndroid) {
Map<Language, InfoBox> 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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit b382fec

Please sign in to comment.