astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #346 from stamak/declaring_uk 

Declare Ukrainian
pull/356/head
Eugen 2016-12-08 18:01:32 +01:00 committed by GitHub
parent 1759cf8336 d2ab41aea4
commit a5797139b2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/containers/mastodon.jsx
View File

@ -41,6 +41,7 @@ import es from 'react-intl/locale-data/es';
import fr from 'react-intl/locale-data/fr'; import fr from 'react-intl/locale-data/fr';
import pt from 'react-intl/locale-data/pt'; import pt from 'react-intl/locale-data/pt';
import hu from 'react-intl/locale-data/hu'; import hu from 'react-intl/locale-data/hu';
import uk from 'react-intl/locale-data/uk';
import getMessagesForLocale from '../locales'; import getMessagesForLocale from '../locales';
const store = configureStore(); const store = configureStore();
@ -49,7 +50,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
basename: '/web' basename: '/web'
}); });
addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu]); addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk]);
const Mastodon = React.createClass({ const Mastodon = React.createClass({

1
app/helpers/settings_helper.rb
View File

@ -8,6 +8,7 @@ module SettingsHelper
pt: 'Português', pt: 'Português',
fr: 'Français', fr: 'Français',
hu: 'Magyar', hu: 'Magyar',
uk: 'Українська',
}.freeze }.freeze
def human_locale(locale) def human_locale(locale)

2
config/application.rb
View File

@ -20,7 +20,7 @@ module Mastodon
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # 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.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.i18n.default_locale = :en
# config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')