Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation

Subsume browser links to variables, to exclude from translation

lms/templates/navigation.html

@@ -132,7 +132,7 @@ site_status_msg = get_site_status_msg(course_id)
 </header>
 % if course:
 <!--[if lte IE 8]>
-<div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link_start}Chrome{chrome_link_end} or {ff_link_start}Firefox{ff_link_end}.').format(chrome_link_start='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">', chrome_link_end='</a>', ff_link_start='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">', ff_link_end='</a>')}</div>
+<div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link} or {ff_link}.').format(chrome_link='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">Chrome</a>', ff_link='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>')}</div>
 <![endif]-->
 % endif
 

lms/templates/verify_student/show_requirements.html

@@ -132,17 +132,8 @@
 
             <div class="copy">
               <p>
-                <%
-                  browser_links = {
-                    "ff_a_start": '<a rel="{rel}" href="{url}">'.format(url="https://www.mozilla.org/en-US/firefox/new/", rel="external"),
-                    "chrome_a_start": '<a rel="{rel}" href="{url}">'.format(url="https://www.google.com/intl/en/chrome/browser/", rel="external"),
-                    "safari_a_start": '<a rel="{rel}" href="{url}">'.format(url="http://www.apple.com/safari/", rel="external"),
-                    "ie_a_start": '<a rel="{rel}" href="{url}">'.format(url="http://windows.microsoft.com/en-us/internet-explorer/download-ie", rel="external"),
-                    "a_end": '</a>'
-                  }
-                %>
                 <span class="copy-super">${_("A webcam and a modern browser")}</span>
-                <span class="copy-sub"><strong>${_("{ff_a_start}Firefox{a_end}, {chrome_a_start}Chrome{a_end}, {safari_a_start}Safari{a_end}, {ie_a_start}IE9+{a_end}").format(**browser_links)}</strong> - ${_("Please make sure your browser is updated to the most recent version possible")}
+                <span class="copy-sub"><strong><a rel="external" href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>, <a rel="external" href="https://www.google.com/intl/en/chrome/browser/">Chrome</a>, <a rel="external" href="http://www.apple.com/safari/">Safari</a>, <a rel="external" href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">IE9+</a></strong> - ${_("Please make sure your browser is updated to the most recent version possible")}
                 </span>
               </p>
             </div>