diff --git a/.github/workflows/prod_build.yml b/.github/workflows/prod_build.yml index ac644ae..8c6fc98 100644 --- a/.github/workflows/prod_build.yml +++ b/.github/workflows/prod_build.yml @@ -35,7 +35,7 @@ jobs: - name: Build run: | - npm install -g postcss-cli autoprefixer + npm install -g postcss-cli autoprefixer postcss mv qrgenerator.min.dev.js assets/js/dist/qrgenerator.min.js hugo -b https://qr-d.swisscovid.ch -d build_dev --cleanDestinationDir --minify mv qrgenerator.min.abn.js assets/js/dist/qrgenerator.min.js @@ -63,4 +63,4 @@ jobs: files: | prod.zip dev.zip - abnahme.zip \ No newline at end of file + abnahme.zip diff --git a/assets/scss/partials/landingpage.scss b/assets/scss/partials/landingpage.scss index da8c025..040c798 100644 --- a/assets/scss/partials/landingpage.scss +++ b/assets/scss/partials/landingpage.scss @@ -6,8 +6,6 @@ body { min-height: 100vh; #landingpage { - position: absolute; - top: 1.5rem; width: 100%; text-align: center; display: flex; diff --git a/i18n/bs.yaml b/i18n/bs.yaml index f610ed0..84a37cb 100644 --- a/i18n/bs.yaml +++ b/i18n/bs.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj. Ovaj naziv će biti prikazan prilikom prijave." web_slogan: other: "Brze informacije u slučaju rizika od zaraze. " +web_generator_download_pdf_button: + other: "Skini PDF" +web_generator_success_title: + other: "QR kod je izrađen" +web_generator_reset_button: + other: "Izradi novi QR kod" +termination_text: + other: "Hvala vam što ste preuzeli aplikaciju SwissCovid.\n\nKorišćenjem aplikacije SwissCovid dali ste relevantan doprinos u borbi protiv pandemije. Više od 200.000 ljudi bilo je u mogućnosti da brzo informiše druge o riziku od infekcije i tako prekine lance infekcije.\n\nUkidanjem saveznih mera obustavljen je i rad aplikacije SwissCovid. Aplikacija je sada neaktivna i trebalo bi da je deinstalirate. Ukoliko bi reaktivacija bila neophodna zbog epidemiološke situacije, ponovo se radujemo vašoj podršci." +termination_link_title: + other: "Dalje informacije" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/de.yaml b/i18n/de.yaml index f30f22f..b96be2a 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -16,3 +16,9 @@ web_generator_success_title: other: "QR-Code erstellt" web_generator_reset_button: other: "Neuen QR-Code erstellen" +termination_text: + other: "Vielen Dank, dass Sie die SwissCovid App heruntergeladen haben.\n\nMit der Verwendung der SwissCovid App haben Sie einen relevanten Beitrag zur Pandemiebekämpfung geleistet. Über 200’000 Personen konnten andere schnell über ein Ansteckungsrisiko informieren und somit Infektionsketten unterbrechen.\n\nMit der Aufhebung der Massnahmen des Bundes wurde auch der Betrieb der SwissCovid App eingestellt. Die App ist per sofort inaktiv und soll deinstalliert werden. Sollte eine Reaktivierung aufgrund der epidemiologischen Situation nötig sein, würden wir uns wieder über Ihre Unterstützung freuen." +termination_link_title: + other: "Weitere Informationen" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/en.yaml b/i18n/en.yaml index b8dc514..7f251c1 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -16,3 +16,9 @@ web_generator_success_title: other: "QR code generated" web_generator_reset_button: other: "Generate new QR code" +termination_text: + other: "Thank you for downloading the SwissCovid app.\n\nYou have made an important contribution to fighting the pandemic by using the SwissCovid app. More than 200,000 people were able to break the transmission chain by quickly informing others of the risk of infection.\n\nThe SwissCovid app was discontinued when the federal government's other measures were lifted. The app is now inactive and you should delete it. We hope we can count on your support again if the epidemiological situation should require its reactivation in the future." +termination_link_title: + other: "Further information" +termination_url: + other: "https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/es.yaml b/i18n/es.yaml index 69cc104..fe9c5a1 100644 --- a/i18n/es.yaml +++ b/i18n/es.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Elija un título que describa bien el lugar o el evento. Este título aparecerá en el Check-in. " web_slogan: other: "Información rápida ante un riesgo de contagio." +web_generator_download_pdf_button: + other: "Descargar PDF" +web_generator_success_title: + other: "Código QR ha sido generado" +web_generator_reset_button: + other: "Generar un nuevo código QR" +termination_text: + other: "Muchas gracias por descargar la aplicación SwissCovid.\n\nCon la utilización de la app SwissCovid ha realizado usted un valioso aporte a la lucha contra la pandemia. Más de 200.000 personas pudieron informar rápidamente a otros de un riesgo de infección e interrumpir así las cadenas de contagio.\n\nCon la suspensión de las medidas por parte del gobierno federal, también la aplicación SwissCovid deja de estar operativa. La aplicación se ha inactivado y debe ser desinstalada. En caso de que la situación epidemiológica hiciera necesaria su reactivación, nos alegraría contar de nuevo con su apoyo." +termination_link_title: + other: "Más información" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/fr.yaml b/i18n/fr.yaml index ae7986f..e593b04 100644 --- a/i18n/fr.yaml +++ b/i18n/fr.yaml @@ -16,3 +16,9 @@ web_generator_success_title: other: "Code QR créé" web_generator_reset_button: other: "Créer un nouveau code QR" +termination_text: + other: "Nous vous remercions d’avoir téléchargé l’application SwissCovid.\n\nEn utilisant cette application, vous avez fourni une contribution essentielle à la lutte contre la pandémie. Plus de 200 000 personnes ont pu rapidement informer d’autres d'un risque d’infection et ainsi interrompre les chaînes de transmission.\n\nParallèlement à la levée des mesures de la Confédération, l’exploitation de l’application SwissCovid a été suspendue. L’application est inactive dès à présent et doit être désinstallée. Si une réactivation s’avérait nécessaire en raison de la situation épidémiologique, nous serions à nouveau heureux de pouvoir compter sur votre soutien." +termination_link_title: + other: "Informations complémentaires" +termination_url: + other: "https://www.bag.admin.ch/bag/fr/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/hr.yaml b/i18n/hr.yaml index f610ed0..84a37cb 100644 --- a/i18n/hr.yaml +++ b/i18n/hr.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj. Ovaj naziv će biti prikazan prilikom prijave." web_slogan: other: "Brze informacije u slučaju rizika od zaraze. " +web_generator_download_pdf_button: + other: "Skini PDF" +web_generator_success_title: + other: "QR kod je izrađen" +web_generator_reset_button: + other: "Izradi novi QR kod" +termination_text: + other: "Hvala vam što ste preuzeli aplikaciju SwissCovid.\n\nKorišćenjem aplikacije SwissCovid dali ste relevantan doprinos u borbi protiv pandemije. Više od 200.000 ljudi bilo je u mogućnosti da brzo informiše druge o riziku od infekcije i tako prekine lance infekcije.\n\nUkidanjem saveznih mera obustavljen je i rad aplikacije SwissCovid. Aplikacija je sada neaktivna i trebalo bi da je deinstalirate. Ukoliko bi reaktivacija bila neophodna zbog epidemiološke situacije, ponovo se radujemo vašoj podršci." +termination_link_title: + other: "Dalje informacije" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/it.yaml b/i18n/it.yaml index 02790dd..609edec 100644 --- a/i18n/it.yaml +++ b/i18n/it.yaml @@ -16,3 +16,9 @@ web_generator_success_title: other: "Codice QR creato" web_generator_reset_button: other: "Crea nuovo codice QR" +termination_text: + other: "Grazie per aver scaricato l'app SwissCovid.\n\nUtilizzando l'app SwissCovid hai fornito un contributo rilevante alla lotta alla pandemia. Oltre 200 000 persone hanno potuto informare gli altri rapidamente di un rischio di contagio, interrompendo così le catene di infezione.\n\nCon l'abrogazione dei provvedimenti della Confederazione, anche il funzionamento dell'app SwissCovid è stato sospeso. L'app è inattiva da subito e deve essere disinstallata. Se la situazione epidemiologica dovesse rendere necessaria una riattivazione, saremmo lieti di poter contare nuovamente sul tuo sostegno." +termination_link_title: + other: "Ulteriori informazioni" +termination_url: + other: "https://www.bag.admin.ch/bag/it/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/pt.yaml b/i18n/pt.yaml index 2a0104a..e076450 100644 --- a/i18n/pt.yaml +++ b/i18n/pt.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Dê um título que descreve o lugar ou o seu evento.\nEste título vai ser indicado no check-in." web_slogan: other: "Informação rápida em caso de risco de infeção" +web_generator_download_pdf_button: + other: "Baixar o PDF" +web_generator_success_title: + other: "Criou um código QR" +web_generator_reset_button: + other: "Criar um novo código QR" +termination_text: + other: "Agradecemos ter baixado o aplicativo SwissCovid.\n\nCom a utilização do aplicativo você prestou um contributo relevante para o combate à pandemia. Mais de 200.000 pessoas puderam informar outros rapidamente sobre um risco de contágio e interromper as cadeias de infeção.\n\nCom a revogação das medidas da Confederação, a operação do aplicativo SwissCovid também cessou. A partir de agora, o aplicativo é inativo e deve ser desinstalado. Se uma reativação for necessária devido à situação epidemiológica, seríamos muito grato pela sua ajuda." +termination_link_title: + other: "Mais informações" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/rm.yaml b/i18n/rm.yaml index 34acb2c..351df77 100644 --- a/i18n/rm.yaml +++ b/i18n/rm.yaml @@ -16,3 +16,9 @@ web_generator_success_title: other: "Il code QR è generà" web_generator_reset_button: other: "Generar in nov code QR" +termination_text: + other: "Grazia fitg che Vus avais chargià giu l'app SwissCovid.\n\nCun duvrar l'app SwissCovid avais Vus prestà ina contribuziun impurtanta en il cumbat cunter la pandemia. Passa 200 000 persunas han pudì infurmar autras persunas davart ina ristga d'infecziun ed han uschia pudì interrumper chadainas d'infecziun.\n\nCun l'aboliziun da las mesiras da la Confederaziun è er vegnì terminà il manaschi da l'app SwissCovid. L'app è per immediat inactiva e duai vegnir deinstallada. Sch'ella stuess puspè vegnir activada causa la situaziun epidemiologica, ans legrassan nus puspè da Voss sustegn." +termination_link_title: + other: "Ulteriuras infurmaziuns" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/sq.yaml b/i18n/sq.yaml index f0fc093..539c854 100644 --- a/i18n/sq.yaml +++ b/i18n/sq.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Jepni një titull që e përshkruan më afër vendin ose arsyen tuaj.\nKy titull shfaqet gjatë Check-in." web_slogan: other: "Në rastin e një rreziku të infektimit informoheni shpejt." +web_generator_download_pdf_button: + other: "Shkarkoni PDF" +web_generator_success_title: + other: "Kodi i krijuar QR" +web_generator_reset_button: + other: "Krijoni kodin e ri QR" +termination_text: + other: "Faleminderit shumë, që ju e keni shkarkuar aplikacionin “SwissCovid”.\n\nMe përdorimin e aplikacionin “SwissCovid” ju keni dhënë një kontribut të spikatshëm për luftimin e pandemisë. Mbi 200’000 persona mundën të informonin shpejt të tjerët mbi një rrezik infektimi dhe të ndërprisnin me këtë zinxhirin e infektimit.\n\nMe shfuqizimin e masave të federatës u ndërpre edhe funksionimi i aplikacionit “SwissCovid”. Aplikacioni është menjëherë joveprues dhe duhet të deinstalohet. Nëse për shkak të situatës epidemiologjike do të jetë i nevojshëm një riaktivizim, ne do të gëzoheshim përsëri për mbështetjen tuaj." +termination_link_title: + other: "Informacione të tjera" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/sr.yaml b/i18n/sr.yaml index f610ed0..84a37cb 100644 --- a/i18n/sr.yaml +++ b/i18n/sr.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Dodelite naziv, koji detaljnije opisuje lokaciju ili vaš događaj. Ovaj naziv će biti prikazan prilikom prijave." web_slogan: other: "Brze informacije u slučaju rizika od zaraze. " +web_generator_download_pdf_button: + other: "Skini PDF" +web_generator_success_title: + other: "QR kod je izrađen" +web_generator_reset_button: + other: "Izradi novi QR kod" +termination_text: + other: "Hvala vam što ste preuzeli aplikaciju SwissCovid.\n\nKorišćenjem aplikacije SwissCovid dali ste relevantan doprinos u borbi protiv pandemije. Više od 200.000 ljudi bilo je u mogućnosti da brzo informiše druge o riziku od infekcije i tako prekine lance infekcije.\n\nUkidanjem saveznih mera obustavljen je i rad aplikacije SwissCovid. Aplikacija je sada neaktivna i trebalo bi da je deinstalirate. Ukoliko bi reaktivacija bila neophodna zbog epidemiološke situacije, ponovo se radujemo vašoj podršci." +termination_link_title: + other: "Dalje informacije" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/ti.yaml b/i18n/ti.yaml index 32a3b02..568bd28 100644 --- a/i18n/ti.yaml +++ b/i18n/ti.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "እቲ ቦታ ወይ ፍጻሜኹም ብቀረባ ዝገልጽ ኣርእስቲ ወይ ስም ሃቡ ኢኹም።\nእዚ ኣርእስቲ ኣብ Check-in ክረአ እዩ።" web_slogan: other: "ኣብ ርከሳ ልበዳ ብቕልጡፍ ተሓቢርኩም።" +web_generator_download_pdf_button: + other: "PDF ኣራግፍ" +web_generator_success_title: + other: "ኮድ QR ተፈጢሩ" +web_generator_reset_button: + other: "ሓድሽ ኮድ QR ምፍጣር" +termination_text: + other: "ነቲ ስዊዝኮቪድ ዚብሃል ኣፕሊኬሽን ስለ ዘራገፍኩምልና (ዳውንሎውድ ብምግባርኩም) አመስግነኩም።\n\nነቲ ስዊዝኮቪድ ዚብሃል ኣፕሊኬሽን ተጠቒምካ ነዚ ለብዒ እዚ ንምቅላስ ኣገዳሲ ኣበርክቶ ጌርካ ኢኻ። ልዕሊ 200,000 ዝዀኑ ሰባት ንኻልኦት ሰባት ብዛዕባ እቲ ኼጋጥም ዚኽእል ረኽሲ ቐልጢፎም ኪነግርዎም ንሰንሰለት እቲ ረኽሲ ድማ ኬቋርጽዎ ኽኢሎም እዮም።\n\nእቲ ፈደራላዊ መንግስቲ ዝወሰዶ ስጕምትታት ምስ ተደምሰሰ ኣሰራርሓ እቲ ስዊዝኮቪድ ዚብሃል ኣፕሊኬሽን እውን ተቛረጸ። እቲ ኣፕሊኬሽን ብኡንብኡ ዘይንጡፍ ስለ ዝዀነ ኪቕመጥ ኣለዎ። ብሰንኪ እቲ ለብዒ እንደገና ምላሽ ምሃብ ኣድላዪ እንተ ዀይኑ እንደገና ደገፍካ ኽንረክብ ሕጉሳት ኢና ።" +termination_link_title: + other: "ዝያዳ ሓበሬታ" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/i18n/tr.yaml b/i18n/tr.yaml index f60420b..9a7045b 100644 --- a/i18n/tr.yaml +++ b/i18n/tr.yaml @@ -10,3 +10,15 @@ checkins_create_qr_code_subtitle: other: "Yeri veya etkinliği daha yakından tanımlayan bir başlık belirleyin.\nBu başlık check-in sırasında gösterilir." web_slogan: other: "Bir bulaş riski durumunda hızlıca bilgi sahibi olun." +web_generator_download_pdf_button: + other: "PDF indir" +web_generator_success_title: + other: "Kare kod oluşturuldu" +web_generator_reset_button: + other: "Yeni kare kod oluştur" +termination_text: + other: "SwissCovid uygulamasını yüklediğiniz için çok teşekkür ederiz.\n\nSwissCovid uygulamasını kullanmakla pandemiyle mücadeleye önemli bir katkı sağlamış oldunuz. Sayıları 200’000'i geçen kişi bulaşma riski konusunda diğerlerini hızlı bir şekilde bilgilendirme imkânına sahip oldu ve dolayısıyla enfeksiyon zincirini kesintiye uğratabildi.\n\nFederal resmi makamların önlemleri kaldırmasıyla birlikte SwissCovid uygulaması da devre dışı bırakıldı. Bu uygulama şu andan itibaren aktif durumda değildir ve silinmesi gerekmektedir. Epidemiyolojik durum bunun yeniden aktif hale getirilmesini gerekli kılarsa yine destek sağlamanıza seviniriz." +termination_link_title: + other: "Daha fazla bilgi" +termination_url: + other: "https://www.bag.admin.ch/bag/de/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/swisscovid-app-und-contact-tracing.html" diff --git a/layouts/generate/generate.html b/layouts/generate/generate.html index 20dc31c..bbcadc6 100644 --- a/layouts/generate/generate.html +++ b/layouts/generate/generate.html @@ -1,36 +1,46 @@ {{ define "main" }} -{{ $qrgenerator := resources.Get "js/dist/qrgenerator.min.js" | fingerprint }} - -
-
-

