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

The default locale is now set by config.
master
Akihiko Odaki 6 years ago committed by Eugen Rochko
parent b66ec3bf95
commit 778b37790b
  1. 2
      app/serializers/rest/instance_serializer.rb
  2. 6
      lib/tasks/assets.rake

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

@ -1,10 +1,8 @@
# 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

Loading…
Cancel
Save