Merge pull request #32182 from gasolin/issue-1204420

Bug 1204420 - [Settings] remove I-S panel strings in HTML, r=yzen
mozilla-b2g · Oct 5, 2015 · e1a76e6 · e1a76e6
2 parents e084565 + 7c8faa0
commit e1a76e6
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 41 deletions.
diff --git a/apps/settings/elements/application_storage.html b/apps/settings/elements/application_storage.html
@@ -34,6 +34,7 @@ <h1 data-l10n-id="appStorage-header"></h1>
         </li>
       </ul>
     </div>
+
     <panel data-path="panels/app_storage/panel"></panel>
 
   </template>

diff --git a/apps/settings/elements/browsing_privacy.html b/apps/settings/elements/browsing_privacy.html
@@ -37,5 +37,6 @@ <h1 data-l10n-id="confirm-clear-title"></h1>
     </form>
 
     <panel data-path="panels/browsing_privacy/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/call_voice_mail_settings.html b/apps/settings/elements/call_voice_mail_settings.html
@@ -17,5 +17,6 @@ <h1 data-l10n-id="voiceMail-header"></h1>
     </div>
 
     <panel data-path="panels/call_voice_mail_settings/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/developer_service_workers.html b/apps/settings/elements/developer_service_workers.html
@@ -32,7 +32,6 @@ <h1 data-l10n-id="service-worker"></h1>
       </ul>
     </div>
 
-
     <panel data-path="panels/developer_service_workers/panel"></panel>
 
   </template>

diff --git a/apps/settings/elements/do_not_track.html b/apps/settings/elements/do_not_track.html
@@ -38,5 +38,6 @@ <h2 data-l10n-id="doNotTrack-dt"></h2>
     </div>
 
     <panel data-path="panels/do_not_track/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/downloads.html b/apps/settings/elements/downloads.html
@@ -4,10 +4,12 @@
       <h1 data-l10n-id="downloads"></h1>
       <button id="downloads-edit-button" data-icon="edit" data-l10n-id="editButton"></button>
     </gaia-header>
+
     <gaia-header id="downloads-edit-header" action="close" hidden="hidden">
       <h1 id="downloads-title-edit" data-l10n-id="downloads-edit"></h1>
       <button disabled id="downloads-delete-button" data-l10n-id="downloads-delete"></button>
     </gaia-header>
+
     <section id="download-list-empty" hidden="hidden">
       <span id="dle-vertical"></span>
       <span id="dle-text" data-l10n-id="no-downloads"></span>

diff --git a/apps/settings/elements/full_developer_mode.html b/apps/settings/elements/full_developer_mode.html
@@ -32,5 +32,6 @@ <h1 data-l10n-id="developer-menu-disabled-warning-title"></h1>
     </div>
 
     <panel data-path="panels/full_developer_mode/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/full_developer_mode_final_warning.html b/apps/settings/elements/full_developer_mode_final_warning.html
@@ -12,5 +12,6 @@ <h1 data-l10n-id="enable-full-dev-mode-final-warning-title"></h1>
     </div>
 
     <panel data-path="panels/full_developer_mode_final_warning/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/full_developer_mode_warning.html b/apps/settings/elements/full_developer_mode_warning.html
@@ -32,5 +32,6 @@ <h1 data-l10n-id="developer-menu-disabled-warning-title"></h1>
     </div>
 
     <panel data-path="panels/full_developer_mode_warning/panel"></panel>
+
   </template>
-</element>
+</element>
diff --git a/apps/settings/elements/icc.html b/apps/settings/elements/icc.html
@@ -2,7 +2,7 @@
   <template>
 
     <gaia-header id="icc-stk-main-header" action="back">
-      <h1 id="icc-stk-header"> SIM Toolkit </h1>
+      <h1 id="icc-stk-header" data-l10n-id="simToolkit-header"></h1>
     </gaia-header>
 
     <div>
@@ -15,6 +15,5 @@ <h2 id="icc-stk-subheader"></h2>
     </div>
 
     <script src="js/icc.js"></script>
-
   </template>
 </element>
diff --git a/apps/settings/elements/improve_browser_os.html b/apps/settings/elements/improve_browser_os.html
@@ -65,5 +65,6 @@ <h2 data-l10n-id="crashReports"></h2>
     </div>
 
     <panel data-path="panels/improve_browser_os/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/improve_browser_os_choose_feedback.html b/apps/settings/elements/improve_browser_os_choose_feedback.html
@@ -4,6 +4,7 @@
   	<gaia-header action="back" data-href="#improveBrowserOS">
       <h1 data-l10n-id="sendFeedbackTitle"></h1>
     </gaia-header>
+
     <div>
       <ul>
         <li class="description">
@@ -26,6 +27,8 @@ <h1 data-l10n-id="sendFeedbackTitle"></h1>
         </li>
       </ul>
     </div>
+
     <panel data-path="panels/feedback_choose/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/improve_browser_os_send_feedback.html b/apps/settings/elements/improve_browser_os_send_feedback.html
