From b9e137619a129a9f283a4fb6e1cb5952c40c1675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 15 Mar 2024 22:43:11 +0100
Subject: [PATCH] Simplify the way we provide the title in most cases

This is consistent with the way we're providing the main class.

Note we're still setting the title using a block in more complex cases.
---
 app/components/sdg/goals/help_page_component.html.erb   | 2 +-
 app/components/sdg/goals/index_component.html.erb       | 2 +-
 app/components/sdg/goals/show_component.html.erb        | 2 +-
 app/views/admin/audits/show.html.erb                    | 4 +---
 app/views/budgets/index.html.erb                        | 2 +-
 app/views/budgets/investments/index.html.erb            | 2 +-
 app/views/budgets/investments/show.html.erb             | 2 +-
 app/views/budgets/show.html.erb                         | 2 +-
 app/views/budgets/stats/show.html.erb                   | 4 +---
 app/views/debates/index.html.erb                        | 2 +-
 app/views/debates/show.html.erb                         | 2 +-
 app/views/devise/confirmations/new.html.erb             | 2 +-
 app/views/devise/confirmations/show.html.erb            | 2 +-
 app/views/devise/passwords/new.html.erb                 | 2 +-
 app/views/devise/sessions/new.html.erb                  | 2 +-
 app/views/legislation/draft_versions/show.html.erb      | 2 +-
 app/views/legislation/processes/debate.html.erb         | 2 +-
 app/views/legislation/processes/milestones.html.erb     | 2 +-
 app/views/legislation/processes/phase_empty.html.erb    | 2 +-
 app/views/legislation/processes/phase_not_open.html.erb | 2 +-
 app/views/legislation/processes/proposals.html.erb      | 2 +-
 app/views/legislation/processes/show.html.erb           | 2 +-
 app/views/legislation/processes/summary.html.erb        | 2 +-
 app/views/legislation/proposals/show.html.erb           | 2 +-
 app/views/legislation/questions/show.html.erb           | 2 +-
 app/views/management/budgets/investments/show.html.erb  | 2 +-
 app/views/organizations/registrations/new.html.erb      | 2 +-
 app/views/pages/custom_page.html.erb                    | 2 +-
 app/views/pages/help/index.html.erb                     | 2 +-
 app/views/polls/index.html.erb                          | 2 +-
 app/views/polls/results.html.erb                        | 2 +-
 app/views/polls/stats.html.erb                          | 2 +-
 app/views/proposals/index.html.erb                      | 2 +-
 app/views/proposals/share.html.erb                      | 2 +-
 app/views/proposals/show.html.erb                       | 2 +-
 app/views/users/registrations/new.html.erb              | 2 +-
 app/views/users/registrations/success.html.erb          | 2 +-
 37 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/app/components/sdg/goals/help_page_component.html.erb b/app/components/sdg/goals/help_page_component.html.erb
index 7f167c4a0..613cd2aaf 100644
--- a/app/components/sdg/goals/help_page_component.html.erb
+++ b/app/components/sdg/goals/help_page_component.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { t("sdg.goals.help.title") } %>
+<% provide :title, t("sdg.goals.help.title") %>
 
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: sdg_help_url %>
diff --git a/app/components/sdg/goals/index_component.html.erb b/app/components/sdg/goals/index_component.html.erb
index bb2b0e285..9f2c41c74 100644
--- a/app/components/sdg/goals/index_component.html.erb
+++ b/app/components/sdg/goals/index_component.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { title } %>
+<% provide :title, title %>
 <% provide :main_class, "sdg-goals-index" %>
 
 <% if header.present? %>
diff --git a/app/components/sdg/goals/show_component.html.erb b/app/components/sdg/goals/show_component.html.erb
index f49df6e46..d869c926f 100644
--- a/app/components/sdg/goals/show_component.html.erb
+++ b/app/components/sdg/goals/show_component.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { goal.title } %>
+<% provide :title, goal.title %>
 <% provide :main_class, "sdg-goal-show" %>
 
 <%= back_link_to sdg_goals_path %>
