Update copy, tests, and administration

app/views/registration_steps/_payment_form.html.haml

@@ -11,14 +11,16 @@
         %p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") }
       = save_registration_step do
         .registration-step-options
-          - if @currencies.present? && @currencies.length > 1
-            = radiobuttons :currency, (@currencies.map { |c| [(_"currencies.#{c}.displayName-count-other"), c] }), @currency
           .options.graded-options{class: "option-count-#{@amounts.size}"}
             - @amounts.each_with_index do |option, i|
-              = button (number_to_currency option, unit: '$'), value: option, name: :value, class: [:unstyled, "option-#{i + 1}"]
+              = button "#{number_to_currency option, unit: '$'} #{_!@currency}".html_safe, value: option, name: :value, class: [:unstyled, "option-#{i + 1}"]
+          .option-space
           .custom-option
-            -# if Rails.env.test?
-            =# text_field_tag :custom_value, nil
-            -# else
             = number_field_tag :custom_value, 50.0, step: 0.05, min: 0.05
             = button :custom_amount, name: :custom_amount, value: :custom, class: :unstyled
+          - if @currencies.present? && @currencies.length > 1
+            .option-space
+            .setting-option
+              %p Change currency to:
+              - (@currencies - [@currency]).each do |c|
+                = button (_"currencies.#{c}.displayName-count-other"), name: :currency, value: c, class: :unstyled

app/views/registration_steps/_review.html.haml

@@ -41,8 +41,22 @@
 = row do
   = columns(medium: 12) do
     %h3=_'articles.workshops.headings.Workshops', :t
-    %p=_'articles.conference_registration.paragraphs.workshops', :p
+    - if @this_conference.workshop_info.present?
+      = richtext @this_conference.workshop_info
+    - else
+      %p=_'articles.conference_registration.paragraphs.workshops', :p
     .actions.centered
       .buttons
         = link_to (_'articles.conference_registration.actions.View_Workshops'), workshops_path(@this_conference), class: :button
-        = link_to (_'actions.workshops.create'), create_workshop_path(@this_conference), class: [:button, :modify]
+        = link_to (_'actions.workshops.create'), create_workshop_path(@this_conference), class: [:button, :modify]
+- if @my_workshops.present?
+  = row do
+    = columns(medium: 12) do
+      %h3=_'articles.workshops.headings.Your_Workshops'
+      = render 'workshops/workshop_previews', workshops: @my_workshops
+= row do
+  = columns(medium: 12) do
+    %h3=_'articles.workshops.headings.Workshops_that_you_would_like_to_attend'
+    %p=_'articles.workshops.paragraphs.Workshops_that_you_would_like_to_attend', :p
+    - if @interested_workshops.present?
+      = render 'workshops/workshop_previews', workshops: @interested_workshops