Make password reset pages translatable

diff --git a/lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex b/lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex
index ee84750c7da9e5b04e6a6c1daf926a58c11bdfa4..5ac0aa4e0eb045d90595abeabaf7ed1583da3051 100644 (file)
--- a/lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex
@@ -1 +1 @@
-<h2>Invalid Token</h2>
+<h2><%= Gettext.dpgettext("static_pages", "password reset invalid token message", "Invalid Token") %></h2>

diff --git a/lib/pleroma/web/templates/twitter_api/password/reset.html.eex b/lib/pleroma/web/templates/twitter_api/password/reset.html.eex
index fbcacdc14819867f7fc8599b0920f49e9c6eddc8..6a544af51435888c46c8c89c4cc6cc6896cc0117 100644 (file)
--- a/lib/pleroma/web/templates/twitter_api/password/reset.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/password/reset.html.eex
@@ -1,13 +1,13 @@
 <h2>Password Reset for <%= @user.nickname %></h2>
 <%= form_for @conn, Routes.reset_password_path(@conn, :do_reset), [as: "data"], fn f -> %>
   <div class="form-row">
-    <%= label f, :password, "Password" %>
+    <%= label f, :password, Gettext.dpgettext("static_pages", "password reset form password prompt", "Password") %>
     <%= password_input f, :password %>
   </div>
   <div class="form-row">
-    <%= label f, :password_confirmation, "Confirmation" %>
+    <%= label f, :password_confirmation, Gettext.dpgettext("static_pages", "password reset form confirm password prompt", "Confirmation") %>
     <%= password_input f, :password_confirmation %>
   </div>
   <%= hidden_input f, :token, value: @token.token %>
-  <%= submit "Reset" %>
+  <%= submit Gettext.dpgettext("static_pages", "password reset button", "Reset") %>
 <% end %>

diff --git a/lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex b/lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex
index 4ed4ac8bce314effb5bc9c09f79ea790faa3ac07..774e3462aa4e82301145ed76204c428c92382f07 100644 (file)
--- a/lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex
@@ -1,2 +1,6 @@
-<h2>Password reset failed</h2>
-<h3><a href="<%= Pleroma.Web.Endpoint.url() %>">Homepage</a></h3>
+<h2><%= Gettext.dpgettext("static_pages", "password reset failed message", "Password reset failed") %></h2>
+<h3>
+  <a href="<%= Pleroma.Web.Endpoint.url() %>">
+    <%= Gettext.dpgettext("static_pages", "password reset failed homepage link", "Homepage") %>
+  </a>
+</h3>

diff --git a/lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex b/lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex
index 086d4e08b6ad0394f40ee9a59c942b8634377c15..40f6bb3fcb3544117e2a29a2396a0e0696043e90 100644 (file)
--- a/lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex
@@ -1,2 +1,2 @@
-<h2>Password changed!</h2>
-<h3><a href="<%= Pleroma.Web.Endpoint.url() %>">Homepage</a></h3>
+<h2><%= Gettext.dpgettext("static_pages", "password reset successful message", "Password changed!") %></h2>
+<h3><a href="<%= Pleroma.Web.Endpoint.url() %>"><%= Gettext.dpgettext("static_pages", "password reset successful homepage link", "Homepage") %></a></h3>

diff --git a/lib/pleroma/web/twitter_api/views/password_view.ex b/lib/pleroma/web/twitter_api/views/password_view.ex
index a9bb95a2cc7ef0833bd79ac4dd03450efe2e5603..40e7fca49e35cce29a439bbc7f55e8ff467be50f 100644 (file)
--- a/lib/pleroma/web/twitter_api/views/password_view.ex
+++ b/lib/pleroma/web/twitter_api/views/password_view.ex
@@ -5,4 +5,5 @@
 defmodule Pleroma.Web.TwitterAPI.PasswordView do
   use Pleroma.Web, :view
   import Phoenix.HTML.Form
+  alias Pleroma.Web.Gettext
 end

diff --git a/priv/gettext/static_pages.pot b/priv/gettext/static_pages.pot
index 72e5c00d9806e21846e46989efd01f29e959c37f..8b56ad7b4255130d47e41bf9b8916c7b1a663b50 100644 (file)
--- a/priv/gettext/static_pages.pot
+++ b/priv/gettext/static_pages.pot
@@ -105,3 +105,51 @@ msgstr ""
 msgctxt "remote follow header"
 msgid "Remotely follow %{nickname}"
 msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:12
+msgctxt "password reset button"
+msgid "Reset"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:4
+msgctxt "password reset failed homepage link"
+msgid "Homepage"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_failed.html.eex:1
+msgctxt "password reset failed message"
+msgid "Password reset failed"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:8
+msgctxt "password reset form confirm password prompt"
+msgid "Confirmation"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset.html.eex:4
+msgctxt "password reset form password prompt"
+msgid "Password"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/invalid_token.html.eex:1
+msgctxt "password reset invalid token message"
+msgid "Invalid Token"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:2
+msgctxt "password reset successful homepage link"
+msgid "Homepage"
+msgstr ""
+
+#, elixir-format
+#: lib/pleroma/web/templates/twitter_api/password/reset_success.html.eex:1
+msgctxt "password reset successful message"
+msgid "Password changed!"
+msgstr ""