govuk_design_system_formbuilder 5.10.0 → 5.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ebb0477ee3736c07b83fa9083a7a119bd2474d37ba44dc5288546a2c373ffc
-  data.tar.gz: 68114148ca5273964235c7a9c2d184f128d4f68d0cfe6bc2ec010937124fbc35
+  metadata.gz: 1161517e2ec3b7c50af5bc68cba01dd6ef6be7c3569abebc3e5aca32e30720b4
+  data.tar.gz: b44dfb984dae5e9781c1c099ad4b53ff29fee5d066078dc74a7507e96a4d8f8a
 SHA512:
-  metadata.gz: 9ebd18df351f2675cab4d9023e1e83cf76f90b1562b7adc02b8e59920de787304a682435517e1243e115fda3a0441d04911498b866c935e9605bea47f06ea845
-  data.tar.gz: 9c371d4d31c681b1314785810d6b7e0b7925de4bdb492800243800d69ad4ce7f08e58431e80d69f4ead62e9f2dc2322ba247d8283d9c7984752c903e8e5b3c7f
+  metadata.gz: 37c8f7bedaa9e4f7df91055d5f58659cad2dc8e553eaec54a0fb0f62c1af8d1c1d79ab2db898f9aa4883f5a522864090ca520350a9ee6586f06f1d85a288dfdf
+  data.tar.gz: b555b98d1fc53ac32dab2952f35eba2729c350d041baae34b4e109dc224ddfc18631df3959a1402d4c6d80756ab2f9e40a87165acc53a4c4c249fb1b827d9b37

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -938,6 +938,8 @@ module GOVUKDesignSystemFormBuilder
     # @param maxlength_enabled [Boolean] adds maxlength attribute to day, month and year inputs (2, 2, and 4, respectively)
     # @param segments [Hash] allows Rails' multiparameter attributes to be overridden on a field-by-field basis. Hash must
     #   contain +day:+, +month:+ and +year:+ keys. Defaults to the default value set in the +default_date_segments+ setting in {GOVUKDesignSystemFormBuilder.DEFAULTS}
+    # @param segment_names [Hash] allows the day, month and year labels to be overridden. Hash must
+    #   contain +day:+, +month:+ and +year:+ keys. Defaults to the default value set in the +default_date_segment_names+ setting in {GOVUKDesignSystemFormBuilder.DEFAULTS}
     # @param form_group [Hash] configures the form group
     # @option form_group kwargs [Hash] additional attributes added to the form group
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element
@@ -960,8 +962,8 @@ module GOVUKDesignSystemFormBuilder
     # @example A date input with legend supplied as a proc
     #  = f.govuk_date_field :finishes_on,
     #    legend: -> { tag.h3('Which category do you belong to?') }
-    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, maxlength_enabled: false, segments: config.default_date_segments, form_group: {}, **kwargs, &block)
-      Elements::Date.new(self, object_name, attribute_name, hint:, legend:, caption:, date_of_birth:, omit_day:, maxlength_enabled:, segments:, form_group:, **kwargs, &block).html
+    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, maxlength_enabled: false, segments: config.default_date_segments, segment_names: config.default_date_segment_names, form_group: {}, **kwargs, &block)
+      Elements::Date.new(self, object_name, attribute_name, hint:, legend:, caption:, date_of_birth:, omit_day:, maxlength_enabled:, segments:, segment_names:, form_group:, **kwargs, &block).html
     end
 
     # Generates a summary of errors in the form, each linking to the corresponding

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -7,10 +7,11 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Supplemental
       include Traits::HTMLClasses
+      include Traits::Localisation
 
       MULTIPARAMETER_KEY = { day: 3, month: 2, year: 1 }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, omit_day:, maxlength_enabled:, segments:, form_group:, date_of_birth: false, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, omit_day:, maxlength_enabled:, segments:, form_group:, segment_names:, date_of_birth: false, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend            = legend
