Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix errors from Timex.Timezone.local() during switchover to DST. #3848

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Fix errors from Timex.Timezone.local() during switchover to DST. #3848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bdef04
Fix errors from Timex.Timezone.local() during switchover to DST.
dyxyl Apr 16, 2024
fc5f26b
Update the gettext files to match.
dyxyl Apr 16, 2024
87eff74
Merge branch 'master' into work-around-timex-bug-755
dyxyl Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/teslamate_web/live/car_live/summary.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@
finish_time =
Timex.add(current_time, Timex.Duration.from_hours(@summary.time_to_full_charge))

local_timezone = Timex.Timezone.local()
local_finish_time = Timex.Timezone.convert(finish_time, local_timezone)
local_finish_time = Timex.local(finish_time)

formatted_finish_time =
Timex.format!(local_finish_time, "%Y-%m-%d %H:%M:%S", :strftime) %>
Expand Down
36 changes: 18 additions & 18 deletions priv/gettext/da/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ msgstr ""
msgid "Status"
msgstr "Status"

#: lib/teslamate_web/live/car_live/summary.html.heex:350
#: lib/teslamate_web/live/car_live/summary.html.heex:349
#, elixir-autogen, elixir-format
msgid "Speed"
msgstr "Hastighed"

#: lib/teslamate_web/live/car_live/summary.html.heex:340
#: lib/teslamate_web/live/car_live/summary.html.heex:339
#, elixir-autogen, elixir-format
msgid "State of Charge"
msgstr "Batteriniveau"

#: lib/teslamate_web/live/car_live/summary.html.heex:274
#: lib/teslamate_web/live/car_live/summary.html.heex:273
#, elixir-autogen, elixir-format
msgid "Charged"
msgstr "Opladet"
Expand Down Expand Up @@ -87,7 +87,7 @@ msgstr "Hjem"
msgid "Settings"
msgstr "Indstillinger"

#: lib/teslamate_web/live/car_live/summary.html.heex:289
#: lib/teslamate_web/live/car_live/summary.html.heex:288
#, elixir-autogen, elixir-format
msgid "Scheduled Charging"
msgstr "Planlagt opladning"
Expand All @@ -97,7 +97,7 @@ msgstr "Planlagt opladning"
msgid "Plugged In"
msgstr "Stikket sat i"

#: lib/teslamate_web/live/car_live/summary.html.heex:301
#: lib/teslamate_web/live/car_live/summary.html.heex:300
#, elixir-autogen, elixir-format
msgid "Charge Limit"
msgstr "Opladningsgrænse"
Expand Down Expand Up @@ -226,17 +226,17 @@ msgstr "Vagttilstand er aktiveret"
msgid "Driver present"
msgstr "Fører tilstede"

#: lib/teslamate_web/live/car_live/summary.html.heex:435
#: lib/teslamate_web/live/car_live/summary.html.heex:434
#, elixir-autogen, elixir-format
msgid "cancel sleep attempt"
msgstr "afbryd forsøg på at sove"

#: lib/teslamate_web/live/car_live/summary.html.heex:426
#: lib/teslamate_web/live/car_live/summary.html.heex:425
#, elixir-autogen, elixir-format
msgid "try to sleep"
msgstr "forsøg at sove"

#: lib/teslamate_web/live/car_live/summary.html.heex:261
#: lib/teslamate_web/live/car_live/summary.html.heex:260
#, elixir-autogen, elixir-format
msgid "Range (est.)"
msgstr "Rækkevidde (beregnet)"
Expand All @@ -256,12 +256,12 @@ msgstr "Krav"
msgid "Vehicle must be locked"
msgstr "Køretøjet skal være låst"

#: lib/teslamate_web/live/car_live/summary.html.heex:241
#: lib/teslamate_web/live/car_live/summary.html.heex:240
#, elixir-autogen, elixir-format
msgid "Range (rated)"
msgstr "Rækkevidde (nominel)"

#: lib/teslamate_web/live/car_live/summary.html.heex:280
#: lib/teslamate_web/live/car_live/summary.html.heex:279
#, elixir-autogen, elixir-format
msgid "Charger Power"
msgstr "Opladers effekt"
Expand All @@ -286,7 +286,7 @@ msgstr "ideel"
msgid "rated"
msgstr "nominel"

