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
a5797139
Commit
a5797139
authored
8 years ago
by
Eugen
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #346 from stamak/declaring_uk
Declare Ukrainian
parents
1759cf83
d2ab41ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/assets/javascripts/components/containers/mastodon.jsx
+2
-1
2 additions, 1 deletion
app/assets/javascripts/components/containers/mastodon.jsx
app/helpers/settings_helper.rb
+1
-0
1 addition, 0 deletions
app/helpers/settings_helper.rb
config/application.rb
+1
-1
1 addition, 1 deletion
config/application.rb
with
4 additions
and
2 deletions
app/assets/javascripts/components/containers/mastodon.jsx
+
2
−
1
View file @
a5797139
...
...
@@ -41,6 +41,7 @@ import es from 'react-intl/locale-data/es';
import
fr
from
'
react-intl/locale-data/fr
'
;
import
pt
from
'
react-intl/locale-data/pt
'
;
import
hu
from
'
react-intl/locale-data/hu
'
;
import
uk
from
'
react-intl/locale-data/uk
'
;
import
getMessagesForLocale
from
'
../locales
'
;
const
store
=
configureStore
();
...
...
@@ -49,7 +50,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
basename
:
'
/web
'
});
addLocaleData
([...
en
,
...
de
,
...
es
,
...
fr
,
...
pt
,
...
hu
]);
addLocaleData
([...
en
,
...
de
,
...
es
,
...
fr
,
...
pt
,
...
hu
,
...
uk
]);
const
Mastodon
=
React
.
createClass
({
...
...
This diff is collapsed.
Click to expand it.
app/helpers/settings_helper.rb
+
1
−
0
View file @
a5797139
...
...
@@ -8,6 +8,7 @@ module SettingsHelper
pt:
'Português'
,
fr:
'Français'
,
hu:
'Magyar'
,
uk:
'Українська'
,
}.
freeze
def
human_locale
(
locale
)
...
...
This diff is collapsed.
Click to expand it.
config/application.rb
+
1
−
1
View file @
a5797139
...
...
@@ -20,7 +20,7 @@ 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
.
available_locales
=
[
:en
,
:de
,
:es
,
:pt
,
:fr
,
:hu
]
config
.
i18n
.
available_locales
=
[
:en
,
:de
,
:es
,
:pt
,
:fr
,
:hu
,
:uk
]
config
.
i18n
.
default_locale
=
:en
# config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
...
...
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