@@ -4,6 +4,7 @@
   	<gaia-header action="back" id="feedback-header">
       <h1 id="feedback-title"></h1>
     </gaia-header>
+
     <div>
       <ul>
         <li class="description">
@@ -46,6 +47,8 @@ <h1 id="feedback-title"></h1>
         <button id="feedback-done-btn" class="full" data-l10n-id="done"></button>
       </menu>
     </form>
+
     <panel data-path="panels/feedback_send/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/languages.html b/apps/settings/elements/languages.html
@@ -48,5 +48,6 @@ <h2 data-l10n-id="sample-format"></h2>
     </div>
 
     <panel data-path="panels/languages/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/media_storage.html b/apps/settings/elements/media_storage.html
@@ -9,28 +9,26 @@ <h1 data-l10n-id="mediaStorage-header"></h1>
       <div id="volume-list">
       </div>
       <header>
-        <h2 data-l10n-id="advanced">Advanced</h2>
+        <h2 data-l10n-id="advanced"></h2>
       </header>
       <ul>
         <li class="default-media-location">
-          <p data-l10n-id="default-media-location">Default Media Location</p>
+          <p data-l10n-id="default-media-location"></p>
           <span class="button icon icon-dialog">
             <select id="defaultMediaLocation" name="device.storage.writable.name">
             </select>
           </span>
         </li>
-        <li data-l10n-id="default-media-location-msg" class="explanation">
-          Choose where photos, videos, music and downloads are stored by default.
-        </li>
+        <li data-l10n-id="default-media-location-msg" class="explanation"></li>
       </ul>
     </div>
     <form data-type="confirm" role="dialog" id="unmount-sdcard-dialog" hidden>
       <section>
-        <p data-l10n-id="unmount-sdcard-confirmation">You will not be able to access content on the SD card after you unmount it. Do you want to proceed?</p>
+        <p data-l10n-id="unmount-sdcard-confirmation"></p>
       </section>
       <menu>
-        <button id="unmount-sdcard-cancel-btn" data-l10n-id="cancel">Cancel</button>
-        <button id="unmount-sdcard-ok-btn" class="recommend" data-l10n-id="ok">Ok</button>
+        <button id="unmount-sdcard-cancel-btn" data-l10n-id="cancel"></button>
+        <button id="unmount-sdcard-ok-btn" class="recommend" data-l10n-id="ok"></button>
       </menu>
     </form>
     <form data-type="confirm" role="dialog" id="format-sdcard-dialog" hidden>

diff --git a/apps/settings/elements/search.html b/apps/settings/elements/search.html
@@ -1,5 +1,6 @@
 <element name="search" extends="section">
   <template>
+
     <gaia-header action="back" data-href="#root">
       <h1 data-l10n-id="search-header"></h1>
     </gaia-header>
@@ -25,5 +26,6 @@ <h1 data-l10n-id="search-header"></h1>
     </div>
 
     <panel data-path="panels/search/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/simcard_manager.html b/apps/settings/elements/simcard_manager.html
@@ -1,36 +1,38 @@
 <element name="sim-manager" extends="section">
   <template>
+
     <gaia-header action="back" data-href="#root">
       <h1 data-l10n-id="simManager-header"></h1>
     </gaia-header>
+
     <div>
       <ul class="sim-card-container"></ul>
       <header class="sim-manager-settings-header">
-        <h2 data-l10n-id="simSettings">SIM Settings</h2>
+        <h2 data-l10n-id="simSettings"></h2>
       </header>
       <ul class="sim-manager-select-list">
         <li class="sim-manager-security-entry">
           <a class="menu-item" href="#simpin">
-            <span data-l10n-id="simSecurity">SIM Security</span>
+            <span data-l10n-id="simSecurity"></span>
           </a>
         </li>
         <li>
-          <p data-l10n-id="sim-manager-outgoing-calls">Outgoing Calls</p>
-          <p data-l10n-id="sim-manager-outgoing-call-desc" class="explanation">Calls will be sent from</p>
+          <p data-l10n-id="sim-manager-outgoing-calls"></p>
+          <p data-l10n-id="sim-manager-outgoing-call-desc" class="explanation"></p>
           <span class="button icon icon-dialog">
             <select class="sim-manager-outgoing-call-select"></select>
           </span>
         </li>
         <li>
-          <p data-l10n-id="sim-manager-outgoing-messages">Outgoing Messages</p>
-          <p data-l10n-id="sim-manager-outgoing-messages-desc" class="explanation">SMS will be sent from</p>
+          <p data-l10n-id="sim-manager-outgoing-messages"></p>
+          <p data-l10n-id="sim-manager-outgoing-messages-desc" class="explanation"></p>
           <span class="button icon icon-dialog">
             <select class="sim-manager-outgoing-messages-select"></select>
           </span>
         </li>
         <li>
