Merge pull request #1406 from thisandagain/gh1402

Use new standard privacy policy. Resolves GH-1402

locale/en_US/explore.json

@@ -540,7 +540,7 @@
     "description": "Now, learn to make and share more of your favorite things on the web."
   },
   "Mozilla privacy policy agreement": {
-    "message": "I agree to Mozilla Webmaker's <a href=\"https://webmaker.org/terms\">Terms</a> and <a href=\"https://webmaker.org/privacy\">Privacy Policy</a>.",
+    "message": "I agree to Mozilla Webmaker's <a href=\"https://webmaker.org/terms\">Terms</a> and <a href=\"https://www.mozilla.org/privacy/websites\">Privacy Policy</a>.",
     "description": "Mozilla privacy policy agreement"
   },
   "sharing": {

public/views/appmaker.html

@@ -114,7 +114,7 @@
       <ul class="nav navbar-nav">
         <li><a href="mailto:help@webmaker.org">{{ 'Contact' | i18n }}</a></li>
         <li><a href="https://sendto.mozilla.org/page/contribute/join-mozilla?source=join_link">{{ 'Donate' | i18n }}</a></li>
-        <li><a href="/{{lang}}/privacy">{{ 'Privacy' | i18n }}</a></li>
+        <li><a href="https://www.mozilla.org/privacy/websites">{{ 'Privacy' | i18n }}</a></li>
         <li><a href="/{{lang}}/terms">{{ 'Legal' | i18n }}</a></li>
         <li><a href="https://support.mozilla.org/products/webmaker">{{ 'Help' | i18n }}</a></li>
       </ul>

public/views/partials/footer.html

@@ -8,7 +8,7 @@
       </a>
     </li>
     <li><a href="mailto:help@webmaker.org">{{ 'Contact' | i18n }}</a></li>
-    <li><a href="/{{lang}}/privacy">{{ 'Privacy' | i18n }}</a></li>
+    <li><a href="https://www.mozilla.org/privacy/websites">{{ 'Privacy' | i18n }}</a></li>
     <li><a href="/{{lang}}/terms">{{ 'Legal' | i18n }}</a></li>
     <li>
       <a href="https://support.mozilla.org/products/webmaker">

public/views/terms.html

@@ -29,7 +29,7 @@
       <p>You will be required to provide information about yourself 
         (such as identification or contact details) to us as part of your 
         registration for and use of Webmaker. We will handle your information as 
-        we describe in <a href="/{{ lang }}/privacy">Webmaker Privacy</a></p>
+        we describe in <a href="https://www.mozilla.org/privacy/websites">Webmaker Privacy</a></p>
 
       <h2>Your Submissions</h2>
       <p>You may upload or embed comments, profile pictures and other content 

views/app.html

@@ -129,7 +129,7 @@
             </a>
           </li>
           <li><a href="mailto:help@webmaker.org">{{ gettext("Contact") }}</a></li>
-          <li><a href="/{{localeInfo.lang}}/privacy">{{ gettext("Privacy") }}</a></li>
+          <li><a href="https://www.mozilla.org/privacy/websites">{{ gettext("Privacy") }}</a></li>
           <li><a href="/{{localeInfo.lang}}/terms">{{ gettext("Legal") }}</a></li>
           <li>
             <a href="https://support.mozilla.org/products/webmaker">

views/layout.html

@@ -142,7 +142,7 @@
               </a>
             </li>
             <li><a href="mailto:help@webmaker.org">{{ gettext('Contact') }}</a></li>
-            <li><a href="/{{localeInfo.lang}}/privacy">{{ gettext('Privacy') }}</a></li>
+            <li><a href="https://www.mozilla.org/privacy/websites">{{ gettext('Privacy') }}</a></li>
             <li><a href="/{{localeInfo.lang}}/terms">{{ gettext('Legal') }}</a></li>
             <li>
               <a href="https://support.mozilla.org/products/webmaker">

views/localweb.html

@@ -479,7 +479,7 @@
                 </a>
               </li>
               <li><a href="mailto:help@webmaker.org">{{ gettext('Contact') }}</a></li>
-              <li><a href="/{{localeInfo.lang}}/privacy">{{ gettext('Privacy') }}</a></li>
+              <li><a href="https://www.mozilla.org/privacy/websites">{{ gettext('Privacy') }}</a></li>
               <li><a href="/{{localeInfo.lang}}/terms">{{ gettext('Legal') }}</a></li>
               <li>
                 <a href="https://support.mozilla.org/products/webmaker">