From 39ab647122dd9eb5b5a3a660be993e88e7c31ebb Mon Sep 17 00:00:00 2001 From: Jakob Lichterfeld Date: Wed, 28 Feb 2024 08:55:57 +0100 Subject: [PATCH 1/5] fix: upload and merge artifact naming conflict since action version v4 --- .github/actions/build/action.yaml | 2 +- .github/actions/merge/action.yml | 4 +++- CHANGELOG.md | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml index 521396ba65..3a2c5d4cbd 100644 --- a/.github/actions/build/action.yaml +++ b/.github/actions/build/action.yaml @@ -72,7 +72,7 @@ runs: - name: Upload digest uses: actions/upload-artifact@v4 with: - name: digests + name: single-digest-${{ matrix.runs-on }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 diff --git a/.github/actions/merge/action.yml b/.github/actions/merge/action.yml index aa2c00e867..92a4a1d9a5 100644 --- a/.github/actions/merge/action.yml +++ b/.github/actions/merge/action.yml @@ -13,10 +13,12 @@ runs: using: "composite" steps: - name: Download digests - uses: actions/download-artifact@v3 + uses: actions/upload-artifact/merge@v4 with: name: digests + pattern: single-digest-* path: /tmp/digests + merge-multiple: true - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 920698ddaa..4910b2b81e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - feat: Add stat panel for selected duration in drive details dashboard (#3667 - @oivindoh) - ci: run edge build every night ([206d731](https://github.com/teslamate-org/teslamate/commit/206d731935a5e8ebc350a7981df8c6d92480b88b) - @JakobLichterfeld) - ci: update upload-artifact action (#3689 - @JakobLichterfeld) +- fix: upload and merge artifact naming conflict since action version v4 (#3689 - @JakobLichterfeld) - build: bump app base image to fix 'GLIBC_2.34' not found error (#3691- @JakobLichterfeld) - build: bump app dependencies for libssl and netcat to packages available in debian bookworm (#3691- @JakobLichterfeld) - build: reduce the size of the Docker image by cleaning the APT cache (#3692- @JakobLichterfeld) From 665c4c039720885ebe2bc6adf6396717db4f6ec0 Mon Sep 17 00:00:00 2001 From: accolon Date: Wed, 28 Feb 2024 09:08:35 +0100 Subject: [PATCH 2/5] Add missing German translation, fix mistakes (#3694) --- priv/gettext/de/LC_MESSAGES/default.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 48f9ad4845..09b90767af 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -557,7 +557,7 @@ msgstr "Türen geöffnet" #: lib/teslamate_web/live/car_live/summary.ex:136 #, elixir-autogen, elixir-format msgid "Trunk is open" -msgstr "Kofferraum is geöffnet" +msgstr "Kofferraum ist geöffnet" #: lib/teslamate_web/live/charge_live/cost.html.heex:141 #: lib/teslamate_web/live/geofence_live/form.html.heex:73 @@ -603,7 +603,7 @@ msgstr "hier" #: lib/teslamate_web/live/signin_live/index.ex:59 #, elixir-autogen, elixir-format msgid "Your Tesla account is locked due to too many failed sign in attempts. To unlock your account, reset your password" -msgstr "Ihr Tesla-Konto ist aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt. Um Ihr Konto zu entsperren, setzen Sie Ihr Kennwort zurück" +msgstr "Dein Tesla-Konto ist aufgrund von zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt. Um das Konto zu entsperren, setze dein Kennwort zurück" #: lib/teslamate_web/live/car_live/summary.ex:141 #, elixir-autogen, elixir-format @@ -638,19 +638,19 @@ msgstr "Reifendruck" #: lib/teslamate_web/live/car_live/summary.html.heex:145 #, elixir-autogen, elixir-format msgid "Low tire pressure, check (%{tire_low}) tire" -msgstr "" +msgstr "Niedriger Reifendruck, Reifen (%{tire_low}) prüfen" #: lib/teslamate_web/live/car_live/summary.html.heex:65 #, elixir-autogen, elixir-format msgid "Dog Mode" -msgstr "" +msgstr "Hundemodus" #: lib/teslamate_web/live/car_live/summary.ex:139 #, elixir-autogen, elixir-format msgid "Dog mode is enabled" -msgstr "" +msgstr "Hundemodus ist aktiviert" #: lib/teslamate_web/live/car_live/summary.html.heex:232 #, elixir-autogen, elixir-format msgid "Expected Finish Time" -msgstr "" +msgstr "Erwartete Endzeit" From 74016d9981f9bd6caf22b4a54b70591f3766d887 Mon Sep 17 00:00:00 2001 From: Jakob Lichterfeld Date: Wed, 28 Feb 2024 09:09:36 +0100 Subject: [PATCH 3/5] doc: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4910b2b81e..ae8988abe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - Add Thai Translation (#3566 - @tomzt) - Update default.po missing french translations (#3662 - @pquattro) - update zh_Hans text (#3664 - @mrgaolei) +- Add missing German translation for new messages, fix mistakes (#3694 - @accolon) #### Documentation From 28cfdba0e9b58bf6a4944e7cf23a8678f7d1324d Mon Sep 17 00:00:00 2001 From: Zipi Date: Wed, 28 Feb 2024 17:10:32 +0900 Subject: [PATCH 4/5] feat: add missing translation for new messages for Korean (#3693) * Update default.po * fix typo --- priv/gettext/ko/LC_MESSAGES/default.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/priv/gettext/ko/LC_MESSAGES/default.po b/priv/gettext/ko/LC_MESSAGES/default.po index c35da02387..33fbfda785 100644 --- a/priv/gettext/ko/LC_MESSAGES/default.po +++ b/priv/gettext/ko/LC_MESSAGES/default.po @@ -638,19 +638,19 @@ msgstr "공기압" #: lib/teslamate_web/live/car_live/summary.html.heex:145 #, elixir-autogen, elixir-format msgid "Low tire pressure, check (%{tire_low}) tire" -msgstr "" +msgstr "타이어 공기압 부족, 타이어(%{tire_low})를 확인하세요." #: lib/teslamate_web/live/car_live/summary.html.heex:65 #, elixir-autogen, elixir-format msgid "Dog Mode" -msgstr "" +msgstr "애견 모드" #: lib/teslamate_web/live/car_live/summary.ex:139 #, elixir-autogen, elixir-format msgid "Dog mode is enabled" -msgstr "" +msgstr "애견 모드가 켜져있습니다." #: lib/teslamate_web/live/car_live/summary.html.heex:232 #, elixir-autogen, elixir-format msgid "Expected Finish Time" -msgstr "" +msgstr "예상 종료 시간" From 7ff3fd11d5b1e7024e72006e8830671d7f38655e Mon Sep 17 00:00:00 2001 From: Jakob Lichterfeld Date: Wed, 28 Feb 2024 09:11:32 +0100 Subject: [PATCH 5/5] doc: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8988abe4..cab1b523e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Update default.po missing french translations (#3662 - @pquattro) - update zh_Hans text (#3664 - @mrgaolei) - Add missing German translation for new messages, fix mistakes (#3694 - @accolon) +- feat: add missing translation for new messages for Korean (#3693 - @zipizigi) #### Documentation