-          <p data-l10n-id="sim-manager-outgoing-data">Data</p>
-          <p data-l10n-id="sim-manager-outgoing-data-description" class="explanation">Data service network and Marketplace payments</p>
+          <p data-l10n-id="sim-manager-outgoing-data"></p>
+          <p data-l10n-id="sim-manager-outgoing-data-description" class="explanation"></p>
           <span class="button icon icon-dialog">
             <select class="sim-manager-outgoing-data-select"></select>
           </span>
@@ -39,5 +41,6 @@ <h2 data-l10n-id="simSettings">SIM Settings</h2>
     </div>
 
     <panel data-path="panels/simcard_manager/panel"></panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/simpin.html b/apps/settings/elements/simpin.html
@@ -7,23 +7,18 @@ <h1 data-l10n-id="simSecurity-header"></h1>
 
     <div>
       <header>
-        <h2 data-l10n-id="whatIsSimPin">What is a SIM PIN?</h2>
+        <h2 data-l10n-id="whatIsSimPin"></h2>
       </header>
       <ul>
         <li class="description">
-          <p data-l10n-id="simPinIntro1">
-            A SIM PIN prevents access to the SIM card cellular data networks.
-            When it’s on, any device containing the SIM card will request the
-            PIN upon restart.
-          </p>
-          <p data-l10n-id="simPinIntro2">
-            A SIM PIN is not the same as the Passcode used to unlock the device.
-          </p>
+          <p data-l10n-id="simPinIntro1"></p>
+          <p data-l10n-id="simPinIntro2"></p>
         </li>
       </ul>
       <ul class="simpin-container"></ul>
     </div>
 
     <panel data-path="panels/simpin/panel"><panel>
+
   </template>
 </element>
diff --git a/apps/settings/elements/sound.html b/apps/settings/elements/sound.html
@@ -27,54 +27,54 @@ <h2 data-l10n-id="volume">Volume</h2>
         </li>
         <li class="sound-setting">
           <label class="range-icons volume notification">
-            <p data-l10n-id="ringtone-and-notification-sound">Ringtones & Notifications</p>
+            <p data-l10n-id="ringtone-and-notification-sound"></p>
             <span data-icon="call-ringing" aria-hidden="true"></span>
             <input type="range" step="1" min="0" value="8" max="15">
           </label>
         </li>
         <li class="sound-setting">
           <label class="range-icons volume alarm">
-            <p data-l10n-id="alarm-sound">Alarm</p>
+            <p data-l10n-id="alarm-sound"></p>
             <span data-icon="alarm-clock" aria-hidden="true"></span>
             <input type="range" step="1" min="0" value="8" max="15">
           </label>
         </li>
       </ul>
 
       <header>
-        <h2 data-l10n-id="tones">Tones</h2>
+        <h2 data-l10n-id="tones"></h2>
       </header>
       <ul>
         <li class="ringer" hidden>
           <a class="menu-item ring-tone-selection" href="#">
-            <span data-l10n-id="ringtones">Ringtones</span>
+            <span data-l10n-id="ringtones"></span>
             <small><bdi class="desc"></bdi></small>
           </a>
         </li>
         <li id="alerts">
           <a class="menu-item alert-tone-selection" href="#">
-            <span data-l10n-id="alerts">Alerts</span>
+            <span data-l10n-id="alerts"></span>
             <small><bdi class="desc"></bdi></small>
           </a>
         </li>
         <li class="touch-tone-selector" hidden>
-          <a data-l10n-id="touch-tones">Audible touch tones</a>
+          <a data-l10n-id="touch-tones"></a>
           <span class="button icon icon-dialog">
             <select name="phone.dtmf.type">
-              <option value="short" data-l10n-id="touch-tone-short">Short</option>
-              <option value="long" data-l10n-id="touch-tone-long">Long</option>
+              <option value="short" data-l10n-id="touch-tone-short"></option>
+              <option value="long" data-l10n-id="touch-tone-long"></option>
             </select>
           </span>
         </li>
         <li id="manage-tones">
           <a class="manage-tones-button menu-item" href="#">
-            <span data-l10n-id="manage-tones">Manage Tones</span>
+            <span data-l10n-id="manage-tones"></span>
           </a>
         </li>
       </ul>
 
       <header>
-        <h2 data-l10n-id="other-sounds">Other Sounds</h2>
+        <h2 data-l10n-id="other-sounds"></h2>
       </header>
       <ul>
         <li>

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -1452,11 +1452,11 @@ user-guide=User Guide
 default-support=Please contact your local provider for support.
 
 # Device :: SIM toolkit
+simToolkit-header=SIM Toolkit
 operatorServices=Operator Services
 operatorServices-help=Help
-operatorServices-helpmenu=Help menu
+operatorServices-helpmenu=Help Menu
 stkAppsNotAvailable=SIM card applications not available.
-simToolkit=SIM toolkit
 
 # Device :: SIM toolkit - NAI (Next Action Indicator)
 stkItemsNaiSetUpCall=Set Up Call