Merge pull request #1418 from nshki/update-arrow-scroll-copy

Update arrow scroll copy

assets/javascripts/templates/pages/settings_tmpl.coffee

@@ -54,7 +54,7 @@ app.templates.settingsPage = (settings) -> """
       </label>
       <label class="_settings-label">
         <input type="checkbox" form="settings" name="arrowScroll" value="1"#{if settings.arrowScroll then ' checked' else ''}>Use arrow keys to scroll the main content area
-        <small>With this checked, use <code class="_label">alt</code> + <code class="_label">&uarr;</code><code class="_label">&darr;</code><code class="_label">&larr;</code><code class="_label">&rarr;</code> to navigate the sidebar.</small>
+        <small>With this checked, use <code class="_label">shift</code> + <code class="_label">&uarr;</code><code class="_label">&darr;</code><code class="_label">&larr;</code><code class="_label">&rarr;</code> to navigate the sidebar.</small>
       </label>
     </div>
   </div>

assets/javascripts/templates/tip_tmpl.coffee

@@ -1,10 +1,10 @@
-app.templates.tipKeyNav = """
+app.templates.tipKeyNav = () -> """
   <p class="_notif-text">
     <strong>ProTip</strong>
     <span class="_notif-info">(click to dismiss)</span>
   <p class="_notif-text">
-    Hit <code class="_label">&darr;</code> <code class="_label">&uarr;</code> <code class="_label">&larr;</code> <code class="_label">&rarr;</code> to navigate the sidebar.<br>
-    Hit <code class="_label">space / shift space</code>, <code class="_label">alt &darr;/&uarr;</code> or <code class="_label">shift &darr;/&uarr;</code> to scroll the page.
+    Hit #{if app.settings.cache.arrowScroll then '<code class="_label">shift</code> +' else ''} <code class="_label">&darr;</code> <code class="_label">&uarr;</code> <code class="_label">&larr;</code> <code class="_label">&rarr;</code> to navigate the sidebar.<br>
+    Hit <code class="_label">space / shift space</code>#{if app.settings.cache.arrowScroll then ' or <code class="_label">&darr;/&uarr;</code>' else ', <code class="_label">alt &darr;/&uarr;</code> or <code class="_label">shift &darr;/&uarr;</code>'} to scroll the page.
   <p class="_notif-text">
     <a href="/help#shortcuts" class="_notif-link">See all keyboard shortcuts</a>
 """