#: lib/teslamate_web/live/car_live/summary.html.heex:240
#: lib/teslamate_web/live/car_live/summary.html.heex:239
#, elixir-autogen, elixir-format
msgid "Range (ideal)"
msgstr "Rækkevidde (ideel)"
Expand All @@ -311,17 +311,17 @@ msgstr "Vinduer er åbne"
msgid "Delete '%{geo_fence}'?"
msgstr "Slet '%{geo_fence}'?"

#: lib/teslamate_web/live/car_live/summary.html.heex:375
#: lib/teslamate_web/live/car_live/summary.html.heex:374
#, elixir-autogen, elixir-format
msgid "Inside Temperature"
msgstr "Indetemperatur"

#: lib/teslamate_web/live/car_live/summary.html.heex:363
#: lib/teslamate_web/live/car_live/summary.html.heex:362
#, elixir-autogen, elixir-format
msgid "Outside Temperature"
msgstr "Udetemperatur"

#: lib/teslamate_web/live/car_live/summary.html.heex:400
#: lib/teslamate_web/live/car_live/summary.html.heex:399
#: lib/teslamate_web/live/settings_live/index.html.heex:311
#, elixir-autogen, elixir-format
msgid "Version"
Expand All @@ -337,7 +337,7 @@ msgstr "Sundhedscheck mislykkedes"
msgid "Unlocked"
msgstr "Ulåst"

#: lib/teslamate_web/live/car_live/summary.html.heex:223
#: lib/teslamate_web/live/car_live/summary.html.heex:222
#, elixir-autogen, elixir-format
msgid "Remaining Time"
msgstr "Tid tilbage"
Expand Down Expand Up @@ -389,7 +389,7 @@ msgstr "Timeout"
msgid "Reduced Battery Range"
msgstr "Batteri har reduceret rækkevidde"

#: lib/teslamate_web/live/car_live/summary.html.heex:334
#: lib/teslamate_web/live/car_live/summary.html.heex:333
#, elixir-autogen, elixir-format
msgid "≈ %{range} at 100%"
msgstr "≈ %{range} ved 100%"
Expand Down Expand Up @@ -523,7 +523,7 @@ msgstr "Udgifter til opladning"
msgid "Continue"
msgstr "Fortsæt"

#: lib/teslamate_web/live/car_live/summary.html.heex:388
#: lib/teslamate_web/live/car_live/summary.html.heex:387
#, elixir-autogen, elixir-format
msgid "Mileage"
msgstr "Kilometertal"
Expand Down Expand Up @@ -650,7 +650,7 @@ msgstr ""
msgid "Dog mode is enabled"
msgstr ""

#: lib/teslamate_web/live/car_live/summary.html.heex:232
#: lib/teslamate_web/live/car_live/summary.html.heex:231
#, elixir-autogen, elixir-format
msgid "Expected Finish Time"
msgstr ""
36 changes: 18 additions & 18 deletions priv/gettext/de/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ msgstr ""
msgid "Status"
msgstr "Status"

#: lib/teslamate_web/live/car_live/summary.html.heex:350
#: lib/teslamate_web/live/car_live/summary.html.heex:349
#, elixir-autogen, elixir-format
msgid "Speed"
msgstr "Geschwindigkeit"

#: lib/teslamate_web/live/car_live/summary.html.heex:340
#: lib/teslamate_web/live/car_live/summary.html.heex:339
#, elixir-autogen, elixir-format
msgid "State of Charge"
msgstr "Ladestand"

#: lib/teslamate_web/live/car_live/summary.html.heex:274
#: lib/teslamate_web/live/car_live/summary.html.heex:273
#, elixir-autogen, elixir-format
msgid "Charged"
msgstr "Geladen"
Expand Down Expand Up @@ -87,7 +87,7 @@ msgstr "Home"
msgid "Settings"
msgstr "Einstellungen"

#: lib/teslamate_web/live/car_live/summary.html.heex:289
#: lib/teslamate_web/live/car_live/summary.html.heex:288
#, elixir-autogen, elixir-format
msgid "Scheduled Charging"
msgstr "Ladezeitpunkt"
Expand All @@ -97,7 +97,7 @@ msgstr "Ladezeitpunkt"
msgid "Plugged In"
msgstr "Eingesteckt"

#: lib/teslamate_web/live/car_live/summary.html.heex:301
#: lib/teslamate_web/live/car_live/summary.html.heex:300
#, elixir-autogen, elixir-format
msgid "Charge Limit"
msgstr "Ladelimit"
Expand Down Expand Up @@ -226,17 +226,17 @@ msgstr "Wächtermodus aktiviert"
msgid "Driver present"
msgstr "Fahrer anwesend"

