From 06d0a0a66991ea7acf1d7dbb5a546e08ecc85acd Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 5 Oct 2017 16:59:25 -0700
Subject: s/mac/macOS

---
 pages/assets/js/download.js | 21 +++++++++++----------
 pages/install/en.haml       |  4 ++--
 pages/install/mac/en.text   |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pages/assets/js/download.js b/pages/assets/js/download.js
index 38723da..9fd0d52 100644
--- a/pages/assets/js/download.js
+++ b/pages/assets/js/download.js
@@ -4,23 +4,24 @@ $(document).ready(function() {
   $(".download").click(function(e) {
     e.preventDefault();
     download(platform);
-  }); 
+  });
 
-  if (["linux", "mac", "android"].indexOf(platform) != -1) {
+  if (["GNU/Linux", "macOS", "Android"].indexOf(platform) != -1) {
     $(".download-text").text("Download Bitmask for " + platform);
   }
 });
 
+
 function download(platform) {
   var link = "install";
   switch (platform) {
-    case "linux":
+    case "GNU/Linux":
       link = "https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz";
       break;
-    case "mac":
+    case "macOS":
       link = "https://dl.bitmask.net/client/osx/stable/Bitmask-OSX-latest.pkg";
       break;
-    case "android":
+    case "Android":
       link = "install/android";
       break;
   }
@@ -29,16 +30,16 @@ function download(platform) {
 
 function platformStr() {
   if (navigator.platform.indexOf("Linux") != -1) {
-    return "linux";
+    return "GNU/Linux";
   }
   if (navigator.platform.indexOf("Mac") != -1) {
-    return "mac";
+    return "macOS";
   }
   if (navigator.platform.indexOf("Android") != -1) {
-    return "android";
+    return "Android";
   }
   if (navigator.platform.indexOf("Win") != -1) {
-    return "win";
+    return "Windows";
   }
-  return "other";
+  return "Other";
 }
diff --git a/pages/install/en.haml b/pages/install/en.haml
index bb2adb3..f1cc1e8 100644
--- a/pages/install/en.haml
+++ b/pages/install/en.haml
@@ -28,7 +28,7 @@
     %a.btn.btn-default{:href=>"https://dl.bitmask.net/client/osx/stable/Bitmask-OSX-latest.pkg"}
       %i.fa.fa-apple.fa-4x
       %br
-      %b Mac OS
+      %b macOS
       %br
       %small Version 0.10
   .col-sm-3.col-xs-6.text-center
@@ -42,6 +42,6 @@
 .row
   .col-sm-8.col-sm-offset-2
     .p.text-center
-      = t :warning 
+      = t :warning
       = t :warning_disabled
 
diff --git a/pages/install/mac/en.text b/pages/install/mac/en.text
index 5361aa5..0e9fe0c 100644
--- a/pages/install/mac/en.text
+++ b/pages/install/mac/en.text
@@ -1,11 +1,11 @@
-- @title = "Bitmask for Mac OS"
-- @nav_title = 'Mac OS'
+- @title = "Bitmask for macOS"
+- @nav_title = 'macOS'
 
 h2. Download latest version
 
 Bitmask requires Mountain Lion or newer.
 
-<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg', :text => 'Download for Mac OS'}) %>
+<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg', :text => 'Download for macOS'}) %>
 
 Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask .dmg file using [[this signature file => https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg.asc]].
 
-- 
cgit v1.2.3