alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

The default locale is now set by config.
signup-info-prompt
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 end
def languages def languages
[ENV.fetch('DEFAULT_LOCALE', I18n.default_locale)] [I18n.default_locale]
end end
private private

2
lib/tasks/assets.rake
View File

@ -1,11 +1,9 @@
# frozen_string_literal: true # frozen_string_literal: true
def render_static_page(action, dest:, **opts) def render_static_page(action, dest:, **opts)
I18n.with_locale(ENV['DEFAULT_LOCALE'] || I18n.default_locale) do
html = ApplicationController.render(action, opts) html = ApplicationController.render(action, opts)
File.write(dest, html) File.write(dest, html)
end end
end
namespace :assets do namespace :assets do
desc 'Generate static pages' desc 'Generate static pages'