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

The default locale is now set by config.
This commit is contained in:
Akihiko Odaki authored and Eugen Rochko committed 2018-03-04 10:00:46 +01:00
1 parent b66ec3bf95
commit 778b37790b
2 files changed
+3 -5

No files matched your search

+1 -1
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
+2 -4
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