Merge search behaviour change, and refactor elasticsearch #28
4 changed files with 13 additions and 4 deletions
|
@ -25,4 +25,13 @@ defmodule Pleroma.Web.Gettext do
|
|||
See the [Gettext Docs](https://hexdocs.pm/gettext) for detailed usage.
|
||||
"""
|
||||
use Gettext, otp_app: :pleroma
|
||||
|
||||
def language_tag do
|
||||
# Naive implementation: HTML lang attribute uses BCP 47, which
|
||||
# uses - as a separator.
|
||||
# https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang
|
||||
|
||||
Gettext.get_locale()
|
||||
|> String.replace("_", "-", global: true)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"
|
||||
<feed xml:lang="<%= Gettext.language_tag() %>" xmlns="http://www.w3.org/2005/Atom"
|
||||
xmlns:thr="http://purl.org/syndication/thread/1.0"
|
||||
xmlns:georss="http://www.georss.org/georss"
|
||||
xmlns:activity="http://activitystrea.ms/spec/1.0/"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="<%= Pleroma.Web.Gettext.language_tag() %>">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="<%= Pleroma.Web.Gettext.language_tag() %>">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title><%= @email.subject %></title>
|
||||
|
@ -7,4 +7,4 @@
|
|||
<body>
|
||||
<%= render @view_module, @view_template, assigns %>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
Loading…
Reference in a new issue