diff --git a/lib/music_library_web/live/collection_live/index.ex b/lib/music_library_web/live/collection_live/index.ex index 28f61ae7..cc6fdabb 100644 --- a/lib/music_library_web/live/collection_live/index.ex +++ b/lib/music_library_web/live/collection_live/index.ex @@ -8,7 +8,7 @@ defmodule MusicLibraryWeb.CollectionLive.Index do alias MusicLibrary.Collection alias MusicLibrary.Records - alias MusicLibraryWeb.CollectionLive.Show + alias MusicLibraryWeb.ErrorMessages @default_records_list_params %{ @@ -220,7 +220,7 @@ defmodule MusicLibraryWeb.CollectionLive.Index do socket |> apply_fallback_index(params, :records, &apply_action/3) - |> assign(:page_title, Show.page_title(socket.assigns.live_action, record)) + |> assign(:page_title, page_title(:edit, record)) |> assign(:record, record) end @@ -337,4 +337,21 @@ defmodule MusicLibraryWeb.CollectionLive.Index do ~p"/collection?#{qs}" end + + defp page_title(action, record) do + Enum.join( + [ + Records.Record.artist_names(record), + "-", + record.title, + "·", + title_segment(action), + "·", + gettext("Collection") + ], + " " + ) + end + + defp title_segment(:edit), do: gettext("Edit") end diff --git a/lib/music_library_web/live/collection_live/show.ex b/lib/music_library_web/live/collection_live/show.ex index 82fbcf35..da4150fb 100644 --- a/lib/music_library_web/live/collection_live/show.ex +++ b/lib/music_library_web/live/collection_live/show.ex @@ -474,7 +474,7 @@ defmodule MusicLibraryWeb.CollectionLive.Show do |> assign_embedding_text()} end - def page_title(:show, record) do + defp page_title(:show, record) do Enum.join( [ Records.Record.artist_names(record), @@ -489,7 +489,7 @@ defmodule MusicLibraryWeb.CollectionLive.Show do ) end - def page_title(action, record) do + defp page_title(action, record) do Enum.join( [ Records.Record.artist_names(record), diff --git a/lib/music_library_web/live/wishlist_live/index.ex b/lib/music_library_web/live/wishlist_live/index.ex index a4f8d8c8..822b6492 100644 --- a/lib/music_library_web/live/wishlist_live/index.ex +++ b/lib/music_library_web/live/wishlist_live/index.ex @@ -8,7 +8,6 @@ defmodule MusicLibraryWeb.WishlistLive.Index do alias MusicLibrary.Records alias MusicLibrary.Wishlist alias MusicLibraryWeb.ErrorMessages - alias MusicLibraryWeb.WishlistLive.Show @default_records_list_params %{ query: "", @@ -191,7 +190,7 @@ defmodule MusicLibraryWeb.WishlistLive.Index do socket |> apply_fallback_index(params, :records, &apply_action/3) - |> assign(:page_title, Show.page_title(socket.assigns.live_action, record)) + |> assign(:page_title, page_title(:edit, record)) |> assign(:record, record) end @@ -321,4 +320,21 @@ defmodule MusicLibraryWeb.WishlistLive.Index do ~p"/wishlist?#{qs}" end + + defp page_title(action, record) do + Enum.join( + [ + Records.Record.artist_names(record), + "-", + record.title, + "·", + title_segment(action), + "·", + gettext("Wishlist") + ], + " " + ) + end + + defp title_segment(:edit), do: gettext("Edit") end diff --git a/lib/music_library_web/live/wishlist_live/show.ex b/lib/music_library_web/live/wishlist_live/show.ex index cced9dd8..cf435ed2 100644 --- a/lib/music_library_web/live/wishlist_live/show.ex +++ b/lib/music_library_web/live/wishlist_live/show.ex @@ -418,7 +418,7 @@ defmodule MusicLibraryWeb.WishlistLive.Show do |> assign_embedding_text()} end - def page_title(action, record) do + defp page_title(action, record) do Enum.join( [ Records.Record.artist_names(record), diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 65ba6535..6b2301b1 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -52,12 +52,14 @@ msgstr "" #: lib/music_library_web/components/notes.ex #: lib/music_library_web/components/record_components.ex #: lib/music_library_web/live/artist_live/show.ex +#: lib/music_library_web/live/collection_live/index.ex #: lib/music_library_web/live/collection_live/show.ex #: lib/music_library_web/live/online_store_template_live/index.ex #: lib/music_library_web/live/record_set_live/index.ex #: lib/music_library_web/live/record_set_live/show.ex #: lib/music_library_web/live/scrobble_rules_live/index.ex #: lib/music_library_web/live/scrobbled_tracks_live/index.ex +#: lib/music_library_web/live/wishlist_live/index.ex #: lib/music_library_web/live/wishlist_live/show.ex #, elixir-autogen, elixir-format msgid "Edit" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 3a117ed6..d3e852f6 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -52,12 +52,14 @@ msgstr "" #: lib/music_library_web/components/notes.ex #: lib/music_library_web/components/record_components.ex #: lib/music_library_web/live/artist_live/show.ex +#: lib/music_library_web/live/collection_live/index.ex #: lib/music_library_web/live/collection_live/show.ex #: lib/music_library_web/live/online_store_template_live/index.ex #: lib/music_library_web/live/record_set_live/index.ex #: lib/music_library_web/live/record_set_live/show.ex #: lib/music_library_web/live/scrobble_rules_live/index.ex #: lib/music_library_web/live/scrobbled_tracks_live/index.ex +#: lib/music_library_web/live/wishlist_live/index.ex #: lib/music_library_web/live/wishlist_live/show.ex #, elixir-autogen, elixir-format msgid "Edit"