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 Rubocop violations and normalize locales #9305

Merged
merged 2 commits into from
May 16, 2022
Merged

Fix Rubocop violations and normalize locales #9305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258da99
Normalize locales
ahukkanen May 13, 2022
00ed85d
Fix Rubocop violations in budgets permissions
ahukkanen May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions decidim-budgets/app/permissions/decidim/budgets/admin/permissions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,17 @@ def permissions
end
when :project, :projects
case permission_action.action
when :create, :import_proposals
when :create, :import_proposals, :project_category
permission_action.allow!
when :update, :destroy
permission_action.allow! if project.present?
when :project_category
permission_action.allow!
end
when :order
case permission_action.action
when :remind
permission_action.allow!
end
when :project_category
permission_action.allow!
when :project_scope
permission_action.allow!
when :project_selected
when :project_category, :project_scope, :project_selected
permission_action.allow!
end

Expand Down
4 changes: 2 additions & 2 deletions decidim-meetings/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ en:
select_a_meeting_type: Please select a meeting type
select_a_registration_type: Please select a registration type
select_an_iframe_access_level: Please select an iframe access level
show_embedded_iframe_help: "Only a few services allow embedding in meeting or live event from the following domains: %{domains}"
show_embedded_iframe_help: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
index:
title: Meetings
new:
Expand Down Expand Up @@ -509,7 +509,7 @@ en:
select_a_meeting_type: Please select a meeting type
select_a_registration_type: Please select a registration type
select_an_iframe_access_level: Please select an iframe access level
show_embedded_iframe_help: "Only a few services allow embedding in meeting or live event from the following domains: %{domains}"
show_embedded_iframe_help: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
index:
click_here: See all meetings
new_meeting: New meeting
Expand Down