diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index f313fcaf2..72a427c59 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -6,7 +6,7 @@ module CommentableActions def index @resources = resource_model.all - @resources = @current_order == "recommended" && current_user.present? ? @resources.recommended(current_user) : @resources.for_render + @resources = @current_order == "recommendations" && current_user.present? ? @resources.recommendations(current_user) : @resources.for_render @resources = @resources.search(@search_terms) if @search_terms.present? @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources @resources = @resources.tagged_with(@tag_filter) if @tag_filter diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index da66c061a..a4f885d3e 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -17,8 +17,8 @@ class WelcomeController < ApplicationController private def set_user_recommendations - @recommended_debates = Debate.recommended(current_user).limit(3) - @recommended_proposals = Proposal.recommended(current_user).limit(3) + @recommended_debates = Debate.recommendations(current_user).limit(3) + @recommended_proposals = Proposal.recommendations(current_user).limit(3) end end diff --git a/app/models/debate.rb b/app/models/debate.rb index 805795606..e9f091d38 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -37,7 +37,7 @@ class Debate < ActiveRecord::Base scope :sort_by_random, -> { reorder("RANDOM()") } scope :sort_by_relevance, -> { all } scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } - scope :sort_by_recommended, -> { order(cached_votes_total: :desc) } + scope :sort_by_recommendations, -> { order(cached_votes_total: :desc) } scope :last_week, -> { where("created_at >= ?", 7.days.ago)} scope :featured, -> { where("featured_at is not null")} scope :public_for_api, -> { all } @@ -47,9 +47,9 @@ class Debate < ActiveRecord::Base attr_accessor :link_required - def self.recommended(user) + def self.recommendations(user) debates_list = where("author_id != ?", user.id) - # same as tagged_with(user.interests, any: true) + # same as tagged_with(user.interests, any: true) debates_list_with_tagged = debates_list.joins(:tags).where('taggings.taggable_type = ?', self.name).where('tags.name IN (?)', user.interests) if debates_list_with_tagged.any? debates_list = debates_list_with_tagged @@ -150,7 +150,7 @@ class Debate < ActiveRecord::Base def self.debates_orders(user) orders = %w{hot_score confidence_score created_at relevance} - orders << "recommended" if user.present? + orders << "recommendations" if user.present? orders end end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index c3a75aedf..9fa5fb2b0 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -48,7 +48,7 @@ class Proposal < ActiveRecord::Base scope :sort_by_relevance, -> { all } scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } scope :sort_by_archival_date, -> { archived.sort_by_confidence_score } - scope :sort_by_recommended, -> { order(cached_votes_up: :desc) } + scope :sort_by_recommendations, -> { order(cached_votes_up: :desc) } scope :archived, -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago) } scope :not_archived, -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago) } scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)} @@ -57,9 +57,9 @@ class Proposal < ActiveRecord::Base scope :successful, -> { where("cached_votes_up >= ?", Proposal.votes_needed_for_success) } scope :public_for_api, -> { all } - def self.recommended(user) + def self.recommendations(user) proposals_list = where("author_id != ?", user.id) - # same as tagged_with(user.interests, any: true) + # same as tagged_with(user.interests, any: true) proposals_list_with_tagged = proposals_list.joins(:tags).where('taggings.taggable_type = ?', self.name) .where('tags.name IN (?)', user.interests) if proposals_list_with_tagged.any? @@ -191,7 +191,7 @@ class Proposal < ActiveRecord::Base def self.proposals_orders(user) orders = %w{hot_score confidence_score created_at relevance archival_date} - orders << "recommended" if user.present? + orders << "recommendations" if user.present? orders end diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index fc58c85e1..99de4ec17 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -12,7 +12,7 @@ image_default: "https://dummyimage.com/600x400/000/fff", carousel_size: carousel_size, btn_text_link: t("welcome.recommended.debates.btn_text_link"), - btn_path_link: debates_path(order: "recommended") %> + btn_path_link: debates_path(order: "recommendations") %> <% end %> <% if recommended_proposals.any? %> @@ -24,7 +24,7 @@ image_default: "https://dummyimage.com/600x400/000/fff", carousel_size: carousel_size, btn_text_link: t("welcome.recommended.proposals.btn_text_link"), - btn_path_link: proposals_path(order: "recommended") %> + btn_path_link: proposals_path(order: "recommendations") %> <% end %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 8367df00a..c6adeb22b 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -108,6 +108,7 @@ en: hot_score: most active most_commented: most commented relevance: relevance + recommendations: recommendations search_form: button: Search placeholder: Search debates... @@ -329,6 +330,7 @@ en: most_commented: most commented relevance: relevance archival_date: Archived + recommendations: recommendations retired_proposals: Retired proposals retired_proposals_link: "Proposals retired by the author" retired_links: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 3f2dfc103..fb9167087 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -108,6 +108,7 @@ es: hot_score: Más activos hoy most_commented: Más comentados relevance: Más relevantes + recommendations: Recomendaciones search_form: button: Buscar placeholder: Buscar debates... @@ -329,6 +330,7 @@ es: most_commented: Más comentadas relevance: Más relevantes archival_date: Archivadas + recommendations: Recomendaciones retired_proposals: Propuestas retiradas retired_proposals_link: "Propuestas retiradas por sus autores" retired_links: