about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-19 00:10:47 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-19 00:10:47 +0100
commitc7a1b78536d946597f4711191beacc7b53f4eddc (patch)
treea62ad249b310a458363b73d27847495f38c20c30 /app
parentac2403fb248ebb9be67b6fa3a1af6def9b12638c (diff)
Activating Spanish i18n
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx3
-rw-r--r--app/assets/javascripts/components/locales/es.jsx4
-rw-r--r--app/assets/javascripts/components/locales/index.jsx4
3 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index e61107cd1..b2c978ee8 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -35,6 +35,7 @@ import HashtagTimeline from '../features/hashtag_timeline';
 import { IntlProvider, addLocaleData } from 'react-intl';
 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 getMessagesForLocale from '../locales';
 
 const store = configureStore();
@@ -43,7 +44,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
   basename: '/web'
 });
 
-addLocaleData([...en, ...de]);
+addLocaleData([...en, ...de, ...es]);
 
 const Mastodon = React.createClass({
 
diff --git a/app/assets/javascripts/components/locales/es.jsx b/app/assets/javascripts/components/locales/es.jsx
index 545c4a0ae..c58c4bdc8 100644
--- a/app/assets/javascripts/components/locales/es.jsx
+++ b/app/assets/javascripts/components/locales/es.jsx
@@ -26,7 +26,7 @@ const es = {
   "getting_started.about_developer": "Puedes seguir al desarrollador de este proyecto en Gargron@mastodon.social",
   "column.home": "Inicio",
   "column.mentions": "Menciones",
-  "column.public": "Público",
+  "column.public": "Historia pública",
   "tabs_bar.compose": "Redactar",
   "tabs_bar.home": "Inicio",
   "tabs_bar.mentions": "Menciones",
@@ -34,7 +34,7 @@ const es = {
   "compose_form.placeholder": "¿En qué estás pensando?",
   "compose_form.publish": "Publicar",
   "navigation_bar.settings": "Ajustes",
-  "navigation_bar.public_timeline": "Línea de tiempo pública",
+  "navigation_bar.public_timeline": "Público",
   "navigation_bar.logout": "Cerrar sesión",
   "reply_indicator.cancel": "Cancelar",
   "search.placeholder": "Buscar",
diff --git a/app/assets/javascripts/components/locales/index.jsx b/app/assets/javascripts/components/locales/index.jsx
index 212cbcee5..7fb43dd33 100644
--- a/app/assets/javascripts/components/locales/index.jsx
+++ b/app/assets/javascripts/components/locales/index.jsx
@@ -1,9 +1,11 @@
 import en from './en';
 import de from './de';
+import es from './es';
 
 const locales = {
   en,
-  de
+  de,
+  es
 };
 
 export default function getMessagesForLocale (locale) {