diff --git a/app/views/admin/audits/show.html.erb b/app/views/admin/audits/show.html.erb
index ee89b62d1..3beaf0780 100644
--- a/app/views/admin/audits/show.html.erb
+++ b/app/views/admin/audits/show.html.erb
@@ -1,6 +1,4 @@
-<% provide(:title) do %>
-  <%= t("admin.audits.title") %>
-<% end %>
+<% provide :title, t("admin.audits.title") %>
 <%= back_link_to admin_polymorphic_path(@audit.associated || @audit.auditable) %>
 
 <h2><%= t("admin.audits.title") %></h2>
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb
index aeaee21f1..841a988d0 100644
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("budgets.index.title") %><% end %>
+<% provide :title, t("budgets.index.title") %>
 <% provide :main_class, "budgets-index" %>
 
 <%= render Shared::BannerComponent.new("budgets") %>
diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb
index 8d35a1ef8..fe9e97b71 100644
--- a/app/views/budgets/investments/index.html.erb
+++ b/app/views/budgets/investments/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("budgets.investments.index.title") %><% end %>
+<% provide :title, t("budgets.investments.index.title") %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form",
              search_path: budget_investments_path(budget_id: @budget.id, page: 1),
diff --git a/app/views/budgets/investments/show.html.erb b/app/views/budgets/investments/show.html.erb
index d3e4cdb8d..c44141cfb 100644
--- a/app/views/budgets/investments/show.html.erb
+++ b/app/views/budgets/investments/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @investment.title %><% end %>
+<% provide :title, @investment.title %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: budget_investment_url %>
 <% end %>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
index 3b221e4a2..04c97bdbf 100644
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @budget.name %><% end %>
+<% provide :title, @budget.name %>
 
 <%= render Shared::BannerComponent.new("budgets") %>
 
diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb
index f6762fb7b..03c6cd974 100644
--- a/app/views/budgets/stats/show.html.erb
+++ b/app/views/budgets/stats/show.html.erb
@@ -1,6 +1,4 @@
-<% provide :title do %>
-  <%= t("stats.budgets.page_title", budget: @budget.name) %>
-<% end %>
+<% provide :title, t("stats.budgets.page_title", budget: @budget.name) %>
 <% provide :social_media_meta_tags do %>
 <%= render "shared/social_media_meta_tags",
            social_url: budget_stats_url(@budget),
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index e711762aa..989ab508f 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("debates.index.title") %><% end %>
+<% provide :title, t("debates.index.title") %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form",
              search_path: debates_path(page: 1),
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 38fc11825..db3141988 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @debate.title %><% end %>
+<% provide :title, @debate.title %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: debate_url(@debate) %>
 <% end %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 848ae81be..32750ef42 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.confirmations.new.title") %><% end %>
+<% provide :title, t("devise_views.confirmations.new.title") %>
 <h2><%= t("devise_views.confirmations.new.title") %></h2>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
diff --git a/app/views/devise/confirmations/show.html.erb b/app/views/devise/confirmations/show.html.erb
index 4024802a2..d015b07f5 100644
--- a/app/views/devise/confirmations/show.html.erb
+++ b/app/views/devise/confirmations/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.confirmations.show.title") %><% end %>
+<% provide :title, t("devise_views.confirmations.show.title") %>
 <h1 class="text-center"><%= t("devise_views.confirmations.show.title") %></h1>
 
 <p><%= sanitize(t("devise_views.confirmations.show.instructions", email: resource.email)) %></p>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index ad52f1f96..4fbab7107 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.passwords.new.title") %><% end %>
+<% provide :title, t("devise_views.passwords.new.title") %>
 <h2><%= t("devise_views.passwords.new.title") %></h2>
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
   <%= render "shared/errors", resource: resource %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 968d64321..bad3ce637 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.sessions.new.title") %><% end %>
