Skip to content
Snippets Groups Projects
Commit 45fcd6dd authored by Éloïs's avatar Éloïs
Browse files

[mod] add and apply constants.DEFAULT_LANGUAGE

parent 2b156102
Branches
Tags
1 merge request!62Dev2
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
module.exports = { module.exports = {
USE_WOTB6: true, USE_WOTB6: true,
DEFAULT_LANGUAGE: "fr",
MIN_WILLMEMBERS_UPDATE_FREQ: 180, MIN_WILLMEMBERS_UPDATE_FREQ: 180,
MIN_MEMBERS_UPDATE_FREQ: 180, MIN_MEMBERS_UPDATE_FREQ: 180,
STEP_COUNT_MIN: 4, STEP_COUNT_MIN: 4,
......
const fs = require('fs') const fs = require('fs')
const express = require('express') const express = require('express')
const constants = require(__dirname + '/../lib/constants')
const getLang = require(__dirname + '/../lib/getLang') const getLang = require(__dirname + '/../lib/getLang')
const printMenu = require(__dirname + '/../views/printMenu') const printMenu = require(__dirname + '/../views/printMenu')
...@@ -31,7 +33,7 @@ app.get('/', // chemin (endpoint) ...@@ -31,7 +33,7 @@ app.get('/', // chemin (endpoint)
host: req.headers.host.toString(), host: req.headers.host.toString(),
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`) MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -43,7 +45,7 @@ app.get('/about', // chemin (endpoint) ...@@ -43,7 +45,7 @@ app.get('/about', // chemin (endpoint)
host: req.headers.host.toString(), host: req.headers.host.toString(),
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`) MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -55,8 +57,8 @@ app.get('/willMembers', // chemin (endpoint) ...@@ -55,8 +57,8 @@ app.get('/willMembers', // chemin (endpoint)
(req, res)=> res.render('willMembers.html', { // rendu (template) (req, res)=> res.render('willMembers.html', { // rendu (template)
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/willMembers_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/willMembers_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -68,8 +70,8 @@ app.get('/members', ...@@ -68,8 +70,8 @@ app.get('/members',
(req, res)=> res.render('members.html', { (req, res)=> res.render('members.html', {
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/members_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/members_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -81,7 +83,7 @@ app.get('/members', ...@@ -81,7 +83,7 @@ app.get('/members',
(req, res)=> res.render('wasMembers.html', { (req, res)=> res.render('wasMembers.html', {
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/wasMembers_${lg}.txt`) LANG: getLang(`${__dirname}/../lg/wasMembers_${lg}.txt`)
}) })
)*/ )*/
...@@ -95,8 +97,8 @@ app.get('/membersCount', ...@@ -95,8 +97,8 @@ app.get('/membersCount',
printMenu, printMenu,
pageName: 'MEMBERS_COUNT', pageName: 'MEMBERS_COUNT',
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/membersCount_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/membersCount_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -108,8 +110,8 @@ app.get('/wotex', ...@@ -108,8 +110,8 @@ app.get('/wotex',
(req, res)=> res.render('wotex.html', { (req, res)=> res.render('wotex.html', {
printMenu, printMenu,
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/wotex_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/wotex_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -122,8 +124,8 @@ app.get('/gaussianWotQuality', ...@@ -122,8 +124,8 @@ app.get('/gaussianWotQuality',
printMenu, printMenu,
pageName: 'GAUSSIAN_WOT_QUALITY', pageName: 'GAUSSIAN_WOT_QUALITY',
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/gaussianWotQuality_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/gaussianWotQuality_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -136,8 +138,8 @@ app.get('/blockCount', ...@@ -136,8 +138,8 @@ app.get('/blockCount',
printMenu, printMenu,
pageName: 'BLOCK_COUNT', pageName: 'BLOCK_COUNT',
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/blockCount_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/blockCount_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
...@@ -150,8 +152,8 @@ app.get('/monetaryMass', ...@@ -150,8 +152,8 @@ app.get('/monetaryMass',
printMenu, printMenu,
pageName: 'MONETARY_MASS', pageName: 'MONETARY_MASS',
help: req.query.help, help: req.query.help,
MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||'fr'}.txt`), MENU_LANG: getLang(`${__dirname}/../lg/menu_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`),
LANG: getLang(`${__dirname}/../lg/monetaryMass_${req.query.lg||'fr'}.txt`) LANG: getLang(`${__dirname}/../lg/monetaryMass_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`)
}) })
) )
......
...@@ -16,7 +16,7 @@ module.exports = (req, res, next) => co(function *() { ...@@ -16,7 +16,7 @@ module.exports = (req, res, next) => co(function *() {
var pow = req.query.pow || 'no'; var pow = req.query.pow || 'no';
// get lg file // get lg file
const LANG = getLang(`${__dirname}/../lg/membersCount_${req.query.lg||'fr'}.txt`); // const LANG = getLang(`${__dirname}/../lg/membersCount_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`);
// get medianTime of beginBlock // get medianTime of beginBlock
var beginBlock = yield duniterServer.dal.peerDAL.query('SELECT `medianTime`,`hash` FROM block WHERE `fork`=0 AND `number` = '+cache.beginBlock[0].number+' LIMIT 1'); var beginBlock = yield duniterServer.dal.peerDAL.query('SELECT `medianTime`,`hash` FROM block WHERE `fork`=0 AND `number` = '+cache.beginBlock[0].number+' LIMIT 1');
......
...@@ -16,7 +16,7 @@ module.exports = (req, res, next) => co(function *() { ...@@ -16,7 +16,7 @@ module.exports = (req, res, next) => co(function *() {
var help = req.query.help || 'yes'; var help = req.query.help || 'yes';
// get lg file // get lg file
const LANG = getLang(`${__dirname}/../lg/wotex_${req.query.lg||'fr'}.txt`); const LANG = getLang(`${__dirname}/../lg/wotex_${req.query.lg||constants.DEFAULT_LANGUAGE}.txt`);
// Trouve les points de contrôle efficacement grâce au module C (nommé "wotb") // Trouve les points de contrôle efficacement grâce au module C (nommé "wotb")
const wotb = duniterServer.dal.wotb.memCopy(); const wotb = duniterServer.dal.wotb.memCopy();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment