From 92d8150233c0b440b79aaca3e9cf4cf0bd8d4deb Mon Sep 17 00:00:00 2001 From: Christian Traber Date: Fri, 3 Jan 2020 13:48:03 +0100 Subject: [PATCH] fixed tests and added tanslation --- .../templates/car/summary.html.leex | 6 ++---- priv/gettext/de/LC_MESSAGES/default.po | 5 +++++ priv/gettext/default.pot | 17 +++++++++++------ priv/gettext/en/LC_MESSAGES/default.po | 5 +++++ .../controllers/car_controller_test.exs | 6 ++++-- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/lib/teslamate_web/templates/car/summary.html.leex b/lib/teslamate_web/templates/car/summary.html.leex index a774e921..8e77edd2 100644 --- a/lib/teslamate_web/templates/car/summary.html.leex +++ b/lib/teslamate_web/templates/car/summary.html.leex @@ -166,8 +166,7 @@ "#{Float.round(@summary.rated_battery_range_km/@summary.battery_level * 100,2)} km" end - #Float.round(@summary.rated_battery_range_km/@summary.battery_level * 100,0) - %> at 100%) + %> 100%) <% end %> <%= unless is_nil(@summary.usable_battery_level) do %> @@ -181,8 +180,7 @@ "#{Float.round(@summary.rated_battery_range_km/@summary.usable_battery_level * 100,2)} km" end - # Float.round(@summary.rated_battery_range_km/@summary.usable_battery_level * 100,0) - %> at 100%) + %> 100%) <% end %> <%= if @summary.state == :driving and not is_nil(@summary.speed) do %> diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 77e83792..031ddf6c 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -418,3 +418,8 @@ msgstr "Ein Fehler ist aufgetreten" #: lib/teslamate_web/live/car_live/summary.ex:102 msgid "Timeout" msgstr "" + +#, elixir-format +#: lib/teslamate_web/templates/car/summary.html.leex:175 +msgid "Usable State of Charge" +msgstr "Verfügbarer Ladestand" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index ca5d72af..419a73a2 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -16,7 +16,7 @@ msgid "Status" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:166 +#: lib/teslamate_web/templates/car/summary.html.leex:190 msgid "Speed" msgstr "" @@ -222,12 +222,12 @@ msgid "Driver present" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:232 +#: lib/teslamate_web/templates/car/summary.html.leex:256 msgid "cancel sleep attempt" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:227 +#: lib/teslamate_web/templates/car/summary.html.leex:251 msgid "try to sleep" msgstr "" @@ -333,17 +333,17 @@ msgid "Delete '%{geo_fence}'?" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:191 +#: lib/teslamate_web/templates/car/summary.html.leex:215 msgid "Inside temperature" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:179 +#: lib/teslamate_web/templates/car/summary.html.leex:203 msgid "Outside temperature" msgstr "" #, elixir-format -#: lib/teslamate_web/templates/car/summary.html.leex:204 +#: lib/teslamate_web/templates/car/summary.html.leex:228 msgid "Version" msgstr "" @@ -417,3 +417,8 @@ msgstr "" #: lib/teslamate_web/live/car_live/summary.ex:102 msgid "Timeout" msgstr "" + +#, elixir-format +#: lib/teslamate_web/templates/car/summary.html.leex:175 +msgid "Usable State of Charge" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 1c35c07b..ee668cf2 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -418,3 +418,8 @@ msgstr "" #: lib/teslamate_web/live/car_live/summary.ex:102 msgid "Timeout" msgstr "" + +#, elixir-format +#: lib/teslamate_web/templates/car/summary.html.leex:175 +msgid "Usable State of Charge" +msgstr "" diff --git a/test/teslamate_web/controllers/car_controller_test.exs b/test/teslamate_web/controllers/car_controller_test.exs index 0343c7c4..24c528d2 100644 --- a/test/teslamate_web/controllers/car_controller_test.exs +++ b/test/teslamate_web/controllers/car_controller_test.exs @@ -107,7 +107,7 @@ defmodule TeslaMateWeb.CarControllerTest do assert table_row(html, "Status", "asleep") assert table_row(html, "Range (ideal)", "380.25 km") assert table_row(html, "Range (est.)", "401.52 km") - assert table_row(html, "State of Charge", "80%") + assert table_row(html, "State of Charge", "80% (218.87 km 100%)") assert table_row(html, "Outside temperature", "20.1 °C") assert table_row(html, "Inside temperature", "21.0 °C") end @@ -123,6 +123,7 @@ defmodule TeslaMateWeb.CarControllerTest do ideal_battery_range: 200, est_battery_range: 180, battery_range: 175, + usable_battery_level: 67, battery_level: 69 }, climate_state: %{is_preconditioning: true, outside_temp: 24, inside_temp: 23.2}, @@ -152,7 +153,8 @@ defmodule TeslaMateWeb.CarControllerTest do assert table_row(html, "Status", "online") assert table_row(html, "Range (ideal)", "321.87 km") assert table_row(html, "Range (est.)", "289.68 km") - assert table_row(html, "State of Charge", "69%") + assert table_row(html, "State of Charge", "69% (408.17 km 100%)") + assert table_row(html, "Usable State of Charge", "67% (420.36 km 100%)") assert icon(html, "Locked", "lock") assert icon(html, "Driver present", "account") assert icon(html, "Preconditioning", "air-conditioner")