{{ T "checkins_create_qr_code" }}

-

{{ T "checkins_create_qr_code_subtitle" }}

-
- -
- -
- -
+ + {{ T "app_name"}} + + + + + + + + + + + + + + + + + {{ $styles := resources.Get "scss/main.scss" | toCSS | postCSS (dict "config" "./assets/scss/postcss.config.js") | minify | fingerprint }} + + + + + {{ $main := resources.Get "js/main.js" | js.Build (dict "minify" true "target" "es5") | fingerprint}} + + + - {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 90cd180..051847f 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -4,25 +4,13 @@

{{ T "app_name" }}

-

- {{ T "web_slogan" }} +

+ {{ T "termination_text" }}

- - {{ T "checkins_create_qr_code" }} + + {{ T "termination_link_title" }}
-
-
- - - -
-
- - - -
-
{{ end }} diff --git a/translation/translation.py b/translation/translation.py index 09e844e..4513566 100644 --- a/translation/translation.py +++ b/translation/translation.py @@ -54,6 +54,9 @@ def loadLanguage( language, projectID, localesFolder, api_token ): 'web_generator_download_pdf_button', 'show_pdf_button', 'web_generator_reset_button', + 'termination_text', + 'termination_link_title', + 'termination_url' ] if results['response']['code'] == '200':