diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 4d059cae6..62ff427ef 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -24,6 +24,6 @@ class StatsController < ApplicationController private def daily_cache(key, &block) - Rails.cache.fetch("public_stats/#{Time.current.strftime('%Y-%m-%d')}/#{key}", &block) + Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block) end end diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index b277ae3eb..b17278019 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -18,7 +18,7 @@ module DocumentablesHelper def accepted_content_types_extensions(documentable_class) documentable_class.accepted_content_types - .collect{ |content_type| ".#{content_type.split('/').last}" } + .collect{ |content_type| ".#{content_type.split("/").last}" } .join(",") end diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb index 04c48d6c3..768578f75 100644 --- a/app/helpers/imageables_helper.rb +++ b/app/helpers/imageables_helper.rb @@ -22,7 +22,7 @@ module ImageablesHelper def imageable_accepted_content_types_extensions Image::ACCEPTED_CONTENT_TYPE - .collect{ |content_type| ".#{content_type.split('/').last}" } + .collect{ |content_type| ".#{content_type.split("/").last}" } .join(",") end diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index d05f2c722..4d17efb2d 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -57,9 +57,9 @@ module MapLocationsHelper map_tiles_provider_attribution: Rails.application.secrets.map_tiles_provider_attribution, marker_editable: editable, marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", - latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", - longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", - zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}", + latitude_input_selector: "##{map_location_input_id(parent_class, "latitude")}", + longitude_input_selector: "##{map_location_input_id(parent_class, "longitude")}", + zoom_input_selector: "##{map_location_input_id(parent_class, "zoom")}", marker_investments_coordinates: investments_coordinates } options[:marker_latitude] = map_location.latitude if map_location.latitude.present? diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index 56b1dd079..9f2f27528 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -18,7 +18,7 @@ module ValuationHelper when 0 t("valuation.budget_investments.index.no_valuators_assigned") when 1 - "".html_safe + + "".html_safe + valuators.first.name + "".html_safe else diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index eded65fb8..f7928ff7e 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,5 +1,5 @@ class ApplicationMailer < ActionMailer::Base helper :settings - default from: "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>" + default from: "#{Setting["mailer_from_name"]} <#{Setting["mailer_from_address"]}>" layout "mailer" end diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 0021755dc..f2095c746 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -218,7 +218,7 @@ class Budget end def code - "#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") + "#{created_at.strftime("%Y")}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") end def send_unfeasible_email diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index cbf25bccf..0e1a39c90 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -120,7 +120,7 @@ class Legislation::Proposal < ActiveRecord::Base end def code - "#{Setting['proposal_code_prefix']}-#{created_at.strftime('%Y-%m')}-#{id}" + "#{Setting["proposal_code_prefix"]}-#{created_at.strftime("%Y-%m")}-#{id}" end def after_commented diff --git a/app/models/proposal.rb b/app/models/proposal.rb index cfaf197d1..dfba48df1 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -163,7 +163,7 @@ class Proposal < ActiveRecord::Base end def code - "#{Setting['proposal_code_prefix']}-#{created_at.strftime('%Y-%m')}-#{id}" + "#{Setting["proposal_code_prefix"]}-#{created_at.strftime("%Y-%m")}-#{id}" end def after_commented diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 3bd753476..2b6b9fd67 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -109,7 +109,7 @@ class SpendingProposal < ActiveRecord::Base end def code - "#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") + "#{created_at.strftime("%Y")}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "") end def send_unfeasible_email diff --git a/app/models/user.rb b/app/models/user.rb index e02c93d99..e62b55273 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -238,7 +238,7 @@ class User < ActiveRecord::Base Poll::Voter.where(user_id: other_user.id).update_all(user_id: id) Budget::Ballot.where(user_id: other_user.id).update_all(user_id: id) Vote.where("voter_id = ? AND voter_type = ?", other_user.id, "User").update_all(voter_id: id) - data_log = "id: #{other_user.id} - #{Time.current.strftime('%Y-%m-%d %H:%M:%S')}" + data_log = "id: #{other_user.id} - #{Time.current.strftime("%Y-%m-%d %H:%M:%S")}" update(former_users_data_log: "#{former_users_data_log} | #{data_log}") end diff --git a/app/views/admin/homepage/_setting.html.erb b/app/views/admin/homepage/_setting.html.erb index 1398f6951..dc95a5f9c 100644 --- a/app/views/admin/homepage/_setting.html.erb +++ b/app/views/admin/homepage/_setting.html.erb @@ -4,8 +4,8 @@ <%= f.hidden_field :value, value: (setting.enabled? ? "" : "active") %> - <%= f.submit(t("admin.settings.index.features.#{setting.enabled? ? 'disable' : 'enable'}"), - class: "button #{setting.enabled? ? 'hollow alert' : 'success'}", + <%= f.submit(t("admin.settings.index.features.#{setting.enabled? ? "disable" : "enable"}"), + class: "button #{setting.enabled? ? "hollow alert" : "success"}", data: {confirm: t("admin.actions.confirm")}) %> <% end %> diff --git a/app/views/admin/legislation/draft_versions/index.html.erb b/app/views/admin/legislation/draft_versions/index.html.erb index 5ebafd837..0abbf128d 100644 --- a/app/views/admin/legislation/draft_versions/index.html.erb +++ b/app/views/admin/legislation/draft_versions/index.html.erb @@ -38,7 +38,7 @@ <% if draft_version.status == "draft" %> <%= t("admin.legislation.draft_versions.statuses.draft") %> - <%= link_to "(#{t('.preview')})", legislation_process_draft_version_path(@process, draft_version) %> + <%= link_to "(#{t(".preview")})", legislation_process_draft_version_path(@process, draft_version) %> <% else %> <%= t("admin.legislation.draft_versions.statuses.published") %> <% end %> diff --git a/app/views/admin/settings/_featured_settings_table.html.erb b/app/views/admin/settings/_featured_settings_table.html.erb index c8b32c7de..5de1dc9b1 100644 --- a/app/views/admin/settings/_featured_settings_table.html.erb +++ b/app/views/admin/settings/_featured_settings_table.html.erb @@ -35,8 +35,8 @@ <%= form_for(feature, url: admin_setting_path(feature), html: { id: "edit_#{dom_id(feature)}"}) do |f| %> <%= f.hidden_field :value, id: dom_id(feature), value: (feature.enabled? ? "" : "active") %> - <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? 'disable' : 'enable'}"), - class: "button expanded #{feature.enabled? ? 'hollow alert' : 'success'}", + <%= f.submit(t("admin.settings.index.features.#{feature.enabled? ? "disable" : "enable"}"), + class: "button expanded #{feature.enabled? ? "hollow alert" : "success"}", data: {confirm: t("admin.actions.confirm")}) %> <% end %> diff --git a/app/views/admin/widget/cards/_form.html.erb b/app/views/admin/widget/cards/_form.html.erb index 3d4e99f6d..413be15d1 100644 --- a/app/views/admin/widget/cards/_form.html.erb +++ b/app/views/admin/widget/cards/_form.html.erb @@ -37,5 +37,5 @@ - <%= f.submit(t("admin.homepage.#{action_name}.#{@card.header? ? 'submit_header' : 'submit_card'}"), class: "button success") %> + <%= f.submit(t("admin.homepage.#{action_name}.#{@card.header? ? "submit_header" : "submit_card"}"), class: "button success") %> <% end %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 634347da8..1337be64b 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -2,7 +2,7 @@

