From 510c16536d4871174227fde3e3f4caa9a69ef0a3 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 29 Jun 2022 12:45:43 +0300 Subject: [PATCH 1/4] Add supported languages list --- workers/loc.api/queue/send-mail/languages.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 workers/loc.api/queue/send-mail/languages.js diff --git a/workers/loc.api/queue/send-mail/languages.js b/workers/loc.api/queue/send-mail/languages.js new file mode 100644 index 00000000..12013361 --- /dev/null +++ b/workers/loc.api/queue/send-mail/languages.js @@ -0,0 +1,16 @@ +'use strict' + +module.exports = { + en: 'en', + 'en-US': 'en', + ru: 'ru', + 'zh-CN': 'zh-CN', + 'zh-TW': 'zh-TW', + tr: 'tr', + 'tr-TR': 'tr', + es: 'es-EM', + 'es-EM': 'es-EM', + pt: 'pt-BR', + 'pt-PT': 'pt-BR', + 'pt-BR': 'pt-BR' +} From e3ff7e6d4db7425c85966259a04640fec7e372e1 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 29 Jun 2022 12:46:26 +0300 Subject: [PATCH 2/4] Extend request language param validation list --- workers/loc.api/helpers/schema.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/workers/loc.api/helpers/schema.js b/workers/loc.api/helpers/schema.js index c7fe90b2..61dc6529 100644 --- a/workers/loc.api/helpers/schema.js +++ b/workers/loc.api/helpers/schema.js @@ -56,7 +56,20 @@ const dateFormat = { } const language = { type: 'string', - enum: ['en', 'ru', 'zh-CN', 'zh-TW', 'es-EM', 'tr', 'pt-PT'] + enum: [ + 'en', + 'en-US', + 'ru', + 'zh-CN', + 'zh-TW', + 'tr', + 'tr-TR', + 'es', + 'es-EM', + 'pt', + 'pt-PT', + 'pt-BR' + ] } const paramsSchemaForPayInvoiceList = { From 8df6f40672a183fa17cf32e13f43d6710d60fccd Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 29 Jun 2022 12:47:02 +0300 Subject: [PATCH 3/4] Change translation name from pt-PT to pt-BR --- workers/loc.api/queue/send-mail/translations/email.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers/loc.api/queue/send-mail/translations/email.yml b/workers/loc.api/queue/send-mail/translations/email.yml index 78c6b5a9..8f6dad5f 100644 --- a/workers/loc.api/queue/send-mail/translations/email.yml +++ b/workers/loc.api/queue/send-mail/translations/email.yml @@ -82,7 +82,7 @@ tr: download: indir pgpSignature: bir PGP dijital imza dosyası -pt-PT: +pt-BR: template: subject: Seu relatório está pronto btnText: Baixar CSV From a7d49e7838283e9bf292c1a5287155b217bc76f0 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 29 Jun 2022 12:47:26 +0300 Subject: [PATCH 4/4] Add aliases to languages to follow ui --- workers/loc.api/queue/send-mail/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workers/loc.api/queue/send-mail/index.js b/workers/loc.api/queue/send-mail/index.js index 52831fec..fa1c7630 100644 --- a/workers/loc.api/queue/send-mail/index.js +++ b/workers/loc.api/queue/send-mail/index.js @@ -5,6 +5,8 @@ const fs = require('fs') const pug = require('pug') const yaml = require('js-yaml') +const LANGUAGES = require('./languages') + const basePathToViews = path.join(__dirname, 'views') const pathToTrans = path.join( __dirname, @@ -79,7 +81,8 @@ module.exports = (grcBfxReq) => { presigned_url: url, language = 'en' } = { ...data } - const translate = _getTranslator(language) + const normLang = LANGUAGES?.[language] ?? 'en' + const translate = _getTranslator(normLang) const subject = translate( configs.subject, 'template.subject' @@ -104,7 +107,7 @@ module.exports = (grcBfxReq) => { text, subject, button, - language + language: normLang } return grcBfxReq({