+<% provide :title, t("devise_views.sessions.new.title") %>
 <h2><%= t("devise_views.sessions.new.title") %></h2>
 
 <%= render "devise/omniauth_form", action: "sign_in" %>
diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb
index e42bb0920..a1ab873ab 100644
--- a/app/views/legislation/draft_versions/show.html.erb
+++ b/app/views/legislation/draft_versions/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= "#{@draft_version.title} - #{@process.title}" %><% end %>
+<% provide :title, "#{@draft_version.title} - #{@process.title}" %>
 
 <%= render "legislation/processes/header", process: @process, header: :small %>
 
diff --git a/app/views/legislation/processes/debate.html.erb b/app/views/legislation/processes/debate.html.erb
index c6a365632..ec9ef4ccb 100644
--- a/app/views/legislation/processes/debate.html.erb
+++ b/app/views/legislation/processes/debate.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @process.title %><% end %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/milestones.html.erb b/app/views/legislation/processes/milestones.html.erb
index be66be7b2..8199952cc 100644
--- a/app/views/legislation/processes/milestones.html.erb
+++ b/app/views/legislation/processes/milestones.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { @process.title } %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb
index 719410373..2b0faaf13 100644
--- a/app/views/legislation/processes/phase_empty.html.erb
+++ b/app/views/legislation/processes/phase_empty.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @process.title %><% end %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb
index 399b3929b..721a5ca2d 100644
--- a/app/views/legislation/processes/phase_not_open.html.erb
+++ b/app/views/legislation/processes/phase_not_open.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @process.title %><% end %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb
index 7b12a487f..7cbb14958 100644
--- a/app/views/legislation/processes/proposals.html.erb
+++ b/app/views/legislation/processes/proposals.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @process.title %><% end %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/show.html.erb b/app/views/legislation/processes/show.html.erb
index d6ef1939f..bc088be34 100644
--- a/app/views/legislation/processes/show.html.erb
+++ b/app/views/legislation/processes/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @process.title %><% end %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/processes/summary.html.erb b/app/views/legislation/processes/summary.html.erb
index afab85c75..03376c4fc 100644
--- a/app/views/legislation/processes/summary.html.erb
+++ b/app/views/legislation/processes/summary.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { @process.title } %>
+<% provide :title, @process.title %>
 
 <%= render "legislation/processes/header", process: @process, header: :full %>
 
diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb
index 7f9123bd4..b1485fd99 100644
--- a/app/views/legislation/proposals/show.html.erb
+++ b/app/views/legislation/proposals/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @proposal.title %><% end %>
+<% provide :title, @proposal.title %>
 <% content_for :meta_description do %><%= @proposal.summary %><% end %>
 <% provide :social_media_meta_tags do %>
 <%= render "shared/social_media_meta_tags",
diff --git a/app/views/legislation/questions/show.html.erb b/app/views/legislation/questions/show.html.erb
index 7663fab74..16ee0430c 100644
--- a/app/views/legislation/questions/show.html.erb
+++ b/app/views/legislation/questions/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @question.title %><% end %>
+<% provide :title, @question.title %>
 
 <section class="debate-questions">
   <div class="quiz-header row small-collapse">
diff --git a/app/views/management/budgets/investments/show.html.erb b/app/views/management/budgets/investments/show.html.erb
index 903b7ae39..190cb02e8 100644
--- a/app/views/management/budgets/investments/show.html.erb
+++ b/app/views/management/budgets/investments/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @investment.title %><% end %>
+<% provide :title, @investment.title %>
 
 <%= render "/shared/print" %>
 
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index e6d5e8426..2bcc9e938 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.organizations.registrations.new.title") %><% end %>
+<% provide :title, t("devise_views.organizations.registrations.new.title") %>
 <h2><%= t("devise_views.organizations.registrations.new.title") %></h2>
 
  <%= form_for(resource, as: :user, url: organization_registration_path) do |f| %>
