diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2018-03-04 18:00:46 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-04 10:00:46 +0100 |
| commit | 778b37790b425debd16b73c21f0805ff2e9a4ce8 (patch) | |
| tree | 078ed43acf537545a7a1bb297e124f009956552f | |
| parent | b66ec3bf95fdb0c38d8472a4bd643ed81bc46100 (diff) | |
Do not fetch environment variables to determine default locale (#6618)
The default locale is now set by config.
| -rw-r--r-- | app/serializers/rest/instance_serializer.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/assets.rake | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index e903604b2..e3e64ea87 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -48,7 +48,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer end def languages - [ENV.fetch('DEFAULT_LOCALE', I18n.default_locale)] + [I18n.default_locale] end private diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 0826f0186..b642510a1 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -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 |