Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
5a821efa
Commit
5a821efa
authored
Sep 18, 2013
by
Jonne Haß
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hardcode default(=fallback) language
parent
5598cd80
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
config/initializers/locale.rb
config/initializers/locale.rb
+2
-2
config/locale_settings.yml
config/locale_settings.yml
+0
-4
No files found.
config/initializers/locale.rb
View file @
5a821efa
...
...
@@ -10,17 +10,17 @@ if settings_file.exist?
locale_settings
=
YAML
.
load_file
(
settings_file
)
AVAILABLE_LANGUAGES
=
(
locale_settings
[
'available'
].
length
>
0
)
?
locale_settings
[
'available'
]
:
{
"en"
=>
'English'
}
AVAILABLE_LANGUAGE_CODES
=
locale_settings
[
'available'
].
keys
DEFAULT_LANGUAGE
=
(
AVAILABLE_LANGUAGE_CODES
.
include?
(
locale_settings
[
'default'
].
to_s
))
?
locale_settings
[
'default'
].
to_s
:
"en"
LANGUAGE_CODES_MAP
=
locale_settings
[
'fallbacks'
]
RTL_LANGUAGES
=
locale_settings
[
'rtl'
]
else
AVAILABLE_LANGUAGES
=
{
"en"
=>
'English'
}
DEFAULT_LANGUAGE
=
"en"
AVAILABLE_LANGUAGE_CODES
=
[
"en"
]
LANGUAGE_CODES_MAP
=
{}
RTL_LANGUAGES
=
[]
end
DEFAULT_LANGUAGE
=
"en"
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# Use the railtie configuration option to ensure overiding devise.
...
...
config/locale_settings.yml
View file @
5a821efa
default
:
"
en"
available
:
ar
:
"
العربية"
art-nvi
:
"
Na'vi"
...
...
@@ -116,7 +113,6 @@ fallbacks:
pt-PT
:
-
"
pt"
rtl
:
-
"
ar"
-
"
he"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment