Skip to content

Commit

Permalink
Merge branch 'master' into update
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanb authored Aug 31, 2024
2 parents de13f19 + 113f1c7 commit f2598c2
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: hmarr/[email protected]

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Undeploy
uses: sledilnik/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: hmarr/[email protected]

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/[email protected]
with:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
needs: build
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy
uses: sledilnik/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: hmarr/[email protected]

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/[email protected]
with:
Expand All @@ -36,7 +36,7 @@ jobs:
needs: test
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
needs: build
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy
uses: sledilnik/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: hmarr/[email protected]

- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/[email protected]
with:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'NOBUILD')"
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'NODEPLOY')"
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Deploy
uses: sledilnik/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1402,8 +1402,8 @@
},
"pageNotFound": {
"back": "Zurück",
"somethingWentWrong": "Etwas ist schief gelaufen :(",
"imageDescription": "zwei durch gelbes Band verbundene Verkehrskegel",
"somethingWentWrong": "Ups, da ist etwas schief gelaufen :(",
"imageDescription": "ein achselzuckender Arzt",
"notFound": "404: Seite nicht gefunden"
},
"tables": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@
"notFound": "404: page not found",
"somethingWentWrong": "oops… something went wrong :(",
"back": "Back",
"imageDescription": "two traffic cones connected by yellow tape"
"imageDescription": "a shrugging doctor"
},
"mk": {
"phase": {
Expand Down
14 changes: 7 additions & 7 deletions src/locales/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
"x_months_2": "{{ count }} mj.",
"zoom": "Razdoblje",
"shortDateFormat": "%e. %b",
"linkFaq": "Često postavljena pitanja",
"linkFaq": "ČPP",
"to": "",
"from": " ",
"sortBy": "Razvrstaj prema:",
Expand Down Expand Up @@ -993,14 +993,14 @@
},
"publicTransport": {
"description": "Obustava javnog prijevoza",
"title": "Javni prijevoz"
"title": "Prijevoz"
},
"shops": {
"title": "Trgovine",
"description": "Trgovine od 8 – 10 sati i zadnji sat isključivo <br>za ugrožene skupine (invalidi, umirovljenici, trudnice)"
},
"liftPublicTransport": {
"title": "Javni prijevoz",
"title": "Prijevoz",
"description": "Ublažavanje ograničenja: javni prijevoz, sve zdravstvene i stomatološke usluge"
},
"retirementHomes": {
Expand Down Expand Up @@ -1268,8 +1268,8 @@
}
},
"pageNotFound": {
"somethingWentWrong": "ups … došlo je do neke greške :(",
"imageDescription": "prometni stošci povezani žutom vrpcom",
"somethingWentWrong": "ups... nešto je pošlo po zlu :(",
"imageDescription": "liječnik koji sliježe ramenima",
"notFound": "404: stranica nije pronađena",
"back": "Natrag"
},
Expand Down Expand Up @@ -1308,7 +1308,7 @@
"ru": "Ruski"
},
"about": "O projektu",
"faq": "FAQ",
"faq": "ČPP",
"menu": "Izbornik",
"animation": "Animacija",
"goToGraph": "Prijeđi na dijagram",
Expand Down Expand Up @@ -1694,7 +1694,7 @@
"timestamp": "{{ date, %e. %B %Y. }}"
},
"faq": {
"pageTitle": "FAQ",
"pageTitle": "Često postavljena pitanja",
"intro": "_Svrha projekta Sledilnik i svih njegovih statističkih dijagrama i tablica/prikaza je prikazati sve postojeće podatke o epidemiji COVID-19 u Sloveniji na razumljiv način. Sastavili smo popis često postavljenih pitanja. Popis često postavljenih pitanja trenutačno nije iscrpan, ali se često aktualizira. U slučaju bilo kakvih pitanja, kontaktiraj nas na: [email protected]. (Radujemo se pohvalama, povratnim informacijama i prijedlozima!)_",
"searchPlaceholder": "Upiši traženi pojam",
"what-is-sledilnik": {
Expand Down
2 changes: 1 addition & 1 deletion src/locales/sl.json
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,7 @@
"notFound": "404: stran ne obstaja",
"somethingWentWrong": "ups… nekaj se je zalomilo :(",
"back": "Nazaj",
"imageDescription": "prometna stožca povezana z rumenim trakom"
"imageDescription": "skomigajoči zdravnik"
},
"mk": {
"hospital": {
Expand Down
2 changes: 1 addition & 1 deletion src/visualizations/App.fs
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ let render (state: State) (_: Msg -> unit) =

let localVisualizations =
[ metricsComparison;
dailyComparison;
// dailyComparison;
patientsAge;
sewage;
spread;
Expand Down

0 comments on commit f2598c2

Please sign in to comment.