diff --git a/lib/runosaari_web/controllers/performance_controller.ex b/lib/runosaari_web/controllers/performance_controller.ex index 25b2bf5..f6fb965 100644 --- a/lib/runosaari_web/controllers/performance_controller.ex +++ b/lib/runosaari_web/controllers/performance_controller.ex @@ -23,7 +23,7 @@ defmodule RunosaariWeb.PerformanceController do case Schedule.create_performance(performance_params) do {:ok, performance} -> conn - |> put_flash(:info, "Performance created successfully.") + |> put_flash(:info, "Näytös luotu.") |> redirect(to: Routes.performance_path(conn, :show, performance)) {:error, %Ecto.Changeset{} = changeset} -> @@ -48,7 +48,7 @@ defmodule RunosaariWeb.PerformanceController do case Schedule.update_performance(performance, performance_params) do {:ok, performance} -> conn - |> put_flash(:info, "Performance updated successfully.") + |> put_flash(:info, "Näytös päivitetty.") |> redirect(to: Routes.performance_path(conn, :show, performance)) {:error, %Ecto.Changeset{} = changeset} -> @@ -61,7 +61,7 @@ defmodule RunosaariWeb.PerformanceController do {:ok, _performance} = Schedule.delete_performance(performance) conn - |> put_flash(:info, "Performance deleted successfully.") + |> put_flash(:info, "Näytös poistettu.") |> redirect(to: Routes.admin_performance_path(conn, :admin)) end end diff --git a/lib/runosaari_web/controllers/performer_controller.ex b/lib/runosaari_web/controllers/performer_controller.ex index 3254505..d57a5bd 100644 --- a/lib/runosaari_web/controllers/performer_controller.ex +++ b/lib/runosaari_web/controllers/performer_controller.ex @@ -23,8 +23,11 @@ defmodule RunosaariWeb.PerformerController do case Registration.create_performer(performer_params) do {:ok, performer} -> conn - |> put_flash(:info, "Performer created successfully.") - |> redirect(to: Routes.performer_path(conn, :show, performer)) + |> put_flash( + :info, + "Kiitokset ilmoittautumisestasi! Osallistumisesi tulee julkiseksi kun tapahtuman järjestäjät vahvistavat sen." + ) + |> redirect(to: Routes.performer_path(conn, :index)) {:error, %Ecto.Changeset{} = changeset} -> render(conn, "new.html", changeset: changeset) @@ -48,7 +51,7 @@ defmodule RunosaariWeb.PerformerController do case Registration.update_performer(performer, performer_params) do {:ok, performer} -> conn - |> put_flash(:info, "Performer updated successfully.") + |> put_flash(:info, "Esiintyjän tiedot päivitetty.") |> redirect(to: Routes.performer_path(conn, :show, performer)) {:error, %Ecto.Changeset{} = changeset} -> @@ -61,7 +64,7 @@ defmodule RunosaariWeb.PerformerController do {:ok, _performer} = Registration.delete_performer(performer) conn - |> put_flash(:info, "Performer deleted successfully.") + |> put_flash(:info, "Esiintyjä poistettu.") |> redirect(to: Routes.admin_performer_path(conn, :admin)) end end diff --git a/lib/runosaari_web/templates/performance/admin.html.eex b/lib/runosaari_web/templates/performance/admin.html.eex index cd40284..993c4d0 100644 --- a/lib/runosaari_web/templates/performance/admin.html.eex +++ b/lib/runosaari_web/templates/performance/admin.html.eex @@ -1,4 +1,4 @@ -
| <%= performance.name %> | <%= performance.desc %> | - <%= link "Show", to: Routes.performance_path(@conn, :show, performance) %> - <%= link "Edit", to: Routes.admin_performance_path(@conn, :edit, performance) %> - <%= link "Delete", to: Routes.admin_performance_path(@conn, :delete, performance), method: :delete, data: [confirm: "Are you sure?"] %> + <%= link "Lisätietoja", to: Routes.performance_path(@conn, :show, performance) %> + <%= link "Muokkaa", to: Routes.admin_performance_path(@conn, :edit, performance) %> + <%= link "Poista", to: Routes.admin_performance_path(@conn, :delete, performance), method: :delete, data: [confirm: "Haluatko poistaa näytöksen #{performance.name}?"] %> |
Oops, something went wrong! Please check the errors below.
+Jokin kentistä on tyhjä.
| Time | -Description | - -+ | Nimi | +Seloste |
|---|
| <%= performer.desc %> | - <%= link "Näytä", to: Routes.performer_path(@conn, :show, performer) %> + <%= link "Lisätietoja", to: Routes.performer_path(@conn, :show, performer) %> <%= link "Muokkaa", to: Routes.admin_performer_path(@conn, :edit, performer) %> - <%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Are you sure?"] %> + <%= link "Poista", to: Routes.admin_performer_path(@conn, :delete, performer), method: :delete, data: [confirm: "Haluatko poistaa esiintyjän #{performer.fname} #{performer.lname}?"] %> | <% end %> diff --git a/lib/runosaari_web/templates/performer/edit.html.eex b/lib/runosaari_web/templates/performer/edit.html.eex index 45bc1b6..96b405a 100644 --- a/lib/runosaari_web/templates/performer/edit.html.eex +++ b/lib/runosaari_web/templates/performer/edit.html.eex @@ -2,4 +2,4 @@ <%= render "form.html", Map.put(assigns, :action, Routes.admin_performer_path(@conn, :update, @performer)) %> -<%= link "Back", to: Routes.performer_path(@conn, :index) %> +<%= link "Takaisin", to: Routes.performer_path(@conn, :index) %> diff --git a/lib/runosaari_web/templates/performer/form.html.eex b/lib/runosaari_web/templates/performer/form.html.eex index 949c2b9..5a566f4 100644 --- a/lib/runosaari_web/templates/performer/form.html.eex +++ b/lib/runosaari_web/templates/performer/form.html.eex @@ -1,15 +1,15 @@ <%= form_for @changeset, @action, fn form -> %> <%= if @changeset.action do %>