@@ -20,6 +21,7 @@ module GOVUKDesignSystemFormBuilder
         @omit_day          = omit_day
         @maxlength_enabled = maxlength_enabled
         @segments          = segments
+        @segment_names     = segment_names
         @form_group        = form_group
         @html_attributes   = kwargs
       end
@@ -101,12 +103,16 @@ module GOVUKDesignSystemFormBuilder
 
       def label(segment, link_errors)
         tag.label(
-          segment.capitalize,
+          segment_label_text(segment),
           class: label_classes,
           for: id(segment, link_errors)
         )
       end
 
+      def segment_label_text(segment)
+        localised_text(:label, segment) || @segment_names.fetch(segment)
+      end
+
       def input(segment, link_errors, width, value)
         tag.input(
           id: id(segment, link_errors),

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -16,7 +16,11 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def hidden_prefix
-        tag.span('Error: ', class: %(#{brand}-visually-hidden))
+        tag.span("#{prefix_text}: ", class: %(#{brand}-visually-hidden))
+      end
+
+      def prefix_text
+        I18n.translate("helpers.error.message_prefix", default: nil) || config.default_error_message_prefix
       end
 
       def message

data/lib/govuk_design_system_formbuilder/traits/localisation.rb

@@ -5,20 +5,22 @@ module GOVUKDesignSystemFormBuilder
       # spaces, zero or more times
       BASE_NAME_REGEXP = %r{[[:alpha:]](?:[\w\s]*)}
 
-    private
-
-      def localised_text(context)
+      def localised_text(context, segment = nil)
         return unless @object_name.present? && @attribute_name.present?
 
-        localise(context) || localise_html(context)
+        full_context = [schema(context), segment].compact.join('.')
+
+        localise(full_context) || localise_html(full_context)
       end
 
+    private
+
       def localise(context)
-        I18n.translate(schema(context), default: nil)
+        I18n.translate(context, default: nil)
       end
 
       def localise_html(context)
-        I18n.translate("#{schema(context)}_html", default: nil).try(:html_safe)
+        I18n.translate("#{context}_html", default: nil).try(:html_safe)
       end
 
       def schema(context)

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '5.10.0'.freeze
+  VERSION = '5.10.1'.freeze
 end

data/lib/govuk_design_system_formbuilder.rb

@@ -32,6 +32,10 @@ module GOVUKDesignSystemFormBuilder
   #   override the standard behaviour where Rails tries to cast the values
   #   into a +Date+. Defaults to +{ day: '3i', month: '2i', year: '1i' }+
   #
+  # * +:default_date_segment_names+ allows the individual date field labels to
+  #   have their default values set.
+  #   Defaults to +{ day: 'Day', month: 'Month', year: 'Year' }+
+  #
   # * +:default_radio_divider_text+ sets the text automatically added to the
   #   radio button divider, defaults to 'or'
   #
@@ -49,6 +53,9 @@ module GOVUKDesignSystemFormBuilder
   #   is present. The default can be overridden using the +bold_labels:+ argument.
   #   The default value is 'true'.
   #
+  # * +:default_error_message_prefix+ sets the prefix text inserted before inline
+  #   errors added to form inputs. It defaults to 'Error'.
+  #
   # * +:default_error_summary_title+ sets the text used in error summary
   #   blocks. As per the GOV.UK Design System spec, it defaults to
   #   'There is a problem'.
@@ -94,8 +101,10 @@ module GOVUKDesignSystemFormBuilder
     default_caption_size: 'm',
     default_submit_button_text: 'Continue',
     default_date_segments: { day: '3i', month: '2i', year: '1i' },
+    default_date_segment_names: { day: 'Day', month: 'Month', year: 'Year' },
     default_radio_divider_text: 'or',
     default_check_box_divider_text: 'or',
+    default_error_message_prefix: 'Error',
     default_error_summary_title: 'There is a problem',
     default_error_summary_presenter: Presenters::ErrorSummaryPresenter,
     default_error_summary_error_order_method: nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.10.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-02 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -81,39 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement