about summary refs log tree commit diff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2016-11-24 20:31:35 +0100
committerGitHub <noreply@github.com>2016-11-24 20:31:35 +0100
commitc0a223b4803879925a2a681e25704609eb5a70fd (patch)
tree8c661ea7ceaff780965631c530ca065805c1861d /app/assets/javascripts
parent8e34bed7cce7b97388e55fabacee7d424b5846ea (diff)
parent60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf (diff)
Merge pull request #265 from nclm/french-translation
Forgot to add one `fr` to make the French locale (hopefully) work
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/components/locales/index.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/locales/index.jsx b/app/assets/javascripts/components/locales/index.jsx
index 7fb43dd33..6589c4719 100644
--- a/app/assets/javascripts/components/locales/index.jsx
+++ b/app/assets/javascripts/components/locales/index.jsx
@@ -1,11 +1,13 @@
 import en from './en';
 import de from './de';
 import es from './es';
+import fr from './fr';
 
 const locales = {
   en,
   de,
-  es
+  es,
+  fr
 };
 
 export default function getMessagesForLocale (locale) {