Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
61dcb686
Commit
61dcb686
authored
7 years ago
by
Akihiko Odaki
Committed by
Eugen Rochko
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix i18n fallback configuration conflicts with environment configurations (#6843)
parent
9381a7d9
No related branches found
Branches containing commit
Tags
v2.3.2rc5
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
config/application.rb
+1
-3
1 addition, 3 deletions
config/application.rb
config/environments/production.rb
+2
-2
2 additions, 2 deletions
config/environments/production.rb
with
3 additions
and
5 deletions
config/application.rb
+
1
−
3
View file @
61dcb686
...
...
@@ -76,9 +76,7 @@ module Mastodon
]
config
.
i18n
.
default_locale
=
ENV
[
'DEFAULT_LOCALE'
]
&
.
to_sym
if
config
.
i18n
.
available_locales
.
include?
(
config
.
i18n
.
default_locale
)
config
.
i18n
.
fallbacks
=
[
:en
]
else
unless
config
.
i18n
.
available_locales
.
include?
(
config
.
i18n
.
default_locale
)
config
.
i18n
.
default_locale
=
:en
end
...
...
This diff is collapsed.
Click to expand it.
config/environments/production.rb
+
2
−
2
View file @
61dcb686
...
...
@@ -55,8 +55,8 @@ Rails.application.configure do
# config.action_mailer.raise_delivery_errors = false
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
#
the I18n.default_locale
when a translation cannot be found).
config
.
i18n
.
fallbacks
=
true
#
English
when a translation cannot be found).
config
.
i18n
.
fallbacks
=
[
:en
]
# Send deprecation notices to registered listeners.
config
.
active_support
.
deprecation
=
:notify
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment