diff --git a/imports/api/Utility/server/files.js b/imports/api/Utility/server/files.js index ceb0fc9..717f19f 100644 --- a/imports/api/Utility/server/files.js +++ b/imports/api/Utility/server/files.js @@ -1,16 +1,8 @@ import fs from 'fs'; +import getFallbackLang from '/imports/startup/server/accounts/lang-fallback'; const as = f => `assets/app/${f}`; -export const getFallbackLang = (lang) => { - if (lang === 'ast' || lang === 'gl' || lang === 'eu' || lang === 'ca' || - (lang && lang.match(/es_.*/)) || - (lang && lang.match(/es-.*/))) { - return 'es'; - } - return 'en'; -}; - export const getFileNameOfLang = (dir, fileName, ext, lang) => { const base = `${dir}/${fileName}`; const fallback = getFallbackLang(lang); diff --git a/imports/startup/server/accounts/lang-fallback.js b/imports/startup/server/accounts/lang-fallback.js index af96ce5..67fbb66 100644 --- a/imports/startup/server/accounts/lang-fallback.js +++ b/imports/startup/server/accounts/lang-fallback.js @@ -1,5 +1,5 @@ const getFallbackLang = (lang) => { - if (lang && (lang === 'ast' || lang === 'gl' || lang === 'eu' || lang === 'ca' || lang.match(/^es/))) { + if (lang && (lang === 'ast' || lang === 'gl' || lang === 'eu' || lang === 'ca' || lang.match(/^es-/))) { return 'es'; } return 'en'; diff --git a/test/file.test.js b/test/file.test.js index 90f3cd7..d4454fb 100644 --- a/test/file.test.js +++ b/test/file.test.js @@ -33,8 +33,4 @@ describe('get file of page', () => { it('lang es-PE retrieve es', async () => { chai.expect('pages/about-es.md').to.deep.equal(getFileNameOfLang('pages', 'about', 'md', 'es-PE')); }); - - it('lang es_PE retrieve es', async () => { - chai.expect('pages/about-es.md').to.deep.equal(getFileNameOfLang('pages', 'about', 'md', 'es_PE')); - }); });