comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed duplicated code

Browse source
This commit is contained in:
vjrj 2018-02-26 20:30:46 +01:00
parent 2fe2412e73
commit f5d43dba76
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
imports/api/Utility/server/files.js
View file

@ -1,16 +1,8 @@
import fs from 'fs'; import fs from 'fs';
import getFallbackLang from '/imports/startup/server/accounts/lang-fallback';
const as = f => `assets/app/${f}`; 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) => { export const getFileNameOfLang = (dir, fileName, ext, lang) => {
const base = `${dir}/${fileName}`; const base = `${dir}/${fileName}`;
const fallback = getFallbackLang(lang); const fallback = getFallbackLang(lang);

2
imports/startup/server/accounts/lang-fallback.js
View file

@ -1,5 +1,5 @@
const getFallbackLang = (lang) => { 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 'es';
} }
return 'en'; return 'en';

4
test/file.test.js
View file

@ -33,8 +33,4 @@ describe('get file of page', () => {
it('lang es-PE retrieve es', async () => { it('lang es-PE retrieve es', async () => {
chai.expect('pages/about-es.md').to.deep.equal(getFileNameOfLang('pages', 'about', 'md', 'es-PE')); 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'));
});
}); });