Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5922

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-09-08 13:23:30 -06:00
parent a4532f011a
commit f40d37ad48
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/error.json
View File

@@ -5,6 +5,7 @@
"not-logged-in": "You don't seem to be logged in.", "not-logged-in": "You don't seem to be logged in.",
"account-locked": "Your account has been locked temporarily", "account-locked": "Your account has been locked temporarily",
"search-requires-login": "Searching requires an account - please login or register.", "search-requires-login": "Searching requires an account - please login or register.",
"goback": "Return to the previous page",
"invalid-cid": "Invalid Category ID", "invalid-cid": "Invalid Category ID",
"invalid-tid": "Invalid Topic ID", "invalid-tid": "Invalid Topic ID",

2
src/controllers/helpers.js
View File

@@ -26,7 +26,7 @@ helpers.noScriptErrors = function (req, res, error, httpStatus) {
path: req.path, path: req.path,
loggedIn: true, loggedIn: true,
error: error, error: error,
returnLink: true, returnLink: req.get('Referrer'),
title: '[[global:' + httpStatusString + '.title]]', title: '[[global:' + httpStatusString + '.title]]',
}); });
}); });

2
src/views/400.tpl
View File

@@ -7,6 +7,6 @@
<!-- ENDIF error --> <!-- ENDIF error -->
<!-- IF returnLink --> <!-- IF returnLink -->
<p>[[error:goback]]</p> <a href="{returnLink}">[[error:goback]]</a>
<!-- ENDIF returnLink --> <!-- ENDIF returnLink -->
</div> </div>

2
src/views/403.tpl
View File

@@ -7,7 +7,7 @@
<!-- ENDIF error --> <!-- ENDIF error -->
<!-- IF returnLink --> <!-- IF returnLink -->
<p>[[error:goback]]</p> <a href="{returnLink}">[[error:goback]]</a>
<!-- ENDIF returnLink --> <!-- ENDIF returnLink -->
<!-- IF !loggedIn --> <!-- IF !loggedIn -->

2
src/views/500-embed.tpl
View File

@@ -4,7 +4,7 @@ define('/assets/templates/500.jst', function () {
return '<div class="alert alert-danger">\n\t<strong>[[global:500.title]]</strong>\n\t<p>[[global:500.message]]</p>\n\t<p>' + return '<div class="alert alert-danger">\n\t<strong>[[global:500.title]]</strong>\n\t<p>[[global:500.message]]</p>\n\t<p>' +
helpers.__escape(get(context && context['path'])) + '</p>\n\t' + helpers.__escape(get(context && context['path'])) + '</p>\n\t' +
(get(context && context['error']) ? '<p>' + helpers.__escape(get(context && context['error'])) + '</p>' : '') + '\n\n\t' + (get(context && context['error']) ? '<p>' + helpers.__escape(get(context && context['error'])) + '</p>' : '') + '\n\n\t' +
(get(context && context['returnLink']) ? '\n\t<p>[[error:goback]]</p>\n\t' : '') + '\n</div>\n'; (get(context && context['returnLink']) ? '\n\t<a href="' + (get(context && context['returnLink'])) + '">[[error:goback]]</a>\n\t' : '') + '\n</div>\n';
} }
return compiled; return compiled;

2
src/views/500.tpl
View File

@@ -5,6 +5,6 @@
<!-- IF error --><p>{error}</p><!-- ENDIF error --> <!-- IF error --><p>{error}</p><!-- ENDIF error -->
<!-- IF returnLink --> <!-- IF returnLink -->
<p>[[error:goback]]</p> <a href="{returnLink}">[[error:goback]]</a>
<!-- ENDIF returnLink --> <!-- ENDIF returnLink -->
</div> </div>