- <%= link_to t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> + <%= link_to t("layouts.header.open_gov", open: "#{t("layouts.header.open")}").html_safe %>

@@ -37,7 +37,7 @@

    <% if setting["twitter_handle"] %>
  • - <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", + <%= link_to "https://twitter.com/#{setting["twitter_handle"]}", target: "_blank", title: t("shared.go_to_page") + t("social.twitter", org: setting["org_name"]) + t("shared.target_blank_html") do %> <%= t("social.twitter", org: setting["org_name"]) %> @@ -46,7 +46,7 @@ <% end %> <% if setting["facebook_handle"] %>
  • - <%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank", + <%= link_to "https://www.facebook.com/#{setting["facebook_handle"]}/", target: "_blank", title: t("shared.go_to_page") + t("social.facebook", org: setting["org_name"]) + t("shared.target_blank_html") do %> <%= t("social.facebook", org: setting["org_name"]) %> @@ -55,7 +55,7 @@ <% end %> <% if setting["youtube_handle"] %>
  • - <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank", + <%= link_to "https://www.youtube.com/#{setting["youtube_handle"]}", target: "_blank", title: t("shared.go_to_page") + t("social.youtube", org: setting["org_name"]) + t("shared.target_blank_html") do %> <%= t("social.youtube", org: setting["org_name"]) %> @@ -64,7 +64,7 @@ <% end %> <% if setting["telegram_handle"] %>
  • - <%= link_to "https://www.telegram.me/#{setting['telegram_handle']}", target: "_blank", + <%= link_to "https://www.telegram.me/#{setting["telegram_handle"]}", target: "_blank", title: t("shared.go_to_page") + t("social.telegram", org: setting["org_name"]) + t("shared.target_blank_html") do %> <%= t("social.telegram", org: setting["org_name"]) %> @@ -73,7 +73,7 @@ <% end %> <% if setting["instagram_handle"] %>
  • - <%= link_to "https://www.instagram.com/#{setting['instagram_handle']}", target: "_blank", + <%= link_to "https://www.instagram.com/#{setting["instagram_handle"]}", target: "_blank", title: t("shared.go_to_page") + t("social.instagram", org: setting["org_name"]) + t("shared.target_blank_html") do %> <%= t("social.instagram", org: setting["org_name"]) %> diff --git a/app/views/legislation/annotations/index.html.erb b/app/views/legislation/annotations/index.html.erb index c9f537ec9..83f0e9d07 100644 --- a/app/views/legislation/annotations/index.html.erb +++ b/app/views/legislation/annotations/index.html.erb @@ -1,4 +1,4 @@ -<% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %> +<% provide :title do %><%= "#{t(".title")} - #{@draft_version.title} - #{@process.title}" %><% end %> <%= render "legislation/processes/header", process: @process, header: :small %> diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb index ebb4b7f51..52e2e7bc3 100644 --- a/app/views/legislation/annotations/show.html.erb +++ b/app/views/legislation/annotations/show.html.erb @@ -1,4 +1,4 @@ -<% provide :title do %><%= "#{t('.title')} - #{@draft_version.title} - #{@process.title}" %><% end %> +<% provide :title do %><%= "#{t(".title")} - #{@draft_version.title} - #{@process.title}" %><% end %> <%= render "legislation/processes/header", process: @process, header: :small %> diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb index d4c8b46f7..faf99524d 100644 --- a/app/views/legislation/draft_versions/changes.html.erb +++ b/app/views/legislation/draft_versions/changes.html.erb @@ -1,4 +1,4 @@ -<% provide :title do %><%= "#{@draft_version.title} - #{t('.title')} - #{@process.title}" %><% end %> +<% provide :title do %><%= "#{@draft_version.title} - #{t(".title")} - #{@process.title}" %><% end %> <%= render "legislation/processes/header", process: @process, header: :small %> diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb index 9d94edbed..531f35a7b 100644 --- a/app/views/shared/_social_share.html.erb +++ b/app/views/shared/_social_share.html.erb @@ -1,14 +1,14 @@ <% description = local_assigns.fetch(:description, "") %> <% description = truncate(ActionView::Base.full_sanitizer.sanitize(description), length: 140) %> <% mobile = local_assigns[:mobile] %> -<% mobile_url = mobile.present? ? "#{mobile.gsub(/\s+/, '%20')}%20" : "" %> +<% mobile_url = mobile.present? ? "#{mobile.gsub(/\s+/, "%20")}%20" : "" %> <% if local_assigns[:share_title].present? %>

    <%= share_title %>

    <% end %>