From ca2070eada75d187bd65287ecae4fd02266a0be7 Mon Sep 17 00:00:00 2001 From: "D. Luijten" Date: Wed, 18 Apr 2018 14:28:42 +0200 Subject: [PATCH 1/2] Added NL translation for Moment. Also, sorted locale imports alphabetically. --- client/coral-framework/services/i18n.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js index e1c3ab99e..507e7f68e 100644 --- a/client/coral-framework/services/i18n.js +++ b/client/coral-framework/services/i18n.js @@ -9,6 +9,7 @@ import 'moment/locale/da'; import 'moment/locale/de'; import 'moment/locale/es'; import 'moment/locale/fr'; +import 'moment/locale/nl'; import 'moment/locale/pt-br'; import { createStorage } from 'coral-framework/services/storage'; @@ -18,10 +19,10 @@ import daTA from 'timeago.js/locales/da'; import deTA from 'timeago.js/locales/de'; import esTA from 'timeago.js/locales/es'; import frTA from 'timeago.js/locales/fr'; +import nl from 'timeago.js/locales/nl'; import pt_BRTA from 'timeago.js/locales/pt_BR'; import zh_CNTA from 'timeago.js/locales/zh_CN'; import zh_TWTA from 'timeago.js/locales/zh_TW'; -import nl from 'timeago.js/locales/nl'; import ar from '../../../locales/ar.yml'; import en from '../../../locales/en.yml'; @@ -29,10 +30,10 @@ import da from '../../../locales/da.yml'; import de from '../../../locales/de.yml'; import es from '../../../locales/es.yml'; import fr from '../../../locales/fr.yml'; +import nl_NL from '../../../locales/nl_NL.yml'; import pt_BR from '../../../locales/pt_BR.yml'; import zh_CN from '../../../locales/zh_CN.yml'; import zh_TW from '../../../locales/zh_TW.yml'; -import nl_NL from '../../../locales/nl_NL.yml'; const defaultLanguage = process.env.TALK_DEFAULT_LANG; const translations = { From c103a0c481f3b1c40aaf42c60182e6a1233067cf Mon Sep 17 00:00:00 2001 From: "D. Luijten" Date: Mon, 23 Apr 2018 16:46:42 +0200 Subject: [PATCH 2/2] Renamed nl to nlTA. Sorted ta.register calls --- client/coral-framework/services/i18n.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js index 507e7f68e..03a0b4712 100644 --- a/client/coral-framework/services/i18n.js +++ b/client/coral-framework/services/i18n.js @@ -19,7 +19,7 @@ import daTA from 'timeago.js/locales/da'; import deTA from 'timeago.js/locales/de'; import esTA from 'timeago.js/locales/es'; import frTA from 'timeago.js/locales/fr'; -import nl from 'timeago.js/locales/nl'; +import nlTA from 'timeago.js/locales/nl'; import pt_BRTA from 'timeago.js/locales/pt_BR'; import zh_CNTA from 'timeago.js/locales/zh_CN'; import zh_TWTA from 'timeago.js/locales/zh_TW'; @@ -113,10 +113,10 @@ export function setupTranslations() { ta.register('da', daTA); ta.register('de', deTA); ta.register('fr', frTA); + ta.register('nl_NL', nlTA); ta.register('pt_BR', pt_BRTA); ta.register('zh_CN', zh_CNTA); ta.register('zh_TW', zh_TWTA); - ta.register('nl_NL', nl); timeagoInstance = ta(); }