From f848c5d992d1ae3a6ef2529b903aebd2de0e96a9 Mon Sep 17 00:00:00 2001
From: petemill <miller.pete+commit@gmail.com>
Date: Wed, 17 Oct 2018 22:38:32 -0700
Subject: [PATCH] Private New Tab Page now shows only applicable Mac / non-Mac
 keys to open Tor

Also corrects the actual keys in the string

Fix https://github.com/brave/brave-browser/issues/1688
---
 .../components/privateTab/privateTab.tsx      |  9 ++----
 .../components/privateTab/qwantTab.tsx        | 11 ++-----
 .../components/privateTab/torContent.tsx      | 29 +++++++++++++++++++
 .../resources/brave_components_resources.grd  |  2 +-
 4 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 components/brave_new_tab_ui/components/privateTab/torContent.tsx

diff --git a/components/brave_new_tab_ui/components/privateTab/privateTab.tsx b/components/brave_new_tab_ui/components/privateTab/privateTab.tsx
index 2af49596a3e2..938f9bf11b7a 100644
--- a/components/brave_new_tab_ui/components/privateTab/privateTab.tsx
+++ b/components/brave_new_tab_ui/components/privateTab/privateTab.tsx
@@ -17,7 +17,6 @@ import {
   Text,
   PrivateImage,
   DuckDuckGoImage,
-  TorLockImage,
   Separator,
   FakeButton,
   Link
@@ -25,6 +24,7 @@ import {
 
 // Components
 import { Toggle } from 'brave-ui/features/shields'
+import TorContent from './torContent'
 
 // Helpers
 import { getLocale } from '../../../common/locale'
@@ -74,12 +74,7 @@ export default class PrivateTab extends React.PureComponent<Props, {}> {
           </ButtonGroup>
         </Box>
         <Box>
-          <Content>
-            <TorLockImage />
-            <SubTitle>{getLocale('boxTorLabel')}</SubTitle>
-            <Title>{getLocale('boxTorTitle')}</Title>
-            <Text>{getLocale('boxTorText2')}</Text>
-          </Content>
+          <TorContent />
           <Separator />
           <FakeButton href='https://support.brave.com/hc/en-us/articles/360018121491' target='_blank'>
             {getLocale('boxTorButton')}
diff --git a/components/brave_new_tab_ui/components/privateTab/qwantTab.tsx b/components/brave_new_tab_ui/components/privateTab/qwantTab.tsx
index 4ab38d95f7bc..3b571fef9e2b 100644
--- a/components/brave_new_tab_ui/components/privateTab/qwantTab.tsx
+++ b/components/brave_new_tab_ui/components/privateTab/qwantTab.tsx
@@ -8,17 +8,15 @@ import * as React from 'react'
 import {
   Grid2Columns,
   Box,
-  Content,
   HeaderBox,
   Title,
   SubTitle,
   Text,
   TorImage,
-  TorLockImage,
   Separator,
   FakeButton
 } from 'brave-ui/features/newTab'
-
+import TorContent from './torContent'
 // Helpers
 import { getLocale } from '../../../common/locale'
 
@@ -40,12 +38,7 @@ export default class QwantTab extends React.PureComponent<{}, {}> {
           </div>
         </HeaderBox>
         <Box>
-          <Content>
-            <TorLockImage />
-            <SubTitle>{getLocale('boxTorLabel')}</SubTitle>
-            <Title>{getLocale('boxTorTitle')}</Title>
-            <Text>{getLocale('boxTorText2')}</Text>
-          </Content>
+          <TorContent />
           <Separator />
           <FakeButton
             href='https://support.brave.com/hc/en-us/articles/360018121491'
diff --git a/components/brave_new_tab_ui/components/privateTab/torContent.tsx b/components/brave_new_tab_ui/components/privateTab/torContent.tsx
new file mode 100644
index 000000000000..1d134819bbeb
--- /dev/null
+++ b/components/brave_new_tab_ui/components/privateTab/torContent.tsx
@@ -0,0 +1,29 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import * as React from 'react'
+// Feature-specific components
+import {
+  Content,
+  Title,
+  SubTitle,
+  Text,
+  TorLockImage
+} from 'brave-ui/features/newTab'
+// Helpers
+import { getLocale } from '../../../common/locale'
+
+const isMac = window.navigator.userAgent.includes('Macintosh')
+const torKeyboardShortcutText = isMac ? '⌥⌘N' : 'Alt+Shift+N'
+
+export default function TorContent () {
+  return (
+    <Content>
+      <TorLockImage />
+      <SubTitle>{getLocale('boxTorLabel')}</SubTitle>
+      <Title>{getLocale('boxTorTitle')}</Title>
+      <Text>{getLocale('boxTorText2', { key: torKeyboardShortcutText })}</Text>
+    </Content>
+  )
+}
\ No newline at end of file
diff --git a/components/resources/brave_components_resources.grd b/components/resources/brave_components_resources.grd
index 4647fd525871..bdbdf490186f 100644
--- a/components/resources/brave_components_resources.grd
+++ b/components/resources/brave_components_resources.grd
@@ -188,7 +188,7 @@
       <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_LABEL_2" desc="">This Private Window is much more private</message>
       <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_TITLE" desc="">with Tor</message>
       <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_TEXT_1" desc="">Tor hides your IP address from the sites you visit, by routing your browsing through several Tor servers before it reaches your destination. These connections are encrypted, so your ISP or employer can’t see which sites you’re visiting either. Tor can slow down browsing and some sites might not work at all.</message>
-      <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_TEXT_2" desc="">Using Private Tabs only changes what Brave does on your device — it doesn't change anyone else's behavior. Tor hides your IP address from the sites you visit, and hides the sites you visit from your ISP or your employer. Open a Private Window with Tor from the menu, or with Alt+Shift+N or Option+Shift+N.</message>
+      <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_TEXT_2" desc="">Using Private Tabs only changes what Brave does on your device — it doesn't change anyone else's behavior. Tor hides your IP address from the sites you visit, and hides the sites you visit from your ISP or your employer. Open a Private Window with Tor from the menu, or with {{ key }}.</message>
       <message name="IDS_BRAVE_PRIVATE_NEW_TAB_BOX_TOR_BUTTON" desc="">Learn more about Tor in Brave</message>
 
       <!-- WebUI adblock resources -->