github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-21 22:36:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'key-adjustment' of https://github.com/dcsjapan/flarum-core into dcsjapan-key-adjustment

Browse Source 
# Conflicts:
#	js/forum/src/components/LogInModal.js
This commit is contained in:
Toby Zerner
2015-10-21 10:02:07 +10:30
parent 9aeaccf9a4 659cfb72ad
commit b23e821013
54 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/lib/App.js
View File

@ -255,16 +255,16 @@ export default class App {
case 401:
case 403:
children = 'You do not have permission to do that.';
children = app.translator.trans('core.lib.error.permission_denied_message');
break;
case 404:
case 410:
children = 'The requested resource was not found.';
children = app.translator.trans('core.lib.error.not_found_message');
break;
default:
children = 'Oops! Something went wrong. Please reload the page and try again.';
children = app.translator.trans('core.lib.error.generic_message');
}
error.alert = new Alert({