Merge pull request #72 from alphagov/CM-330-carry-out-content-review-changes-in-the-code

(CM-330) Carry out content review changes in the code

Author: pezholio

app/components/document/show/embedded_objects/blocks_component.html.erb

@@ -1,7 +1,7 @@
 <%= tag.div(class: component_classes) do %>
   <div class="app-c-embedded-objects-blocks-component__main-summary-card-wrapper">
     <%= render "govuk_publishing_components/components/summary_card", {
-      title: "Content blocks",
+      title:,
       rows: summary_card_rows,
     } %>
   </div>

app/components/document/show/embedded_objects/blocks_component.rb

@@ -39,20 +39,24 @@ def attribute_rows(key_name = :key)
     end
   end
 
+  def block_title(key)
+    I18n.t("edition.titles.#{document.schema.block_type}.#{schema.block_type}.#{key}", default: key.humanize.capitalize)
+  end
+
   def nested_blocks
     blocks = []
 
     nested_items(items).each do |key, items|
       if items.is_a?(Array)
         items.each_with_index do |nested_items, index|
           blocks << {
-            title: "#{key.singularize.titleize} #{index + 1}",
+            title: "#{block_title(key.singularize)} #{index + 1}",
             rows: rows_for_nested_items(nested_items, key, index),
           }
         end
       else
         blocks << {
-          title: key.titleize,
+          title: block_title(key),
           rows: rows_for_nested_items(items, key, nil),
         }
       end
@@ -64,8 +68,8 @@ def nested_blocks
   def rows_for_nested_items(items, nested_name, index)
     items.map do |key, value|
       {
-        key: key_to_title(key, schema_name),
-        value: content_for_row(embed_code_identifier(nested_name, index, key), value),
+        key: key_to_title(key, schema_name, "#{object_type}.#{nested_name}"),
+        value: content_for_row(embed_code_identifier(nested_name, index, key), translated_value(key, value)),
         data: data_attributes_for_row(embed_code_identifier(nested_name, index, key)),
       }
     end
@@ -75,9 +79,13 @@ def object_name
     object_type.singularize.humanize.downcase
   end
 
+  def title
+    "#{object_name} block".capitalize
+  end
+
   def block_row
     {
-      key: object_type.singularize.titleize,
+      key: object_type.humanize.singularize.capitalize,
       value: content_for_block_row,
       data: data_attributes_for_block_row,
     }

app/components/document/show/embedded_objects/subschema_items_component.rb

@@ -10,7 +10,7 @@ def id
   end
 
   def label
-    "#{subschema.name.pluralize} (#{embedded_objects.count})"
+    "#{subschema.name.singularize.capitalize} (#{embedded_objects.count})"
   end
 
 private

app/components/edition/details/fields/array_component.html.erb

@@ -1,7 +1,7 @@
 <div class="app-c-content-block-manager-array-component" data-ga4-section="<%= label %>">
   <%= render "govuk_publishing_components/components/add_another", {
     fieldset_legend: label,
-    add_button_text: "Add another #{label}",
+    add_button_text: I18n.t("buttons.add_another", item: label.downcase),
     items:,
     empty:,
     data_attributes: {

app/components/edition/host_content/table_component.rb

@@ -2,7 +2,7 @@ class Edition::HostContent::TableComponent < Document::Show::HostEditionsTableCo
 private
 
   def head
-    [super, { text: "Preview (Opens in new tab)" }].flatten
+    [super, { text: "Preview (opens in new tab)" }].flatten
   end
 
   def row_for_content_item(content_item)

app/components/edition/workflow/group_component.rb

@@ -26,7 +26,7 @@ def tab_for_subschema(subschema)
   end
 
   def tab_label(subschema, items)
-    "#{subschema.name.titleize} (#{items.values.count})"
+    "#{subschema.name.singularize.capitalize} (#{items.values.count})"
   end
 
   def content_for_tab(subschema, items)

app/components/shared/embedded_objects/summary_card/nested_item_component.rb

@@ -31,7 +31,7 @@ def title
   def rows
     nested_items.map do |field_name, value|
       {
-        key: humanized_label(schema_name: root_schema_name, relative_key: field_name, root_object: object_type),
+        key: humanized_label(schema_name: root_schema_name, relative_key: field_name, root_object: "#{object_type}.#{object_key}"),
         value: render_govspeak_if_enabled_for_field(
           object_key: object_key,
           field_name: field_name,

app/components/shared/embedded_objects/summary_card_component.html.erb

@@ -21,7 +21,7 @@
           items,
           object_key: key,
           object_type:,
-          title: key.singularize.titleize,
+          title: nested_item_title(key),
           subschema: schema,
           root_schema_name: root_schema.block_type,
         ) %>
@@ -30,7 +30,7 @@
           nested_items: items,
           object_key: key,
           object_type:,
-          title: key.singularize.titleize,
+          title: nested_item_title(key),
           subschema: schema,
           root_schema_name: root_schema.block_type,
         ) %>

app/components/shared/embedded_objects/summary_card_component.rb

@@ -21,7 +21,11 @@ def initialize(edition:, object_type:, object_title:, redirect_url: nil, test_id
   attr_reader :edition, :object_type, :object_title, :redirect_url, :test_id_prefix
 
   def title
-    "#{object_type.titleize.singularize} details"
+    "#{object_type.titleize.singularize.capitalize} details"
+  end
+
+  def nested_item_title(key)
+    I18n.t("edition.titles.#{edition.schema.block_type}.#{schema.id}.#{key}", default: key.singularize.titleize)
   end
 
   def items

app/components/shared/embedded_objects_component.rb

@@ -30,7 +30,11 @@ def show_title?
   end
 
   def add_button_text
-    has_embedded_objects? ? "Add another #{subschema_name}" : "Add #{helpers.add_indefinite_article subschema_name}"
+    if has_embedded_objects?
+      I18n.t("buttons.add_another", item: subschema_name)
+    else
+      I18n.t("buttons.add", item: helpers.add_indefinite_article(subschema_name))
+    end
   end
 
   def has_embedded_objects?