From be5d6d29c9c5ea643353191e4b89fe530c11ab1a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 19 Oct 2022 15:24:44 -0400 Subject: [PATCH 1/8] chore: add bootstrap5 to test runner for now --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index df9e180c78..1c96abdd1c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,10 +5,12 @@ on: branches: - master - develop + - bootstrap5 pull_request: branches: - master - develop + - bootstrap5 defaults: run: From d50512e73ca70af14bdb9212fb223a24e1a528f7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 19 Oct 2022 15:28:41 -0400 Subject: [PATCH 2/8] chore: fix indents --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1c96abdd1c..aec33f4ab0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,12 +5,12 @@ on: branches: - master - develop - - bootstrap5 + - bootstrap5 pull_request: branches: - master - develop - - bootstrap5 + - bootstrap5 defaults: run: From c2024f3484bc0081af12e66be22c573a8ac61668 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 19 Oct 2022 15:29:54 -0400 Subject: [PATCH 3/8] chore: really fix indents this time --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aec33f4ab0..108c060ea7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,7 @@ on: branches: - master - develop - - bootstrap5 + - bootstrap5 defaults: run: From e3f2156202631ddef5e91d76838fc03e5e2fd9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 20 Oct 2022 20:35:35 -0400 Subject: [PATCH 4/8] feat: add search data to filter:search.inContent --- src/search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/search.js b/src/search.js index d5555a21fb..a46934ff2f 100644 --- a/src/search.js +++ b/src/search.js @@ -81,6 +81,7 @@ async function searchInContent(data) { const metadata = await plugins.hooks.fire('filter:search.inContent', { pids: allPids, + data: data, }); if (data.returnIds) { From 9227b82e2c8ccfbf7d066420a80724b6568011cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 20 Oct 2022 21:01:34 -0400 Subject: [PATCH 5/8] fix: check cid as well as template --- public/src/modules/search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/modules/search.js b/public/src/modules/search.js index 1a0d8e6b9e..20e3a02d33 100644 --- a/public/src/modules/search.js +++ b/public/src/modules/search.js @@ -87,13 +87,13 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla const filterCategoryEl = quickSearchResults.find('.filter-category'); function updateCategoryFilterName() { - if (ajaxify.data.template.category) { + if (ajaxify.data.template.category && ajaxify.data.cid) { translator.translate('[[search:search-in-category, ' + ajaxify.data.name + ']]', function (translated) { const name = $('
').html(translated).text(); filterCategoryEl.find('.name').text(name); }); } - filterCategoryEl.toggleClass('hidden', !ajaxify.data.template.category); + filterCategoryEl.toggleClass('hidden', !(ajaxify.data.template.category && ajaxify.data.cid)); } function doSearch() { @@ -101,7 +101,7 @@ define('search', ['translator', 'storage', 'hooks', 'alerts'], function (transla options.searchOptions.term = inputEl.val(); updateCategoryFilterName(); - if (ajaxify.data.template.category) { + if (ajaxify.data.template.category && ajaxify.data.cid) { if (filterCategoryEl.find('input[type="checkbox"]').is(':checked')) { options.searchOptions.categories = [ajaxify.data.cid]; options.searchOptions.searchChildren = true; From 6f673f806f67c4477b3641d5b0ebcb70a1d84b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 21 Oct 2022 10:23:36 -0400 Subject: [PATCH 6/8] fix: #10993, apply autoLocale middleware to guests only --- src/middleware/headers.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/middleware/headers.js b/src/middleware/headers.js index dacfb62dec..7f05f11928 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -86,15 +86,16 @@ module.exports = function (middleware) { } return next(); } - if (parseInt(req.uid, 10) > 0 || !meta.config.autoDetectLang) { - return next(); + + if (meta.config.autoDetectLang && req.uid === 0) { + const langs = await listCodes(); + const lang = req.acceptsLanguages(langs); + if (!lang) { + return next(); + } + req.query.lang = lang; } - const langs = await listCodes(); - const lang = req.acceptsLanguages(langs); - if (!lang) { - return next(); - } - req.query.lang = lang; + next(); }); From b9c8c02fcfe8b7456bfa3ec69313c7b2ed57e66f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 21 Oct 2022 14:45:25 -0400 Subject: [PATCH 7/8] fix: fallback language strings for #10987 --- public/language/ar/admin/settings/email.json | 3 +++ public/language/bg/admin/settings/email.json | 3 +++ public/language/bn/admin/settings/email.json | 3 +++ public/language/cs/admin/settings/email.json | 3 +++ public/language/da/admin/settings/email.json | 3 +++ public/language/de/admin/settings/email.json | 3 +++ public/language/el/admin/settings/email.json | 3 +++ public/language/en-US/admin/settings/email.json | 3 +++ public/language/en-x-pirate/admin/settings/email.json | 3 +++ public/language/es/admin/settings/email.json | 3 +++ public/language/et/admin/settings/email.json | 3 +++ public/language/fa-IR/admin/settings/email.json | 3 +++ public/language/fi/admin/settings/email.json | 3 +++ public/language/fr/admin/settings/email.json | 3 +++ public/language/gl/admin/settings/email.json | 3 +++ public/language/he/admin/settings/email.json | 3 +++ public/language/hr/admin/settings/email.json | 3 +++ public/language/hu/admin/settings/email.json | 3 +++ public/language/id/admin/settings/email.json | 3 +++ public/language/it/admin/settings/email.json | 3 +++ public/language/ja/admin/settings/email.json | 3 +++ public/language/ko/admin/settings/email.json | 3 +++ public/language/lt/admin/settings/email.json | 3 +++ public/language/lv/admin/settings/email.json | 3 +++ public/language/ms/admin/settings/email.json | 3 +++ public/language/nb/admin/settings/email.json | 3 +++ public/language/nl/admin/settings/email.json | 3 +++ public/language/pl/admin/settings/email.json | 3 +++ public/language/pt-BR/admin/settings/email.json | 3 +++ public/language/pt-PT/admin/settings/email.json | 3 +++ public/language/ro/admin/settings/email.json | 3 +++ public/language/ru/admin/settings/email.json | 3 +++ public/language/rw/admin/settings/email.json | 3 +++ public/language/sc/admin/settings/email.json | 3 +++ public/language/sk/admin/settings/email.json | 3 +++ public/language/sl/admin/settings/email.json | 3 +++ public/language/sq-AL/admin/settings/email.json | 3 +++ public/language/sr/admin/settings/email.json | 3 +++ public/language/sv/admin/settings/email.json | 3 +++ public/language/th/admin/settings/email.json | 3 +++ public/language/tr/admin/settings/email.json | 3 +++ public/language/uk/admin/settings/email.json | 3 +++ public/language/vi/admin/settings/email.json | 3 +++ public/language/zh-CN/admin/settings/email.json | 3 +++ public/language/zh-TW/admin/settings/email.json | 3 +++ 45 files changed, 135 insertions(+) diff --git a/public/language/ar/admin/settings/email.json b/public/language/ar/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ar/admin/settings/email.json +++ b/public/language/ar/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/bg/admin/settings/email.json b/public/language/bg/admin/settings/email.json index cab27f8c59..ccf78aba43 100644 --- a/public/language/bg/admin/settings/email.json +++ b/public/language/bg/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Име за полето „От“", "from-help": "Името на изпращача, което да бъде показано в е-писмото.", + "confirmation-settings": "Потвърждение", + "confirmation.expiry": "Продължителност на давността на връзката за потвърждаване, в часове", + "smtp-transport": "Транспорт чрез SMTP", "smtp-transport.enabled": "Включване на транспорта чрез SMTP", "smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.", diff --git a/public/language/bn/admin/settings/email.json b/public/language/bn/admin/settings/email.json index 03f53c6c75..cacfb095b9 100644 --- a/public/language/bn/admin/settings/email.json +++ b/public/language/bn/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/cs/admin/settings/email.json b/public/language/cs/admin/settings/email.json index aa3253c18b..fadb159ee1 100644 --- a/public/language/cs/admin/settings/email.json +++ b/public/language/cs/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Jméno – od", "from-help": "Zobrazené jméno v e-mailu v – Od", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Přenos SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.", diff --git a/public/language/da/admin/settings/email.json b/public/language/da/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/da/admin/settings/email.json +++ b/public/language/da/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/de/admin/settings/email.json b/public/language/de/admin/settings/email.json index 0c0ccd8a4d..1444ca221c 100644 --- a/public/language/de/admin/settings/email.json +++ b/public/language/de/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Name des Absenders", "from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Konfiguration", "smtp-transport.enabled": "SMTP-Transport aktivieren", "smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.", diff --git a/public/language/el/admin/settings/email.json b/public/language/el/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/el/admin/settings/email.json +++ b/public/language/el/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/en-US/admin/settings/email.json b/public/language/en-US/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/en-US/admin/settings/email.json +++ b/public/language/en-US/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/en-x-pirate/admin/settings/email.json b/public/language/en-x-pirate/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/en-x-pirate/admin/settings/email.json +++ b/public/language/en-x-pirate/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/es/admin/settings/email.json b/public/language/es/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/es/admin/settings/email.json +++ b/public/language/es/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/et/admin/settings/email.json b/public/language/et/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/et/admin/settings/email.json +++ b/public/language/et/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fa-IR/admin/settings/email.json b/public/language/fa-IR/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/fa-IR/admin/settings/email.json +++ b/public/language/fa-IR/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fi/admin/settings/email.json b/public/language/fi/admin/settings/email.json index 3557bacfc7..740998a605 100644 --- a/public/language/fi/admin/settings/email.json +++ b/public/language/fi/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/fr/admin/settings/email.json b/public/language/fr/admin/settings/email.json index 3d3a4b8f4f..a741aa8dbf 100644 --- a/public/language/fr/admin/settings/email.json +++ b/public/language/fr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Nom de l’expéditeur", "from-help": "Le nom de l’expéditeur à afficher dans l'e-mail", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Protocole SMTP", "smtp-transport.enabled": "Activer l'envoi via SMTP", "smtp-transport-help": "Vous pouvez sélectionner depuis une liste de services ou entrer un service personnalisé.", diff --git a/public/language/gl/admin/settings/email.json b/public/language/gl/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/gl/admin/settings/email.json +++ b/public/language/gl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/he/admin/settings/email.json b/public/language/he/admin/settings/email.json index c2f1b3c6ef..1b37b35a28 100644 --- a/public/language/he/admin/settings/email.json +++ b/public/language/he/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "מאת", "from-help": "השם 'מאת' יוצג בדוא\"ל.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/hr/admin/settings/email.json b/public/language/hr/admin/settings/email.json index d18d0cc705..3030ec0a35 100644 --- a/public/language/hr/admin/settings/email.json +++ b/public/language/hr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Od imena", "from-help": "Ime prikazano u dolaznom emailu.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/hu/admin/settings/email.json b/public/language/hu/admin/settings/email.json index 22c226247d..f458051251 100644 --- a/public/language/hu/admin/settings/email.json +++ b/public/language/hu/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Feladó neve", "from-help": "Az emailben megjelenített feladói név.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP beállítások", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Válogathatsz a jól ismert szolgáltatások listájából vagy megadhatsz sajátot.", diff --git a/public/language/id/admin/settings/email.json b/public/language/id/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/id/admin/settings/email.json +++ b/public/language/id/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/it/admin/settings/email.json b/public/language/it/admin/settings/email.json index 4d99b4399c..adbca929b5 100644 --- a/public/language/it/admin/settings/email.json +++ b/public/language/it/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Da Nome", "from-help": "Il nome da visualizzare nell'email.", + "confirmation-settings": "Conferma", + "confirmation.expiry": "Ore per mantenere valido il link di conferma dell'email", + "smtp-transport": "Trasporto SMTP", "smtp-transport.enabled": "Abilita trasporto SMTP", "smtp-transport-help": "Puoi selezionare da un elenco di servizi noti o inserirne uno personalizzato.", diff --git a/public/language/ja/admin/settings/email.json b/public/language/ja/admin/settings/email.json index 400b5f1889..c08a7faccb 100644 --- a/public/language/ja/admin/settings/email.json +++ b/public/language/ja/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "名前から", "from-help": "メールからの名前が表示されます。", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ko/admin/settings/email.json b/public/language/ko/admin/settings/email.json index 0b6d934886..9c90b4b582 100644 --- a/public/language/ko/admin/settings/email.json +++ b/public/language/ko/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "포럼 메일 발신자 이름", "from-help": "이메일에 표시할 발신자 이름", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "자주 사용되는 서비스 목록 중에 하나를 선택하거나 직접 입력할 수 있습니다.", diff --git a/public/language/lt/admin/settings/email.json b/public/language/lt/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/lt/admin/settings/email.json +++ b/public/language/lt/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/lv/admin/settings/email.json b/public/language/lv/admin/settings/email.json index bb154ee970..81815fc6af 100644 --- a/public/language/lv/admin/settings/email.json +++ b/public/language/lv/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Sūtītāja vārds vai nosaukums", "from-help": "Vārds vai nosaukums, ko saņēmējs redzēs kā sūtītāju.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP transports", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Izvēlies no labi zināmu pakalpojumu saraksta vai ievadi pielāgotu pakalpojumu.", diff --git a/public/language/ms/admin/settings/email.json b/public/language/ms/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ms/admin/settings/email.json +++ b/public/language/ms/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/nb/admin/settings/email.json b/public/language/nb/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/nb/admin/settings/email.json +++ b/public/language/nb/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/nl/admin/settings/email.json b/public/language/nl/admin/settings/email.json index 875a778a98..afbfe81aa2 100644 --- a/public/language/nl/admin/settings/email.json +++ b/public/language/nl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Naam", "from-help": "De from naam om te tonen in de e-mail.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Je kunt een bekende dienst uit de lijst selecteren of vul een aangepaste dienst in.", diff --git a/public/language/pl/admin/settings/email.json b/public/language/pl/admin/settings/email.json index b0f60c4768..d68a780326 100644 --- a/public/language/pl/admin/settings/email.json +++ b/public/language/pl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Pole „Od”", "from-help": "Nazwa „Od” widoczna w e-mailach", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Transport SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Możesz wybrać z listy dobrze znanych usług lub wskazać usługę niestandardową.", diff --git a/public/language/pt-BR/admin/settings/email.json b/public/language/pt-BR/admin/settings/email.json index 28e89bab67..1c56b7edcd 100644 --- a/public/language/pt-BR/admin/settings/email.json +++ b/public/language/pt-BR/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Por Nome (From)", "from-help": "O nome que será mostrado em \"De\" no e-mail.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Trasporte por SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Você pode escolher entre uma lista de serviços conhecidos ou adicionar um personalizado.", diff --git a/public/language/pt-PT/admin/settings/email.json b/public/language/pt-PT/admin/settings/email.json index 39197da34f..2c78449689 100644 --- a/public/language/pt-PT/admin/settings/email.json +++ b/public/language/pt-PT/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ro/admin/settings/email.json b/public/language/ro/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/ro/admin/settings/email.json +++ b/public/language/ro/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/ru/admin/settings/email.json b/public/language/ru/admin/settings/email.json index 41e84d950c..8c519bc778 100644 --- a/public/language/ru/admin/settings/email.json +++ b/public/language/ru/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "От кого", "from-help": "Имя отправителя письма (или название форума).", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Сервис SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Выберите один из популярных сервисов или укажите свой почтовый сервер.", diff --git a/public/language/rw/admin/settings/email.json b/public/language/rw/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/rw/admin/settings/email.json +++ b/public/language/rw/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sc/admin/settings/email.json b/public/language/sc/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sc/admin/settings/email.json +++ b/public/language/sc/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sk/admin/settings/email.json b/public/language/sk/admin/settings/email.json index 702de82895..f8d64a3462 100644 --- a/public/language/sk/admin/settings/email.json +++ b/public/language/sk/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Meno - od", "from-help": "Zobrazené meno v e-maily v - Od", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Prenos SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Zo zoznamu môžete vybrať známe služby alebo zadať vlastné.", diff --git a/public/language/sl/admin/settings/email.json b/public/language/sl/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sl/admin/settings/email.json +++ b/public/language/sl/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sq-AL/admin/settings/email.json b/public/language/sq-AL/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/sq-AL/admin/settings/email.json +++ b/public/language/sq-AL/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sr/admin/settings/email.json b/public/language/sr/admin/settings/email.json index e7c80966fb..7543180f27 100644 --- a/public/language/sr/admin/settings/email.json +++ b/public/language/sr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Od koga", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/sv/admin/settings/email.json b/public/language/sv/admin/settings/email.json index bf487ccb99..a51b116c25 100644 --- a/public/language/sv/admin/settings/email.json +++ b/public/language/sv/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/th/admin/settings/email.json b/public/language/th/admin/settings/email.json index 93ffe374f9..35e713adc0 100644 --- a/public/language/th/admin/settings/email.json +++ b/public/language/th/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/tr/admin/settings/email.json b/public/language/tr/admin/settings/email.json index 84d29b0242..bdebff56d6 100644 --- a/public/language/tr/admin/settings/email.json +++ b/public/language/tr/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "From Name", "from-help": "The from name to display in the email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP Transport", "smtp-transport.enabled": "SMTP Aktarımını Etkinleştir", "smtp-transport-help": "You can select from a list of well-known services or enter a custom one.", diff --git a/public/language/uk/admin/settings/email.json b/public/language/uk/admin/settings/email.json index 046edf46d3..30dbc77964 100644 --- a/public/language/uk/admin/settings/email.json +++ b/public/language/uk/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Ім'я відправника", "from-help": "Ім'я відправника, що буде показано в електронних листах", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Протокол SMTP", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "Ви можете обрати поштовий сервіс зі списку або використати ваш власний сервіс.", diff --git a/public/language/vi/admin/settings/email.json b/public/language/vi/admin/settings/email.json index 30cebf9d91..a1854f39a0 100644 --- a/public/language/vi/admin/settings/email.json +++ b/public/language/vi/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "Tên Người Gửi", "from-help": "Tên người gửi hiển thị trong email.", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "Truyền Tải SMTP", "smtp-transport.enabled": "Bật truyền tải SMTP", "smtp-transport-help": "Bạn có thể chọn từ danh sách các dịch vụ nổi bật hoặc nhập một dịch vụ tùy chỉnh.", diff --git a/public/language/zh-CN/admin/settings/email.json b/public/language/zh-CN/admin/settings/email.json index 011373afd6..4d6570a579 100644 --- a/public/language/zh-CN/admin/settings/email.json +++ b/public/language/zh-CN/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "发送者", "from-help": "用于邮件中显示的发送者", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP 通信", "smtp-transport.enabled": "启用 SMTP 通信", "smtp-transport-help": "您可以从列表中选取一个已知的服务或自定义。", diff --git a/public/language/zh-TW/admin/settings/email.json b/public/language/zh-TW/admin/settings/email.json index 71d8f17e6c..3289f089ee 100644 --- a/public/language/zh-TW/admin/settings/email.json +++ b/public/language/zh-TW/admin/settings/email.json @@ -5,6 +5,9 @@ "from": "發送人", "from-help": "用於郵件中顯示的發送人", + "confirmation-settings": "Confirmation", + "confirmation.expiry": "Hours to keep email confirmation link valid", + "smtp-transport": "SMTP 通信", "smtp-transport.enabled": "Enable SMTP Transport", "smtp-transport-help": "您可以從列表中選取一個已知的服務或自訂。", From 673261ff981613b0e22be0776a8ec27c30730467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 23 Oct 2022 19:46:54 -0400 Subject: [PATCH 8/8] fix: #10519, image height in emails --- src/views/emails/partials/header.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/emails/partials/header.tpl b/src/views/emails/partials/header.tpl index 0466c83cfe..e292b13830 100644 --- a/src/views/emails/partials/header.tpl +++ b/src/views/emails/partials/header.tpl @@ -141,6 +141,7 @@ .notification-body img { max-width: 100%; + height: auto; }