about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx3
-rw-r--r--app/helpers/settings_helper.rb2
-rw-r--r--config/application.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index c9f037ec2..af4dabdfc 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -39,6 +39,7 @@ import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
 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 getMessagesForLocale from '../locales';
 
 const store = configureStore();
@@ -47,7 +48,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
   basename: '/web'
 });
 
-addLocaleData([...en, ...de, ...es, ...fr]);
+addLocaleData([...en, ...de, ...es, ...fr, ...pt]);
 
 const Mastodon = React.createClass({
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 75ee2f8d9..26c4cd58f 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -5,7 +5,9 @@ module SettingsHelper
     en: 'English',
     de: 'Deutsch',
     es: 'Español',
+    pt: 'Português',
     fr: 'Français',
+    hu: 'Magyar',
   }.freeze
 
   def human_locale(locale)
diff --git a/config/application.rb b/config/application.rb
index 2fedf462f..1e5fd9c7c 100644
--- 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, :hu, :fr]
+    config.i18n.available_locales = [:en, :de, :es, :pt, :fr, :hu]
     config.i18n.default_locale    = :en
 
     # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')