Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Missing page "not found" #6673

Merged
merged 13 commits into from
Apr 17, 2018
Merged

[FIX] Missing page "not found" #6673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
692bb47
added error page
Apr 12, 2017
9636612
edited tabspaces
Apr 12, 2017
2fb397a
Update router.js
Apr 12, 2017
98c0928
changed template's name to pageNotFound
Apr 13, 2017
37c0541
Resolved merge conflict
Apr 13, 2017
7041965
Update pageNotFound.html
Apr 17, 2017
dfc2b1f
Update router.js
Apr 17, 2017
f60e43d
Update router.js
Apr 17, 2017
c093a54
Update en.i18n.json
Apr 17, 2017
34d1de9
Update pageNotFound.html
Apr 18, 2017
866bb98
Merge branch 'develop' into add-error-page
geekgonecrazy Mar 29, 2018
b7528a0
Merge branch 'develop' into add-error-page
karlprieb Mar 29, 2018
87954ed
Merge branch 'develop' into add-error-page
karlprieb Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/routes/pageNotFound.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<template name="pageNotFound">
<h1>{{_ "Error_404"}}</h1>
<h3>{{_ "Oops_page_not_found"}}</h3>
<p>{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}</p>
</template>
7 changes: 7 additions & 0 deletions client/routes/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,10 @@ FlowRouter.route('/register/:hash', {
// BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
}
});

FlowRouter.notFound = {
action() {
BlazeLayout.render('pageNotFound');
}
};

6 changes: 6 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,9 @@
"Enter_Normal": "Normal mode (send with Enter)",
"Enter_to": "Enter to",
"Error": "Error",
"Error_404": "Error:404",
"Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
"Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
"error-action-not-allowed": "__action__ is not allowed",
"error-application-not-found": "Application not found",
"error-archived-duplicate-name": "There's an archived channel with name '__room_name__'",
Expand Down Expand Up @@ -1461,6 +1464,8 @@
"Opens_a_channel_group_or_direct_message": "Opens a channel, group or direct message",
"optional": "optional",
"or": "or",
"Oops_page_not_found": "Oops, page not found",
"Open_your_authentication_app_and_enter_the_code": "Open your authentication app and enter the code. You can also use one of your backup codes.",
"Or_talk_as_anonymous": "Or talk as anonymous",
"Order": "Order",
"Original": "Original",
Expand Down Expand Up @@ -1821,6 +1826,7 @@
"Snippet_Added": "Created on %s",
"Snippet_Messages": "Snippet Messages",
"Snippeted_a_message": "Created a snippet __snippetLink__",
"Sorry_page_you_requested_does_not_exists_or_was_deleted": "Sorry, page you requested does not exists or was deleted!",
"Sort_by_activity": "Sort by Activity",
"Sound": "Sound",
"Sound_File_mp3": "Sound File (mp3)",
Expand Down