diff --git a/app/views/pages/custom_page.html.erb b/app/views/pages/custom_page.html.erb
index 6d29f392a..3cc11dd3c 100644
--- a/app/views/pages/custom_page.html.erb
+++ b/app/views/pages/custom_page.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @custom_page.title %><% end %>
+<% provide :title, @custom_page.title %>
 <%= content_for :body_class, "custom-page" %>
 
 <div class="row margin-top">
diff --git a/app/views/pages/help/index.html.erb b/app/views/pages/help/index.html.erb
index 34f441e69..dfdecb6a2 100644
--- a/app/views/pages/help/index.html.erb
+++ b/app/views/pages/help/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("pages.titles.help", org: setting["org_name"]) %><% end %>
+<% provide :title, t("pages.titles.help", org: setting["org_name"]) %>
 <% content_for :canonical do %>
   <%= render "shared/canonical", href: help_url %>
 <% end %>
diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb
index 251e8493f..976c63c4a 100644
--- a/app/views/polls/index.html.erb
+++ b/app/views/polls/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("polls.index.title") %><% end %>
+<% provide :title, t("polls.index.title") %>
 
 <%= render_custom_partial "meta_description" %>
 
diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb
index eaaaaae5b..940be9e8a 100644
--- a/app/views/polls/results.html.erb
+++ b/app/views/polls/results.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @poll.name %><% end %>
+<% provide :title, @poll.name %>
 
 <div class="polls-results-stats">
   <%= render "poll_header" %>
diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb
index 28c747bfa..dcc45836d 100644
--- a/app/views/polls/stats.html.erb
+++ b/app/views/polls/stats.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @poll.name %><% end %>
+<% provide :title, @poll.name %>
 
 <div class="participation-stats polls-results-stats">
   <%= render "poll_header" %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 00cc1c7e3..b54cd409b 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("proposals.index.title") %><% end %>
+<% provide :title, t("proposals.index.title") %>
 <% content_for :header_addon do %>
   <%= render "shared/search_form",
              search_path: proposals_path(page: 1),
diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb
index 26e2453a6..7a1a3bb64 100644
--- a/app/views/proposals/share.html.erb
+++ b/app/views/proposals/share.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @proposal.title %><% end %>
+<% provide :title, @proposal.title %>
 <% provide :social_media_meta_tags do %>
 <%= render "shared/social_media_meta_tags",
            social_url: proposal_url(@proposal),
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index c0d1f7f53..c00c99f8e 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= @proposal.title %><% end %>
+<% provide :title, @proposal.title %>
 <% preview = false unless local_assigns.has_key? :preview %>
 <% content_for :meta_description do %><%= @proposal.summary %><% end %>
 <% provide :social_media_meta_tags do %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 11e1645d2..1382b385d 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -1,4 +1,4 @@
-<% provide :title do %><%= t("devise_views.users.registrations.new.title") %><% end %>
+<% provide :title, t("devise_views.users.registrations.new.title") %>
 <h2><%= t("devise_views.users.registrations.new.title") %></h2>
 
 <%= render "devise/omniauth_form", action: "sign_up" %>
diff --git a/app/views/users/registrations/success.html.erb b/app/views/users/registrations/success.html.erb
index c5f8cb77f..12914c73c 100644
--- a/app/views/users/registrations/success.html.erb
+++ b/app/views/users/registrations/success.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title) { t("devise_views.users.registrations.success.title") } %>
+<% provide :title, t("devise_views.users.registrations.success.title") %>
 <h2><%= t("devise_views.users.registrations.success.title") %></h2>
 <p><%= sanitize(t("devise_views.users.registrations.success.thank_you")) %></p>
 <p><%= sanitize(t("devise_views.users.registrations.success.instructions_1")) %></p>