diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-16 17:51:02 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-16 17:56:31 +0100 |
| commit | 2c766bd4b4c6dcf8e7c9a6dd9421edca0de57aba (patch) | |
| tree | d84f472de5ff84502928fec8582be492c45a6faf /config | |
| parent | 01e43c3e5799b575a70798056945365ddf51f3ad (diff) | |
Add user locale setting
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 6525571cc..e992c2481 100644 --- a/config/application.rb +++ b/config/application.rb @@ -20,7 +20,8 @@ module Mastodon # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de + config.i18n.available_locales = [:en] + config.i18n.default_locale = :en # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') # config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index ef69f7569..bd22a1f3d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -12,6 +12,7 @@ en: display_name: Display name email: E-mail address header: Header + locale: Language new_password: New password note: Bio password: Password |