diff options
-rw-r--r-- | webapp/i18n/en.json | 4 | ||||
-rw-r--r-- | webapp/i18n/es.json | 2 | ||||
-rw-r--r-- | webapp/package.json | 1 | ||||
-rw-r--r-- | webapp/root.jsx | 27 |
4 files changed, 28 insertions, 6 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index e4485dc29..d9411df07 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -410,6 +410,8 @@ "admin.support.emailTitle": "Support email:", "admin.support.helpDesc": "Link to help documentation from team site main menu. Typically not changed unless your organization chooses to create custom documentation.", "admin.support.helpTitle": "Help link:", + "admin.support.noteDescription": "If linking to an external site, URLs should begin with http:// or https://.", + "admin.support.noteTitle": "Note:", "admin.support.privacyDesc": "Link to Privacy Policy available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.", "admin.support.privacyTitle": "Privacy Policy link:", "admin.support.problemDesc": "Link to help documentation from team site main menu. By default this points to the peer-to-peer troubleshooting forum where users can search for, find and request help with technical issues.", @@ -419,8 +421,6 @@ "admin.support.termsDesc": "Link to Terms of Service available to users on desktop and on mobile. Leaving this blank will hide the option to display a notice.", "admin.support.termsTitle": "Terms of Service link:", "admin.support.title": "Legal and Support Settings", - "admin.support.noteTitle": "Note:", - "admin.support.noteDescription": "If linking to an external site, URLs should begin with http:// or https://.", "admin.system_analytics.activeUsers": "Active Users With Posts", "admin.system_analytics.title": "the System", "admin.system_analytics.totalPosts": "Total Posts", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 021b41051..8852dd3c6 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -410,6 +410,8 @@ "admin.support.emailTitle": "Correo electrónico de Soporte:", "admin.support.helpDesc": "Enlace con la documentación de ayuda para el equipo desde el menú principal. Normalmente no cambia a menos que tu organización decida crear una documentación personalizada.", "admin.support.helpTitle": "Enlace de Ayuda:", + "admin.support.noteDescription": "Si se enlaza a un sitio externo, las URLs deben comenzar con http:// o https://.", + "admin.support.noteTitle": "Nota:", "admin.support.privacyDesc": "Enlace para las políticas de Privacidad disponible para los usuarios en versión de escritorio y movil. Al dejarlo en blanco esconderá la opción que muestra el aviso.", "admin.support.privacyTitle": "Enlace de políticas de Privacidad:", "admin.support.problemDesc": "Enlace con la documentación de ayuda para el equipo desde el menú principal. Como predeterminado esto apunta a un foro de ayuda donde los usuarios pueden buscar, encontrar y solicitar ayuda sobre temas técnicos.", diff --git a/webapp/package.json b/webapp/package.json index 0c3e9313e..cdfba8ef0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -11,6 +11,7 @@ "fastclick": "1.0.6", "flux": "2.1.1", "highlight.js": "9.2.0", + "intl": "1.1.0", "jasny-bootstrap": "3.1.3", "jquery": "2.2.1", "keymirror": "0.1.1", diff --git a/webapp/root.jsx b/webapp/root.jsx index 2ce220f1d..b0a6ae1ac 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -109,11 +109,30 @@ function preRenderSetup(callwhendone) { } ); - addLocaleData(enLocaleData); - addLocaleData(esLocaleData); - addLocaleData(ptLocaleData); + function afterIntl() { + addLocaleData(enLocaleData); + addLocaleData(esLocaleData); + addLocaleData(ptLocaleData); - $.when(d1, d2).done(callwhendone); + $.when(d1, d2).done(callwhendone); + } + + if (global.Intl) { + afterIntl(); + } else { + require.ensure([ + 'intl', + 'intl/locale-data/jsonp/en.js', + 'intl/locale-data/jsonp/es.js', + 'intl/locale-data/jsonp/pt.js' + ], (require) => { + require('intl'); + require('intl/locale-data/jsonp/en.js'); + require('intl/locale-data/jsonp/es.js'); + require('intl/locale-data/jsonp/pt.js'); + afterIntl(); + }); + } } function preLoggedIn(nextState, replace, callback) { |