Node.js based forum software built for the modern web
Merge branch 'master' into develop
Barış Soner Uşaklıcf77df605351
diff --cc install/package.jsonindex 1c82fcb54b,00ad5c3915..53c12f82cc--- a/install/package.json+++ b/install/package.json@@@ -101,22 -101,22 +101,22 @@@"mousetrap": "1.6.5","multer": "2.2.0","nconf": "0.13.0",- "nodebb-plugin-2factor": "8.0.1",- "nodebb-plugin-composer-default": "11.0.4",+ "nodebb-plugin-2factor": "8.0.5",+ "nodebb-plugin-composer-default": "11.0.6","nodebb-plugin-dbsearch": "7.0.0",- "nodebb-plugin-emoji": "6.0.14",+ "nodebb-plugin-emoji": "6.0.16","nodebb-plugin-emoji-android": "4.1.1","nodebb-plugin-link-preview": "2.2.8",- "nodebb-plugin-markdown": "13.2.6",+ "nodebb-plugin-markdown": "13.2.7","nodebb-plugin-mentions": "5.0.0",- "nodebb-plugin-spam-be-gone": "2.3.4",- "nodebb-plugin-web-push": "0.8.1",+ "nodebb-plugin-spam-be-gone": "2.3.5",+ "nodebb-plugin-web-push": "0.9.2","nodebb-rewards-essentials": "1.0.3",- "nodebb-theme-harmony": "3.1.6",+ "nodebb-theme-harmony": "3.1.7",- "nodebb-theme-lavender": "8.0.6",- "nodebb-theme-peace": "3.0.6",- "nodebb-theme-persona": "15.0.11",- "nodebb-widget-essentials": "8.0.4",+ "nodebb-theme-lavender": "8.1.0",+ "nodebb-theme-peace": "3.1.1",+ "nodebb-theme-persona": "15.1.2",+ "nodebb-widget-essentials": "8.0.5","nodemailer": "9.0.3","nprogress": "0.2.0","passport": "0.7.0",diff --cc src/views/login.tplindex 9060c4b8b4,b5968ddf78..41148a76b0--- a/src/views/login.tpl+++ b/src/views/login.tpl@@@ -49,8 -49,8 +49,8 @@@</div><div class="alert alert-danger {{{ if !error }}} hidden{{{ end }}}" id="login-error-notify" role="alert" aria-atomic="true">- <strong>[[login:failed-login-attempt]]</strong>+ <strong>{{tx("login:failed-login-attempt")}}</strong>- <p class="mb-0">{error}</p>+ <p class="mb-0">{{tx(error)}}</p></div><hr/>