forked from cybrespace/mastodon
Do not fetch environment variables to determine default locale (#6618)
The default locale is now set by config.
This commit is contained in:
parent
b66ec3bf95
commit
778b37790b
|
@ -48,7 +48,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
|||
end
|
||||
|
||||
def languages
|
||||
[ENV.fetch('DEFAULT_LOCALE', I18n.default_locale)]
|
||||
[I18n.default_locale]
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
def render_static_page(action, dest:, **opts)
|
||||
I18n.with_locale(ENV['DEFAULT_LOCALE'] || I18n.default_locale) do
|
||||
html = ApplicationController.render(action, opts)
|
||||
File.write(dest, html)
|
||||
end
|
||||
html = ApplicationController.render(action, opts)
|
||||
File.write(dest, html)
|
||||
end
|
||||
|
||||
namespace :assets do
|
||||
|
|
Loading…
Reference in New Issue