Bug 1159906 - merge pull request #29824 from stasm:1159906-ftu-remove…

…-external_links to mozilla-b2g:master

apps/ftu/index.html

@@ -89,7 +89,6 @@
   <script defer src="js/utils.js"></script>
   <script defer src="js/finish_screen.js"></script>
   <script defer src="js/tutorial.js"></script>
-  <script defer src="js/external_links.js"></script>
   <script defer src="js/navigation.js"></script>
   <script defer src="js/data_mobile.js"></script>
   <script defer src="js/time.js"></script>
@@ -555,11 +554,13 @@ <h2 id="time-zone-title">
           faster and more responsive.
         </p>
         <!-- Links destinations are discussed in https://bugzilla.mozilla.org/show_bug.cgi?id=812956 -->
-        <p id='external-link-telemetry'>
-          Learn more at www.mozilla.org/telemetry
+        <p data-l10n-id='learn-more-telemetry2'
+           data-l10n-args='{"url": "www.mozilla.org/telemetry"}'>
+          <a href="http://www.mozilla.org/telemetry" class="external"></a>
         </p>
-        <p id='external-link-information'>Learn how Mozilla handles your
-          information at www.mozilla.org/privacy
+        <p data-l10n-id='learn-more-information2'
+           data-l10n-args='{"url": "www.mozilla.org/privacy"}'>
+          <a href="http://www.mozilla.org/privacy" class="external"></a>
         </p>
       </section>
       <section role="region" id="SIM_mandatory">
@@ -585,26 +586,19 @@ <h2 id="time-zone-title">
             Email successfully added!
           </p>
         </section>
-        <p id="external-link-privacy">
-          Learn how Mozilla handles your information in our privacy policy.
+        <p data-l10n-id="learn-more-privacy2">
+          <a href="http://www.mozilla.org/privacy/firefox-os" class="external"></a>
         </p>
       </section>
       <section role="region" id="welcome_browser">
         <section id="browser_logo_horizontal">
           <img src="/shared/resources/branding/logosmall.png" role="presentation">
         </section>
-        <p id="browser_os_welcome">
-          Welcome to Browser OS, the free and
-          open source operating system from
-          Mozilla. Our mission is to promote
-          openness, innovation and opportunity
-          by keeping the power of the Web in
-          your hands.
+        <p data-l10n-id="htmlWelcome2">
+          <a href="#about-your-rights"></a>
         </p>
-        <p id="browser_os_improve">
-          You can help us improve our products and services by automatically
-          sending analytics data. See our Privacy Notice to learn how we
-          handle data from your device.
+        <p data-l10n-id="helpImprove2">
+          <a href="https://www.mozilla.org/privacy/firefox-os" class="external"></a>
         </p>
         <section id="form_share_statistics">
           <label class="pack-checkbox">

apps/ftu/js/navigation.js

