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

Fixed grammatically incorrect message while accessing pages without permission #10735

Merged
merged 4 commits into from
Feb 3, 2025
+6 −1
Merged

Fixed grammatically incorrect message while accessing pages without permission #10735

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b93383e
Fixed grammatically incorrect message while accessing pages without p…
pranav-027 Jan 29, 2025
6e443ec
key fix
pranav-027 Jan 29, 2025
abb1efc
key fix #2
pranav-027 Jan 29, 2025
f866ef1
switch -> if else
pranav-027 Feb 3, 2025
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
7 changes: 6 additions & 1 deletion app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ def doorkeeper_unauthorized_render_options(error: nil)
def redirect_to_root_unless_user(action, *)
redirecting = !current_user&.send(action, *)
if redirecting
flash[:danger] = "You are not allowed to #{action.to_s.sub(/^can_/, '').chomp('?').humanize.downcase}"
flash[:danger] = case action
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the case statement only has one actual case (disregarding the else as a fallback) then why not use if?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. I have changed it to if now

when :has_permission?
t("application.no_permission")
else
"You are not allowed to #{action.to_s.sub(/^can_/, '').chomp('?').humanize.downcase}"
end
redirect_to root_url
end
redirecting
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2879,3 +2879,5 @@ en:
missing_scrambles_for_multi_error: "[%{round_id}] While you may have multiple groups in 3x3x3 Multi-Blind, at least one of the groups must contain scrambles for all attempts."
multiple_fmc_groups_warning: "[%{round_id}] There are multiple groups of FMC used. If one group of FMC was used, please use the Scrambles Matcher to uncheck the unused scrambles. Otherwise, please include a comment to WRT explaining why multiple groups of FMC were used."
wrong_number_of_scramble_sets_error: "[%{round_id}] This round has a different number of scramble sets than specified on the Manage Events tab. Please adjust the number of scramble sets in the Manage Events tab to the number of sets that were used."
application:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You already have the common and homepage keys. There is also errors.messages. Feel free to use either of those, no need to introduce a new "application" key.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

no_permission: "You do not have the required permissions to access this page."