[tor-commits] [metrics-web/master] Rename Darwin/Mac to macOS.

[karsten at torproject.org]

commit c71cb68ee206185dedbb01934cc6fe94cae55fb4
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Jan 25 10:06:02 2018 +0100

    Rename Darwin/Mac to macOS.
---
 src/main/R/rserver/graphs.R              | 3 ++-
 src/main/resources/web/json/metrics.json | 2 +-
 src/main/resources/web/jsps/stats.jsp    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index 3805f63..73b0ac1 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -409,6 +409,7 @@ plot_platforms <- function(start, end, path) {
       limits = c(0, max(platforms$value, na.rm = TRUE))) +
     scale_colour_manual(name = "Platform",
       breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"),
+      labels = c("Linux", "macOS", "BSD", "Windows", "Other"),
       values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2", "#333333")) +
     ggtitle("Relay platforms\n")
   ggsave(filename = path, width = 8, height = 5, dpi = 150)
@@ -1146,7 +1147,7 @@ plot_webstats_tb_platform <- function(start, end, path) {
     scale_y_continuous(name = 'Requests per day\n', labels = formatter) +
     scale_colour_hue(name = "Platform",
         breaks = c("w", "m", "l", "o", ""),
-        labels = c("Windows", "Mac", "Linux", "Other", "Unknown")) +
+        labels = c("Windows", "macOS", "Linux", "Other", "Unknown")) +
     theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)),
           strip.background = element_rect(fill = NA)) +
     ggtitle("Tor Browser downloads by platform\n")
diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json
index ccd6d53..61d51b9 100644
--- a/src/main/resources/web/json/metrics.json
+++ b/src/main/resources/web/json/metrics.json
@@ -470,7 +470,7 @@
     "id": "webstats-tb-platform",
     "title": "Tor Browser downloads by platform",
     "type": "Graph",
-    "description": "<p>This graph shows absolute numbers of requests to Tor's web servers to download a Tor Browser executable, broken down by platform (Windows, Mac, Linux) of the requested executable.  Note that this graph does <em>not</em> show the platform used to download Tor Browser but the platform that it was downloaded for.</p>",
+    "description": "<p>This graph shows absolute numbers of requests to Tor's web servers to download a Tor Browser executable, broken down by platform (Windows, macOS, Linux) of the requested executable.  Note that this graph does <em>not</em> show the platform used to download Tor Browser but the platform that it was downloaded for.</p>",
     "function": "plot_webstats_tb_platform",
     "parameters": [
       "start",
diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp
index 233b3d5..c8fef15 100644
--- a/src/main/resources/web/jsps/stats.jsp
+++ b/src/main/resources/web/jsps/stats.jsp
@@ -60,7 +60,7 @@ software version they run.  There are no statistics on the number of bridges by
 Tor software version.</li>
 
 <li><b>platform:</b> Operating system as reported by the relay.  Examples are
-<b>"Linux"</b>, <b>"Darwin"</b> (Mac OS X), <b>"BSD"</b>, <b>"Windows"</b>, and
+<b>"Linux"</b>, <b>"Darwin"</b> (macOS), <b>"BSD"</b>, <b>"Windows"</b>, and
 <b>"Other"</b>.  If this column contains the empty string, all running relays
 are included, regardless of the operating system they run on.  There are no
 statistics on the number of bridges by operating system.</li>