@@ -1,8 +1,7 @@
 /* global DataMobile, SimManager, IccHelper,
           SdManager, UIManager, WifiManager, WifiUI,
           ImportIntegration,
-          OperatorVariant,
-          getLocalizedLink */
+          OperatorVariant */
 /* exported Navigation */
 'use strict';
 /*
@@ -235,12 +234,6 @@ var Navigation = {
         break;
       case '#welcome_browser':
         UIManager.mainTitle.setAttribute('data-l10n-id', 'aboutBrowser');
-        var welcome = document.getElementById('browser_os_welcome');
-        navigator.mozL10n.setAttributes(welcome, 'htmlWelcome2',
-          getLocalizedLink('htmlWelcome'));
-        var improve = document.getElementById('browser_os_improve');
-        navigator.mozL10n.setAttributes(improve, 'helpImprove2',
-          getLocalizedLink('helpImprove'));
 
         // Initialize the share checkbox according to the preset value
         // of debug.performance_data.shared
@@ -256,9 +249,6 @@ var Navigation = {
         break;
       case '#browser_privacy':
         UIManager.mainTitle.setAttribute('data-l10n-id', 'aboutBrowser');
-        var linkPrivacy = document.getElementById('external-link-privacy');
-        navigator.mozL10n.setAttributes(linkPrivacy, 'learn-more-privacy2',
-          getLocalizedLink('learn-more-privacy'));
         break;
       case '#SIM_mandatory':
         UIManager.mainTitle.setAttribute('data-l10n-id', 'SIM_mandatory');
@@ -271,12 +261,6 @@ var Navigation = {
       case '#sharing-performance-data':
         UIManager.mainTitle.setAttribute('data-l10n-id', 'aboutBrowser');
         UIManager.navBar.classList.add('back-only');
-        var linkTelemetry = document.getElementById('external-link-telemetry');
-        navigator.mozL10n.setAttributes(linkTelemetry, 'learn-more-telemetry2',
-          getLocalizedLink('learn-more-telemetry'));
-        var linkInfo = document.getElementById('external-link-information');
-        navigator.mozL10n.setAttributes(linkInfo, 'learn-more-information2',
-          getLocalizedLink('learn-more-information'));
         break;
     }
 

apps/ftu/locales/ftu.en-US.properties

@@ -237,21 +237,18 @@ SIM_mandatory_warm = Please, insert a SIM card and reboot your phone.
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
 
 telemetry-sends2 = Telemetry sends Mozilla data about performance, hardware, configurations, customizations and app usage in your {{brandShortName}} device. We use this to make our products better, faster and more responsive.
-learn-more-telemetry2.innerHTML = Learn more at <a href="{{href}}" class="{{className}}">{{textContent}}</a>
-learn-more-information2.innerHTML = Learn how Mozilla handles your information at <a href="{{href}}" class="{{className}}">{{textContent}}</a>
+learn-more-telemetry2 = Learn more at <a>{{url}}</a>
+learn-more-information2 = Learn how Mozilla handles your information at <a>{{url}}</a>
 
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
 # OS privacy
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#
 
-htmlWelcome2.innerHTML = Welcome to <a href="{{href}}" class="{{className}}">{{textContent}}</a>, the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
-htmlWelcome-link = {{brandShortName}}
+htmlWelcome2 = Welcome to <a>{{brandShortName}}</a>, the free and open source operating system from Mozilla. Our mission is to promote openness, innovation and opportunity by keeping the power of the Web in your hands.
 
-helpImprove2.innerHTML = You can help us improve our products and services by automatically sending analytics data. See our <a href="{{href}}" class="{{className}}">{{textContent}}</a> to learn how we handle data from your device.
-helpImprove-link = Privacy Notice
+helpImprove2 = You can help us improve our products and services by automatically sending analytics data. See our <a>Privacy Notice</a> to learn how we handle data from your device.
 
-learn-more-privacy2.innerHTML = Learn how Mozilla handles your information in our <a href="{{href}}" class="{{className}}">{{textContent}}</a>.
-learn-more-privacy-link = privacy policy
+learn-more-privacy2 = Learn how Mozilla handles your information in our <a>privacy policy</a>.
 aboutBrowser = About {{brandShortName}}
 aboutYourPrivacy2 = Your Privacy
 mozillaCommunity2 = When you use {{brandShortName}}, you become part of a global community helping to build a brighter future for the Web. If you’d like to know more about the Mozilla community, our other products and events near you, please enter your email address below.

apps/ftu/test/unit/mock_navigation_index.html

@@ -48,15 +48,10 @@ <h1 id="main-title"></h1>
     <a href="https://www.mozilla.org/privacy/firefox-os/"
     class="external" title="URL title">url text</a>
     <section role="region" id="sharing-performance-data">
-        <p id='external-link-telemetry'></p>
-        <p id='external-link-information'></p>
     </section>
     <section role="region" id="browser_privacy">
-        <p id='external-link-privacy'></p>
     </section>
     <section role="region" id="welcome_browser">
-        <p id="browser_os_welcome"></p>
-        <p id="browser_os_improve"></p>
         <input type="checkbox" id="share-performance"/>
     </section>
 </section>

apps/ftu/test/unit/navigation_test.js

@@ -19,7 +19,6 @@ require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
 require('/shared/test/unit/mocks/mock_navigator_moz_apps.js');
 require('/shared/test/unit/mocks/mock_l10n.js');
 
-requireApp('ftu/js/external_links.js');
 requireApp('ftu/js/navigation.js');
 
 requireApp('ftu/test/unit/mock_wifi_manager.js');
@@ -312,9 +311,6 @@ suite('navigation >', function() {
           observer.disconnect();
           assert.equal(UIManager.mainTitle.getAttribute('data-l10n-id'),
             'aboutBrowser');
-          var linkRef = document.getElementById('external-link-privacy');
-          assert.equal(linkRef.getAttribute('data-l10n-id'),
-            'learn-more-privacy2');
         });
       });
       observer.observe(UIManager.mainTitle, observerConfig);

apps/ftu/test/unit/ui_manager_test.js

@@ -8,7 +8,6 @@ require('/shared/test/unit/mocks/mock_l10n.js');
 require('/shared/test/unit/mocks/mock_settings_listener.js');
 
 requireApp('ftu/js/ui.js');
-requireApp('ftu/js/external_links.js');
 requireApp('ftu/js/navigation.js');
 
 requireApp('ftu/test/unit/mock_tutorial.js');