mastofe

commit: a5797139b2db47415220abb82335bef797dd9ecc
parent: 1759cf83366a3081cbb9e1d677629a106ab124d8
Author: Eugen <eugen@zeonfederated.com>
Date:   Thu,  8 Dec 2016 18:01:32 +0100

Merge pull request #346 from stamak/declaring_uk

Declare Ukrainian
Diffstat:
M
app/assets/javascripts/components/containers/mastodon.jsx
3
++-
M
app/helpers/settings_helper.rb
1
+
M
config/application.rb
2
+-

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -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({
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
@@ -8,6 +8,7 @@ module SettingsHelper
     pt: 'Português',
     fr: 'Français',
     hu: 'Magyar',
+    uk: 'Українська',
   }.freeze
 
   def human_locale(locale)
diff --git a/config/application.rb b/config/application.rb
@@ -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')