locales: convert codes to POSIX-style

This commit is contained in:
Ash Monty 2022-08-12 21:22:12 +02:00
parent c8b424e18e
commit 01a34aa268
No known key found for this signature in database
GPG Key ID: 740B7C88251D49B6
19 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@ async function renderDataMiddleware(request, response, next) {
// Get user local
const reqLocale = request.locale;
const locale = util.getLocale(reqLocale.region, reqLocale.language);
const locale = util.getLocale(reqLocale.language, reqLocale.region);
response.locals.locale = locale;
response.locals.localeString = reqLocale.toString();
@ -40,4 +40,4 @@ async function renderDataMiddleware(request, response, next) {
}
}
module.exports = renderDataMiddleware;
module.exports = renderDataMiddleware;

View File

@ -12,7 +12,7 @@ const database = require('./database');
const util = require('./util');
const logger = require('./logger');
const config = require('../config.json');
const defaultLocale = require('../locales/US_en.json');
const defaultLocale = require('../locales/en_US.json');
const { http: { port } } = config;
const app = express();

View File

@ -13,16 +13,16 @@ function fullUrl(request) {
return `${request.protocol}://${request.hostname}${request.originalUrl}`;
}
function getLocale(region, language) {
const path = `${__dirname}/../locales/${region}_${language}.json`;
function getLocale(language, region) {
const path = `${__dirname}/../locales/${language}_${region}.json`;
if (fs.pathExistsSync(path)) {
return require(path);
}
logger.warn(`Could not find locale ${region}_${language}! Loading US_en`);
logger.warn(`Could not find locale ${language}_${region}! Loading en_US`);
return require(`${__dirname}/../locales/US_en.json`);
return require(`${__dirname}/../locales/en_US.json`);
}
function apiGetRequest(path, headers) {