#: lib/teslamate_web/live/car_live/summary.html.heex:435
#: lib/teslamate_web/live/car_live/summary.html.heex:434
#, elixir-autogen, elixir-format
msgid "cancel sleep attempt"
msgstr "Schlafversuch abbrechen"

#: lib/teslamate_web/live/car_live/summary.html.heex:426
#: lib/teslamate_web/live/car_live/summary.html.heex:425
#, elixir-autogen, elixir-format
msgid "try to sleep"
msgstr "versuchen zu schlafen"

#: lib/teslamate_web/live/car_live/summary.html.heex:261
#: lib/teslamate_web/live/car_live/summary.html.heex:260
#, elixir-autogen, elixir-format
msgid "Range (est.)"
msgstr "Reichweite (gesch.)"
Expand All @@ -256,12 +256,12 @@ msgstr "Voraussetzungen"
msgid "Vehicle must be locked"
msgstr "Fahrzeug muss verschlossen sein"

#: lib/teslamate_web/live/car_live/summary.html.heex:241
#: lib/teslamate_web/live/car_live/summary.html.heex:240
#, elixir-autogen, elixir-format
msgid "Range (rated)"
msgstr "Reichweite (rated)"

#: lib/teslamate_web/live/car_live/summary.html.heex:280
#: lib/teslamate_web/live/car_live/summary.html.heex:279
#, elixir-autogen, elixir-format
msgid "Charger Power"
msgstr "Ladeleistung"
Expand All @@ -286,7 +286,7 @@ msgstr "ideal"
msgid "rated"
msgstr "rated"

#: lib/teslamate_web/live/car_live/summary.html.heex:240
#: lib/teslamate_web/live/car_live/summary.html.heex:239
#, elixir-autogen, elixir-format
msgid "Range (ideal)"
msgstr "Reichweite (ideal)"
Expand All @@ -311,17 +311,17 @@ msgstr "Fenster geöffnet"
msgid "Delete '%{geo_fence}'?"
msgstr "'%{geo_fence}' löschen?"

#: lib/teslamate_web/live/car_live/summary.html.heex:375
#: lib/teslamate_web/live/car_live/summary.html.heex:374
#, elixir-autogen, elixir-format
msgid "Inside Temperature"
msgstr "Innentemperatur"

#: lib/teslamate_web/live/car_live/summary.html.heex:363
#: lib/teslamate_web/live/car_live/summary.html.heex:362
#, elixir-autogen, elixir-format
msgid "Outside Temperature"
msgstr "Außentemperatur"

#: lib/teslamate_web/live/car_live/summary.html.heex:400
#: lib/teslamate_web/live/car_live/summary.html.heex:399
#: lib/teslamate_web/live/settings_live/index.html.heex:311
#, elixir-autogen, elixir-format
msgid "Version"
Expand All @@ -337,7 +337,7 @@ msgstr "Health Check fehlgeschlagen"
msgid "Unlocked"
msgstr "nicht verschlossen"

#: lib/teslamate_web/live/car_live/summary.html.heex:223
#: lib/teslamate_web/live/car_live/summary.html.heex:222
#, elixir-autogen, elixir-format
msgid "Remaining Time"
msgstr "Restlaufzeit"
Expand Down Expand Up @@ -389,7 +389,7 @@ msgstr ""
msgid "Reduced Battery Range"
msgstr "Verringerte Reichweite"

#: lib/teslamate_web/live/car_live/summary.html.heex:334
#: lib/teslamate_web/live/car_live/summary.html.heex:333
#, elixir-autogen, elixir-format
msgid "≈ %{range} at 100%"
msgstr "≈ %{range} bei 100%"
Expand Down Expand Up @@ -523,7 +523,7 @@ msgstr "Ladekosten"
msgid "Continue"
msgstr "Weiter"

#: lib/teslamate_web/live/car_live/summary.html.heex:388
#: lib/teslamate_web/live/car_live/summary.html.heex:387
#, elixir-autogen, elixir-format
msgid "Mileage"
msgstr "Kilometerstand"
Expand Down Expand Up @@ -650,7 +650,7 @@ msgstr "Hundemodus"
msgid "Dog mode is enabled"
msgstr "Hundemodus ist aktiviert"

#: lib/teslamate_web/live/car_live/summary.html.heex:232
#: lib/teslamate_web/live/car_live/summary.html.heex:231
#, elixir-autogen, elixir-format
msgid "Expected Finish Time"
msgstr "Erwartete Endzeit"