From 55f683dde3d2617802fa2a14b54733687a7b71d8 Mon Sep 17 00:00:00 2001
From: Dave Copeland <davec@naildrivin5.com>
Date: Sat, 16 Nov 2019 14:01:58 -0500
Subject: [PATCH] attempt more backports

---
 edition4/makedepot.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/edition4/makedepot.rb b/edition4/makedepot.rb
index 9716a6a..b1fd041 100644
--- a/edition4/makedepot.rb
+++ b/edition4/makedepot.rb
@@ -2921,6 +2921,7 @@ def download
 end
 
 section 12.5, 'Playtime' do
+  next
   if Gorp::Config[:skip_xml_serialization]
     warn 'xml serialization skipped'
     next
@@ -4731,6 +4732,9 @@ def default_url_options
   end
   edit "app/javascript/PayTypeSelector/index.jsx" do
     clear_highlights
+    gsub! '    return (', "    // START_HIGHLIGHT\n    return ("
+    gsub! '    );',"    );\n// END_HIGHLIGHT"
+
     gsub!  '          <label htmlFor="order_pay_type">Pay type</label>', <<EOF
           <label htmlFor="order_pay_type">
             {I18n.t("orders.form.pay_type")}
@@ -4995,6 +4999,22 @@ def default_url_options
 
   edit 'app/views/layouts/application.html.erb', 'i18n' do
     clear_highlights
+
+    # we need to add javascript_pack_tag("locale_switcher") in here as well
+    # this is probably not the best/right way to do this but hopefully expresses the intent
+    sub! "<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>", %{
+    <!-- START:locale_switcher -->
+    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    }
+
+    sub! /<\/script>/,%{
+    </script>
+    <!-- START_HIGHLIGHT -->
+    <%= javascript_pack_tag 'locale_switcher', 'data-turbolinks-track': 'reload' %>
+    <!-- END_HIGHLIGHT -->
+    <!-- END:locale_switcher -->
+    }
+
     edit /^\s+<header class="main">.*?<\/header>\n/m, :mark => 'i18n'
     msub /\n()\s+<%= image_tag/, <<-EOF, :highlight
       <aside>