Pronoun question and a few fixes

app/views/registration_steps/_name.html.haml

@@ -1,5 +1,10 @@
 = registration_step_header
 = row do
-  = columns(medium: 12) do
-    = save_registration_step do
+  = save_registration_step do
+    = columns(medium: 12) do
       = textfield :name, @name, required: true, big: true
+      %h3=_'articles.conference_registration.headings.pronoun'
+    = columns(medium: 6) do
+      %p.small=_'articles.conference_registration.paragraphs.pronoun', :p
+    = columns(medium: 6) do
+      = textfield :pronoun, @pronoun, required: false, big: true, warning: 'articles.conference_registration.paragraphs.pronoun_optional'

app/views/registration_steps/_review.html.haml

@@ -26,10 +26,11 @@
                     - when :html
                       .scroller= richtext(data[:value].html_safe)
                     - else
-                      - if data[:key].present?
-                        =_"#{data[:key]}.#{data[:value]}"
+                      - value = data[:key].present? ? (_"#{data[:key]}.#{data[:value]}") : data[:value].to_s
+                      - if data[:supplementary].present?
+                        = (_'string_formats.data_with_supplementary_value', vars: { value: value, supplementary_value: data[:supplementary] }).html_safe
                       - else
-                        = data[:value].to_s.html_safe
+                        = value.html_safe
       - else
         %p.centered=_'articles.conference_registration.paragraphs.registration_cancelled', :p
       - if @allow_cancel_attendance