From b460c024f3d1f024a3bdbbe0e8ab51da742b1bf1 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Fri, 15 Mar 2019 09:26:49 +0100 Subject: [PATCH] Use double quotes in app/helpers --- .../admin_budget_investments_helper.rb | 2 +- app/helpers/admin_helper.rb | 8 ++++---- app/helpers/application_helper.rb | 4 ++-- app/helpers/budgets_helper.rb | 4 ++-- app/helpers/debates_helper.rb | 4 ++-- app/helpers/documentables_helper.rb | 2 +- app/helpers/documents_helper.rb | 8 ++++---- app/helpers/embed_videos_helper.rb | 4 ++-- app/helpers/followables_helper.rb | 4 ++-- app/helpers/follows_helper.rb | 4 ++-- app/helpers/imageables_helper.rb | 2 +- app/helpers/images_helper.rb | 8 ++++---- app/helpers/layouts_helper.rb | 2 +- app/helpers/legislation_helper.rb | 4 ++-- app/helpers/officers_helper.rb | 2 +- app/helpers/polls_helper.rb | 2 +- app/helpers/search_helper.rb | 4 ++-- app/helpers/settings.rb | 4 ++-- app/helpers/stats_helper.rb | 8 ++++---- app/helpers/tags_helper.rb | 20 +++++++++---------- app/helpers/tracks_helper.rb | 4 ++-- app/helpers/users_helper.rb | 8 ++++---- app/helpers/valuation_helper.rb | 4 ++-- app/helpers/valuators_helper.rb | 4 ++-- app/helpers/verification_helper.rb | 6 +++--- app/helpers/votes_helper.rb | 4 ++-- app/helpers/welcome_helper.rb | 2 +- 27 files changed, 66 insertions(+), 66 deletions(-) diff --git a/app/helpers/admin_budget_investments_helper.rb b/app/helpers/admin_budget_investments_helper.rb index 492225e35..5c2dc479e 100644 --- a/app/helpers/admin_budget_investments_helper.rb +++ b/app/helpers/admin_budget_investments_helper.rb @@ -1,7 +1,7 @@ module AdminBudgetInvestmentsHelper def advanced_menu_visibility - (params[:advanced_filters].empty? && params["min_total_supports"].blank?) ? 'hide' : '' + (params[:advanced_filters].empty? && params["min_total_supports"].blank?) ? "hide" : "" end def init_advanced_menu diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index f5c442ba5..452d58937 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,7 +1,7 @@ module AdminHelper def side_menu - if namespace == 'moderation/budgets' + if namespace == "moderation/budgets" render "/moderation/menu" else render "/#{namespace}/menu" @@ -13,7 +13,7 @@ module AdminHelper end def namespaced_header_title - if namespace == 'moderation/budgets' + if namespace == "moderation/budgets" t("moderation.header.title") else t("#{namespace}.header.title") @@ -71,13 +71,13 @@ module AdminHelper def official_level_options options = [["", 0]] (1..5).each do |i| - options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(': '), i] + options << [[t("admin.officials.level_#{i}"), setting["official_level_#{i}_name"]].compact.join(": "), i] end options end def admin_select_options - Administrator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] } + Administrator.all.order("users.username asc").includes(:user).collect { |v| [ v.name, v.id ] } end def admin_submit_action(resource) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a56ea7fd5..0a934ac9e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,10 +4,10 @@ module ApplicationHelper return false if user_signed_in? # Using path because fullpath yields false negatives since it contains # parameters too - request.path == '/' + request.path == "/" end - # if current path is /debates current_path_with_query_params(foo: 'bar') returns /debates?foo=bar + # if current path is /debates current_path_with_query_params(foo: "bar") returns /debates?foo=bar # notice: if query_params have a param which also exist in current path, it "overrides" (query_params is merged last) def current_path_with_query_params(query_parameters) url_for(request.query_parameters.merge(query_parameters)) diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb index 8611fc652..df48a08fa 100644 --- a/app/helpers/budgets_helper.rb +++ b/app/helpers/budgets_helper.rb @@ -1,12 +1,12 @@ module BudgetsHelper def show_links_to_budget_investments(budget) - ['balloting', 'reviewing_ballots', 'finished'].include? budget.phase + ["balloting", "reviewing_ballots", "finished"].include? budget.phase end def heading_name_and_price_html(heading, budget) content_tag :div do - concat(heading.name + ' ') + concat(heading.name + " ") concat(content_tag(:span, budget.formatted_heading_price(heading))) end end diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb index f81d69809..7771a2561 100644 --- a/app/helpers/debates_helper.rb +++ b/app/helpers/debates_helper.rb @@ -6,9 +6,9 @@ module DebatesHelper def empty_recommended_debates_message_text(user) if user.interests.any? - t('debates.index.recommendations.without_results') + t("debates.index.recommendations.without_results") else - t('debates.index.recommendations.without_interests') + t("debates.index.recommendations.without_interests") end end diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index 5c3181c95..b277ae3eb 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -1,7 +1,7 @@ module DocumentablesHelper def documentable_class(documentable) - documentable.class.name.parameterize('_') + documentable.class.name.parameterize("_") end def max_documents_allowed(documentable) diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 4766de0aa..b0facdacc 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -5,7 +5,7 @@ module DocumentsHelper end def document_errors_on_attachment(document) - document.errors[:attachment].join(', ') if document.errors.key?(:attachment) + document.errors[:attachment].join(", ") if document.errors.key?(:attachment) end def bytes_to_mega(bytes) @@ -18,7 +18,7 @@ module DocumentsHelper def render_destroy_document_link(builder, document) if !document.persisted? && document.cached_attachment.present? - link_to t('documents.form.delete_button'), + link_to t("documents.form.delete_button"), direct_upload_destroy_url("direct_upload[resource_type]": document.documentable_type, "direct_upload[resource_id]": document.documentable_id, "direct_upload[resource_relation]": "documents", @@ -27,7 +27,7 @@ module DocumentsHelper remote: true, class: "delete remove-cached-attachment" else - link_to_remove_association document.new_record? ? t('documents.form.cancel_button') : t('documents.form.delete_button') , builder, class: "delete remove-document" + link_to_remove_association document.new_record? ? t("documents.form.cancel_button") : t("documents.form.delete_button") , builder, class: "delete remove-document" end end @@ -40,7 +40,7 @@ module DocumentsHelper html += builder.file_field :attachment, label: false, accept: accepted_content_types_extensions(document.documentable_type.constantize), - class: 'js-document-attachment', + class: "js-document-attachment", data: { url: document_direct_upload_url(document), nested_document: true diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb index 823659cca..645376525 100644 --- a/app/helpers/embed_videos_helper.rb +++ b/app/helpers/embed_videos_helper.rb @@ -5,7 +5,7 @@ module EmbedVideosHelper def embedded_video_code link = @proposal.video_url - title = t('proposals.show.embed_video_title', proposal: @proposal.title) + title = t("proposals.show.embed_video_title", proposal: @proposal.title) if link =~ /vimeo.*/ server = "Vimeo" elsif link =~ /youtu*.*/ @@ -27,7 +27,7 @@ module EmbedVideosHelper if match && match[2] '' else - '' + "" end end diff --git a/app/helpers/followables_helper.rb b/app/helpers/followables_helper.rb index f7dd4a7a0..48dd761ce 100644 --- a/app/helpers/followables_helper.rb +++ b/app/helpers/followables_helper.rb @@ -6,8 +6,8 @@ module FollowablesHelper def followable_icon(followable) { - proposals: 'Proposal', - budget: 'Budget::Investment' + proposals: "Proposal", + budget: "Budget::Investment" }.invert[followable] end diff --git a/app/helpers/follows_helper.rb b/app/helpers/follows_helper.rb index b3426df12..1508e4c25 100644 --- a/app/helpers/follows_helper.rb +++ b/app/helpers/follows_helper.rb @@ -2,12 +2,12 @@ module FollowsHelper def follow_text(followable) entity = followable.class.name.underscore - t('shared.follow_entity', entity: t("activerecord.models.#{entity}.one").downcase) + t("shared.follow_entity", entity: t("activerecord.models.#{entity}.one").downcase) end def unfollow_text(followable) entity = followable.class.name.underscore - t('shared.unfollow_entity', entity: t("activerecord.models.#{entity}.one").downcase) + t("shared.unfollow_entity", entity: t("activerecord.models.#{entity}.one").downcase) end end diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb index 8cae1b989..04c48d6c3 100644 --- a/app/helpers/imageables_helper.rb +++ b/app/helpers/imageables_helper.rb @@ -5,7 +5,7 @@ module ImageablesHelper end def imageable_class(imageable) - imageable.class.name.parameterize('_') + imageable.class.name.parameterize("_") end def imageable_max_file_size diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index 208ccf5ab..1998e63f5 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -19,7 +19,7 @@ module ImagesHelper end def image_errors_on_attachment(image) - image.errors[:attachment].join(', ') if image.errors.key?(:attachment) + image.errors[:attachment].join(", ") if image.errors.key?(:attachment) end def image_bytes_to_megabytes(bytes) @@ -32,7 +32,7 @@ module ImagesHelper def render_destroy_image_link(builder, image) if !image.persisted? && image.cached_attachment.present? - link_to t('images.form.delete_button'), + link_to t("images.form.delete_button"), direct_upload_destroy_url("direct_upload[resource_type]": image.imageable_type, "direct_upload[resource_id]": image.imageable_id, "direct_upload[resource_relation]": "image", @@ -41,7 +41,7 @@ module ImagesHelper remote: true, class: "delete remove-cached-attachment" else - link_to_remove_association t('images.form.delete_button'), builder, class: "delete remove-image" + link_to_remove_association t("images.form.delete_button"), builder, class: "delete remove-image" end end @@ -54,7 +54,7 @@ module ImagesHelper html += builder.file_field :attachment, label: false, accept: imageable_accepted_content_types_extensions, - class: 'js-image-attachment', + class: "js-image-attachment", data: { url: image_direct_upload_url(imageable), nested_image: true diff --git a/app/helpers/layouts_helper.rb b/app/helpers/layouts_helper.rb index 782d9c639..b88547d8a 100644 --- a/app/helpers/layouts_helper.rb +++ b/app/helpers/layouts_helper.rb @@ -2,7 +2,7 @@ module LayoutsHelper def layout_menu_link_to(text, path, is_active, options) if is_active - content_tag(:span, t('shared.you_are_in'), class: 'show-for-sr') + ' ' + + content_tag(:span, t("shared.you_are_in"), class: "show-for-sr") + " " + link_to(text, path, options.merge(class: "is-active")) else link_to(text, path, options) diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb index 2f5eac13f..415de8e74 100644 --- a/app/helpers/legislation_helper.rb +++ b/app/helpers/legislation_helper.rb @@ -14,10 +14,10 @@ module LegislationHelper def link_to_toggle_legislation_proposal_selection(proposal) if proposal.selected? button_text = t("admin.legislation.proposals.index.selected") - html_class = 'button expanded' + html_class = "button expanded" else button_text = t("admin.legislation.proposals.index.select") - html_class = 'button hollow expanded' + html_class = "button hollow expanded" end link_to button_text, diff --git a/app/helpers/officers_helper.rb b/app/helpers/officers_helper.rb index 31c0a6ad4..e069cb9aa 100644 --- a/app/helpers/officers_helper.rb +++ b/app/helpers/officers_helper.rb @@ -1,7 +1,7 @@ module OfficersHelper def officer_label(officer) - truncate([officer.name, officer.email].compact.join(' - '), length: 100) + truncate([officer.name, officer.email].compact.join(" - "), length: 100) end def vote_collection_shift? diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index 8135e8ab8..06d2f78f7 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -42,7 +42,7 @@ module PollsHelper end def poll_voter_token(poll, user) - Poll::Voter.where(poll: poll, user: user, origin: "web").first&.token || '' + Poll::Voter.where(poll: poll, user: user, origin: "web").first&.token || "" end def voted_before_sign_in(question) diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index ebde2a954..b38048fb1 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -11,12 +11,12 @@ module SearchHelper [t("shared.advanced_search.date_2"), 2], [t("shared.advanced_search.date_3"), 3], [t("shared.advanced_search.date_4"), 4], - [t("shared.advanced_search.date_5"), 'custom']], + [t("shared.advanced_search.date_5"), "custom"]], selected_date_range) end def selected_date_range - custom_date_range? ? 'custom' : params[:advanced_search].try(:[], :date_min) + custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min) end def custom_date_range? diff --git a/app/helpers/settings.rb b/app/helpers/settings.rb index d308535ab..209237f99 100644 --- a/app/helpers/settings.rb +++ b/app/helpers/settings.rb @@ -1,7 +1,7 @@ module SettingsHelper def setting_for_widget(widget) - Setting.where(key: 'feature.user.recommendations').first + Setting.where(key: "feature.user.recommendations").first end -end \ No newline at end of file +end diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index 19b54a5a2..b36977b3e 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -1,28 +1,28 @@ module StatsHelper def events_chart_tag(events, opt = {}) - events = events.join(',') if events.is_a? Array + events = events.join(",") if events.is_a? Array opt[:data] ||= {} opt[:data][:graph] = admin_api_stats_path(events: events) content_tag :div, "", opt end def visits_chart_tag(opt = {}) - events = events.join(',') if events.is_a? Array + events = events.join(",") if events.is_a? Array opt[:data] ||= {} opt[:data][:graph] = admin_api_stats_path(visits: true) content_tag :div, "", opt end def spending_proposals_chart_tag(opt = {}) - events = events.join(',') if events.is_a? Array + events = events.join(",") if events.is_a? Array opt[:data] ||= {} opt[:data][:graph] = admin_api_stats_path(spending_proposals: true) content_tag :div, "", opt end def budget_investments_chart_tag(opt = {}) - events = events.join(',') if events.is_a? Array + events = events.join(",") if events.is_a? Array opt[:data] ||= {} opt[:data][:graph] = admin_api_stats_path(budget_investments: true) content_tag :div, "", opt diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index b31f3167f..ce0445092 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -2,32 +2,32 @@ module TagsHelper def taggables_path(taggable_type, tag_name) case taggable_type - when 'debate' + when "debate" debates_path(search: tag_name) - when 'proposal' + when "proposal" proposals_path(search: tag_name) - when 'budget/investment' + when "budget/investment" budget_investments_path(@budget, search: tag_name) - when 'legislation/proposal' + when "legislation/proposal" legislation_process_proposals_path(@process, search: tag_name) else - '#' + "#" end end def taggable_path(taggable) taggable_type = taggable.class.name.underscore case taggable_type - when 'debate' + when "debate" debate_path(taggable) - when 'proposal' + when "proposal" proposal_path(taggable) - when 'budget/investment' + when "budget/investment" budget_investment_path(taggable.budget_id, taggable) - when 'legislation/proposal' + when "legislation/proposal" legislation_process_proposal_path(@process, taggable) else - '#' + "#" end end diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb index 0d6793e08..f63fe7852 100644 --- a/app/helpers/tracks_helper.rb +++ b/app/helpers/tracks_helper.rb @@ -4,11 +4,11 @@ module TracksHelper track_data = "" prefix = " data-track-event-" data.each do |key, value| - track_data = track_data + prefix + key.to_s + '=' + value + " " + track_data = track_data + prefix + key.to_s + "=" + value + " " end content_for :track_event do track_data end end -end \ No newline at end of file +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 4098b535e..13e537835 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -16,8 +16,8 @@ module UsersHelper if commentable.nil? deleted_commentable_text(comment) elsif commentable.hidden? - content_tag(:del, commentable.title) + ' ' + - content_tag(:span, '(' + deleted_commentable_text(comment) + ')', class: 'small') + content_tag(:del, commentable.title) + " " + + content_tag(:span, "(" + deleted_commentable_text(comment) + ")", class: "small") else link_to(commentable.title, comment) end @@ -58,9 +58,9 @@ module UsersHelper def interests_title_text(user) if current_user == user - t('account.show.public_interests_my_title_list') + t("account.show.public_interests_my_title_list") else - t('account.show.public_interests_user_title_list') + t("account.show.public_interests_user_title_list") end end diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index 1c11cb90b..56b1dd079 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -22,8 +22,8 @@ module ValuationHelper valuators.first.name + "".html_safe else - "".html_safe + - t('valuation.budget_investments.index.valuators_assigned', count: valuators.size) + + "".html_safe + + t("valuation.budget_investments.index.valuators_assigned", count: valuators.size) + "".html_safe end end diff --git a/app/helpers/valuators_helper.rb b/app/helpers/valuators_helper.rb index 752713ed3..17dd7fc24 100644 --- a/app/helpers/valuators_helper.rb +++ b/app/helpers/valuators_helper.rb @@ -1,7 +1,7 @@ module ValuatorsHelper def valuator_label(valuator) - truncate([valuator.name, valuator.email, valuator.description].compact.join(' - '), length: 100) + truncate([valuator.name, valuator.email, valuator.description].compact.join(" - "), length: 100) end -end \ No newline at end of file +end diff --git a/app/helpers/verification_helper.rb b/app/helpers/verification_helper.rb index 44f921264..121a3e903 100644 --- a/app/helpers/verification_helper.rb +++ b/app/helpers/verification_helper.rb @@ -1,9 +1,9 @@ module VerificationHelper def document_types - [[t('verification.residence.new.document_type.spanish_id'), 1], - [t('verification.residence.new.document_type.passport'), 2], - [t('verification.residence.new.document_type.residence_card'), 3]] + [[t("verification.residence.new.document_type.spanish_id"), 1], + [t("verification.residence.new.document_type.passport"), 2], + [t("verification.residence.new.document_type.residence_card"), 3]] end def mask_phone(number) diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb index dc1df0396..4255b7656 100644 --- a/app/helpers/votes_helper.rb +++ b/app/helpers/votes_helper.rb @@ -6,9 +6,9 @@ module VotesHelper def votes_percentage(vote, debate) return "0%" if debate.total_votes == 0 - if vote == 'likes' + if vote == "likes" debate_percentage_of_likes(debate).to_s + "%" - elsif vote == 'dislikes' + elsif vote == "dislikes" (100 - debate_percentage_of_likes(debate)).to_s + "%" end end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 07d7b380a..fa729492e 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -15,7 +15,7 @@ module WelcomeHelper when "Proposal" proposal_path(recommended) else - '#' + "#" end end