luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Do not fetch environment variables to determine default locale (#6618)

Browse source 
The default locale is now set by config.
This commit is contained in:
Akihiko Odaki 2018-03-04 18:00:46 +09:00 committed by Eugen Rochko
parent b66ec3bf95
commit 778b37790b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/rest/instance_serializer.rb
View file

@ -48,7 +48,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
end
def languages
[ENV.fetch('DEFAULT_LOCALE', I18n.default_locale)]
[I18n.default_locale]
end
private

6
lib/tasks/assets.rake
View file

@ -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