Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
Translate backend-rendered pages See merge request pleroma/pleroma!3634
This commit is contained in:
commit
d7c53da77a
58 changed files with 3319 additions and 446 deletions
|
|
@ -6,6 +6,7 @@ defmodule Pleroma.Web.OAuth.MFAView do
|
|||
use Pleroma.Web, :view
|
||||
import Phoenix.HTML.Form
|
||||
alias Pleroma.MFA
|
||||
alias Pleroma.Web.Gettext
|
||||
|
||||
def render("mfa_response.json", %{token: token, user: user}) do
|
||||
%{
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
defmodule Pleroma.Web.OAuth.OAuthView do
|
||||
use Pleroma.Web, :view
|
||||
import Phoenix.HTML.Form
|
||||
import Phoenix.HTML
|
||||
alias Pleroma.Web.Gettext
|
||||
|
||||
alias Pleroma.Web.OAuth.Token.Utils
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue