From: André Lewin <andre.charles.lewin@gmail.com>
Date: Wed, 5 Apr 2017 18:28:58 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=bf7cefa516075b480fd5da5ea4b1385d7d17bdd5;p=mastodon.git

Merge branch 'master' into master
---

bf7cefa516075b480fd5da5ea4b1385d7d17bdd5
diff --cc app/assets/javascripts/components/containers/mastodon.jsx
index 2861c64e4,cbb7b85bc..00f20074d
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@@ -46,7 -46,7 +46,8 @@@ import fr from 'react-intl/locale-data/
  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 fi from 'react-intl/locale-data/fi';
 +import eo from 'react-intl/locale-data/eo';
  import getMessagesForLocale from '../locales';
  import { hydrateStore } from '../actions/store';
  import createStream from '../stream';
@@@ -59,7 -59,7 +60,7 @@@ const browserHistory = useRouterHistory
    basename: '/web'
  });
  
- addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...eo]);
 -addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi]);
++addLocaleData([...en, ...de, ...es, ...fr, ...pt, ...hu, ...uk, ...fi, ...eo]);
  
  const Mastodon = React.createClass({
  
diff --cc app/assets/javascripts/components/locales/index.jsx
index 255172f1e,72b8a5df5..1e7b8b548
--- a/app/assets/javascripts/components/locales/index.jsx
+++ b/app/assets/javascripts/components/locales/index.jsx
@@@ -5,7 -5,7 +5,8 @@@ import hu from './hu'
  import fr from './fr';
  import pt from './pt';
  import uk from './uk';
+ import fi from './fi';
 +import eo from './eo';
  
  const locales = {
    en,
@@@ -15,7 -15,7 +16,8 @@@
    fr,
    pt,
    uk,
 -  fi
++  fi,
 +  eo
  };
  
  export default function getMessagesForLocale (locale) {
diff --cc app/helpers/settings_helper.rb
index f92abb9bc,e01f7d0cc..74dc0e11d
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@@ -10,7 -10,7 +10,8 @@@ module SettingsHelpe
      hu: 'Magyar',
      uk: 'Українська',
      'zh-CN': '简体中文',
+     fi: 'Suomi',
 +    eo: 'Esperanto',
    }.freeze
  
    def human_locale(locale)
diff --cc config/application.rb
index 77cd254af,17b7a19cc..9a5c0d0d3
--- a/config/application.rb
+++ b/config/application.rb
@@@ -24,7 -24,7 +24,7 @@@ module Mastodo
  
      # 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, :uk, 'zh-CN', :eo]
 -    config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi]
++    config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu, :uk, 'zh-CN', :fi, :eo]
      config.i18n.default_locale    = :en
  
      # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')