wording fix

Also add
Force old client website to upgrade to new client
2024-09-08 13:15:42 -05:00 · 2024-09-04 22:08:30 -05:00 · 2024-09-04 21:47:44 -05:00
4 changed files with 6 additions and 6 deletions
--- a/ruby/lib/jam_ruby/models/artifact_update.rb
+++ b/ruby/lib/jam_ruby/models/artifact_update.rb
@ -12,7 +12,8 @@ module JamRuby
      "#{CLIENT_PREFIX}/JamBlasterClient",
      "#{CLIENT_PREFIX_MODERN}/Win32",
      "#{CLIENT_PREFIX_MODERN}/MacOSX-Intel",
-      "#{CLIENT_PREFIX_MODERN}/MacOSX-M"
+      "#{CLIENT_PREFIX_MODERN}/MacOSX-M",
+      "#{CLIENT_PREFIX_MODERN}/MacOSX"
    ]

    self.primary_key = 'id'
--- a/web/app/assets/javascripts/JamServer.js
+++ b/web/app/assets/javascripts/JamServer.js
@ -711,6 +711,7 @@
        client_id: client_id,
        machine: machine,
        os: context.JK.GetOSAsString(),
+        product: "JamClientModern",
        //jamblaster_serial_no: context.PlatformStore.jamblasterSerialNo(),
        udp_reachable: context.JK.StunInstance ? !context.JK.StunInstance.sync() : null // latency tester doesn't have the stun class loaded
      }
--- a/web/app/assets/javascripts/clientUpdate.js
+++ b/web/app/assets/javascripts/clientUpdate.js
@ -265,7 +265,7 @@
        return;
      }

-      var product = "JamClient"
+      var product = "JamClientModern"
      var currentVersion = context.jamClient.ClientUpdateVersion();

      if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) {
--- a/web/app/views/clients/_client_update.html.erb
+++ b/web/app/views/clients/_client_update.html.erb
@ -114,11 +114,9 @@

  <div align="center">
    <div class="download-manual">
-      <p class="fix"><b>Step 1:</b> Uninstall the JamKazam application manually.</p>
-      <br/>
-      <p class="fix"><b>Step 2:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
+      <p class="fix"><b>Step 1:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>

-      <p class="fix"><b>Step 3:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder.</p>
+      <p class="fix"><b>Step 2:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder, <b>and choose Replace option</b></p>
    </div>
    <div class="error-detail">
      Our automatic updater is temporarily not working for Mac OS on this release.
Author	SHA1	Message	Date
Seth Call	0b5bb77078	wording fix	2024-09-08 13:15:42 -05:00
Seth Call	77e966dea4	Also add	2024-09-04 22:08:30 -05:00
Seth Call	7cd9a43c25	Force old client website to upgrade to new client	2024-09-04 21:47:44 -05:00