mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-05-18 09:42:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tusooa/more-translatable' into 'develop'

Browse source 
Draft: More translatable strings

See merge request pleroma/pleroma!3819
This commit is contained in:
tusooa 2024-04-19 10:26:01 +00:00
parent 50af909c01 d78476700d
commit 3b60816f85
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -117,22 +117,31 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
else
{:login, {:account_status, :confirmation_pending}} ->
json_response(conn, :ok, %{
message: "You have been registered. Please check your email for further instructions.",
message:
pgettext(
"register missing_confirmed_email",
"You have been registered. Please check your email for further instructions."
),
identifier: "missing_confirmed_email"
})
{:login, {:account_status, :approval_pending}} ->
json_response(conn, :ok, %{
message:
"You have been registered. You'll be able to log in once your account is approved.",
pgettext(
"register awaiting_approval",
"You have been registered. You'll be able to log in once your account is approved."
),
identifier: "awaiting_approval"
})
{:login, _} ->
json_response(conn, :ok, %{
message:
"You have been registered. Some post-registration steps may be pending. " <>
"Please log in manually.",
pgettext(
"register manual_login_required",
"You have been registered. Some post-registration steps may be pending. Please log in manually."
),
identifier: "manual_login_required"
})
@ -433,8 +442,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
end
@doc "POST /api/v1/accounts/:id/follow"
def follow(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _params) do
{:error, "Can not follow yourself"}
def follow(%{assigns: %{user: %{id: id}, account: %{id: id}}} = conn, _params) do
render_error(conn, :bad_request, "Can not follow yourself")
end
def follow(
@ -452,8 +461,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
end
@doc "POST /api/v1/accounts/:id/unfollow"
def unfollow(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _params) do
{:error, "Can not unfollow yourself"}
def unfollow(%{assigns: %{user: %{id: id}, account: %{id: id}}} = conn, _params) do
render_error(conn, :bad_request, "Can not unfollow yourself")
end
def unfollow(%{assigns: %{user: follower, account: followed}} = conn, _params) do
@ -540,8 +549,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
end
@doc "POST /api/v1/accounts/:id/remove_from_followers"
def remove_from_followers(%{assigns: %{user: %{id: id}, account: %{id: id}}}, _params) do
{:error, "Can not unfollow yourself"}
def remove_from_followers(%{assigns: %{user: %{id: id}, account: %{id: id}}} = conn, _params) do
render_error(conn, :bad_request, "Can not unfollow yourself")
end
def remove_from_followers(%{assigns: %{user: followed, account: follower}} = conn, _params) do