pleroma

commit: 4ec9eeb3f8f3502841cd136ea7afe9298b477120
parent ec0e912c52f9c44ef78dbb8971d39ab4ef53bf30
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Fri, 25 Mar 2022 22:05:28 -0400

Make remote interaction page translatable

Diffstat:
M
lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex
8
++++----
M
lib/pleroma/web/twitter_api/controllers/util_controller.ex
28
++++++++++++++++++++++++----
M
lib/pleroma/web/twitter_api/views/util_view.ex
1
+

3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex b/lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex
@@ -1,10 +1,10 @@
 <%= if @error do %>
-  <h2>Error: <%= @error %></h2>
+  <h2><%= Gettext.dpgettext("static_pages", "status interact error", "Error: %{error}", error: @error) %></h2>
 <% else %>
-  <h2>Interacting with <%= @nickname %>'s <%= link("status", to: @status_link) %></h2>
+  <h2><%= raw Gettext.dpgettext("static_pages", "status interact header", "Interacting with %{nickname}'s %{status_link}", nickname: safe_to_string(html_escape(@nickname)), status_link: safe_to_string(link(Gettext.dpgettext("static_pages", "status interact header - status link text", "status"), to: @status_link))) %></h2>
   <%= form_for @conn, Routes.util_path(@conn, :remote_subscribe), [as: "status"], fn f -> %>
   <%= hidden_input f, :status_id, value: @status_id %>
-  <%= text_input f, :profile, placeholder: "Your account ID, e.g. lain@quitter.se" %>
-  <%= submit "Interact" %>
+  <%= text_input f, :profile, placeholder: Gettext.dpgettext("static_pages", "placeholder text for account id", "Your account ID, e.g. lain@quitter.se") %>
+  <%= submit Gettext.dpgettext("static_pages", "status interact authorization button", "Interact") %>
   <% end %>
 <% end %>
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -63,7 +63,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         render(conn, "subscribe.html", %{
           nickname: nick,
           avatar: nil,
-          error: "Could not find user"
+          error:
+            Pleroma.Web.Gettext.dpgettext(
+              "static_pages",
+              "remote follow error message - user not found",
+              "Could not find user"
+            )
         })
     end
   end
@@ -86,7 +91,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         render(conn, "status_interact.html", %{
           status_id: id,
           avatar: nil,
-          error: "Could not find status"
+          error:
+            Pleroma.Web.Gettext.dpgettext(
+              "static_pages",
+              "status interact error message - status not found",
+              "Could not find status"
+            )
         })
     end
   end
@@ -109,7 +119,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         render(conn, "subscribe.html", %{
           nickname: nick,
           avatar: nil,
-          error: "Something went wrong."
+          error:
+            Pleroma.Web.Gettext.dpgettext(
+              "static_pages",
+              "remote follow error message - unknown error",
+              "Something went wrong."
+            )
         })
     end
   end
@@ -125,7 +140,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         render(conn, "status_interact.html", %{
           status_id: id,
           avatar: nil,
-          error: "Something went wrong."
+          error:
+            Pleroma.Web.Gettext.dpgettext(
+              "static_pages",
+              "status interact error message - unknown error",
+              "Something went wrong."
+            )
         })
     end
   end
diff --git a/lib/pleroma/web/twitter_api/views/util_view.ex b/lib/pleroma/web/twitter_api/views/util_view.ex
@@ -4,6 +4,7 @@
 
 defmodule Pleroma.Web.TwitterAPI.UtilView do
   use Pleroma.Web, :view
+  import Phoenix.HTML
   import Phoenix.HTML.Form
   import Phoenix.HTML.Link
   alias Pleroma.Config