From 569260a4b9c638ee6c66f25b2b1d7b57cae5c280 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 10 Oct 2017 16:47:33 +0100
Subject: [PATCH] Fix configuration and alphabetize languages

---
 client/coral-framework/services/i18n.js | 15 ++++++++-------
 services/i18n.js                        |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index b939f9263..7f2123b7f 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -3,20 +3,21 @@ import has from 'lodash/has';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 
-import esTA from 'timeago.js/locales/ta'
-import frTA from 'timeago.js/locales/ta';
-import pt_BRTA from 'timeago.js/locales/ta';
-import da_DKTA from 'timeago.js/locales/ta';
+import daTA from 'timeago.js/locales/da';
+import esTA from 'timeago.js/locales/es'
+import frTA from 'timeago.js/locales/fr`';
+import pt_BRTA from 'timeago.js/locales/pt_BR';
+
 import en from '../../../locales/en.yml';
+import da from '../../../locales/da.yml';
 import es from '../../../locales/es.yml';
 import fr from '../../../locales/fr.yml';
 import pt_BR from '../../../locales/pt_BR.yml';
-import da_DK from '../../../locales/da_DK.yml';
 
 // Translations are happening at https://translate.lingohub.com/the-coral-project/dashboard
 
 const defaultLanguage = process.env.TALK_DEFAULT_LANG;
-const translations = {...en, ...es, ...fr, ...pt_BR, ...da_DK};
+const translations = {...en, ...da, ...es, ...fr, ...pt_BR};
 
 let lang;
 let timeagoInstance;
@@ -46,9 +47,9 @@ function init() {
   }
 
   ta.register('es', esTA);
+  ta.register('da', da);
   ta.register('fr', frTA);
   ta.register('pt_BR', pt_BRTA);
-  ta.register('da_DK', da_DK);
   timeagoInstance = ta();
 }
 
diff --git a/services/i18n.js b/services/i18n.js
index a1e191d94..fd715c6c2 100644
--- a/services/i18n.js
+++ b/services/i18n.js
@@ -3,18 +3,18 @@ const get = require('lodash/get');
 
 const yaml = require('yamljs');
 
+const da = yaml.load('./locales/da.yml');
 const es = yaml.load('./locales/es.yml');
 const en = yaml.load('./locales/en.yml');
 const fr = yaml.load('./locales/fr.yml');
 const pt_BR = yaml.load('./locales/pt_BR.yml');
-const da_DK = yaml.load('./locales/da_DK.yml');
 
 const accepts = require('accepts');
 
 // default language
 let defaultLanguage = 'en';
 let language = defaultLanguage;
-const languages = ['en', 'es', 'fr', 'pt_BR', 'da_DK'];
+const languages = ['en', 'da', 'es', 'fr', 'pt_BR'];
 
 const translations = Object.assign(en, es, fr, pt_BR, da_DK);