diff options
author | kaniini <nenolod@gmail.com> | 2019-07-10 13:27:59 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-07-10 13:27:59 +0000 |
commit | f295b9fba9c8e54bd5a92447d55d0c60c0a0cc0c (patch) | |
tree | 0aaf9f3b762f624faee78d409f805feb535780fb /lib/pleroma/web/common_api/utils.ex | |
parent | 42422f3ff2d3a918f04e2d73b8d2f6867a51b5a7 (diff) | |
parent | ed8ce21a224b7b8d7753f2c4f66bfdfd3d9a0e68 (diff) | |
download | pleroma-f295b9fba9c8e54bd5a92447d55d0c60c0a0cc0c.tar.gz |
Merge branch 'localization' into 'develop'
Error Localization
See merge request pleroma/pleroma!1396
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 8b9477927..8e482eef7 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -3,6 +3,8 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.CommonAPI.Utils do + import Pleroma.Web.Gettext + alias Calendar.Strftime alias Comeonin.Pbkdf2 alias Pleroma.Activity @@ -372,7 +374,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do true <- Pbkdf2.checkpw(password, db_user.password_hash) do {:ok, db_user} else - _ -> {:error, "Invalid password."} + _ -> {:error, dgettext("errors", "Invalid password.")} end end @@ -455,7 +457,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do if String.length(comment) <= max_size do {:ok, format_input(comment, "text/plain")} else - {:error, "Comment must be up to #{max_size} characters"} + {:error, + dgettext("errors", "Comment must be up to %{max_size} characters", max_size: max_size)} end end @@ -490,7 +493,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do context else _e -> - {:error, "No such conversation"} + {:error, dgettext("errors", "No such conversation")} end end @@ -512,10 +515,10 @@ defmodule Pleroma.Web.CommonAPI.Utils do if length > 0 or Enum.count(attachments) > 0 do :ok else - {:error, "Cannot post an empty status without attachments"} + {:error, dgettext("errors", "Cannot post an empty status without attachments")} end else - {:error, "The status is over the character limit"} + {:error, dgettext("errors", "The status is over the character limit")} end end end |