CCA: Replace i18n-content to i18n-text for presubmit warning check

Bug: 172340545
Test: tast -verbose run <DUT> "camera.CCA*"
Change-Id: I41dac406e805e66036be6c141f2d5fdeafb6d4e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639994
Commit-Queue: Shik Chen <shik@chromium.org>
Reviewed-by: Shik Chen <shik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846062}

chromeos/components/camera_app_ui/resources/css/main.css

@@ -1066,12 +1066,12 @@ body.recording-ui-paused #record-time {
 }
 
 body.recording-ui-paused #record-time .icon,
-body:not(.recording-ui-paused) #record-time [i18n-content=record_video_paused_msg] {
+body:not(.recording-ui-paused) #record-time [i18n-text=record_video_paused_msg] {
   display: none;
 }
 
 #record-time #record-time-msg,
-#record-time [i18n-content=record_video_paused_msg] {
+#record-time [i18n-text=record_video_paused_msg] {
   color: white;
   flex-shrink: 0;
   font-size: 13px;
@@ -1355,11 +1355,11 @@ body:not(.has-front-camera):not(.has-back-camera) #builtin-video-header {
   display: none;
 }
 
-body.grid-3x3 .description span[i18n-content=label_grid_3x3],
-body.grid-4x4 .description span[i18n-content=label_grid_4x4],
-body.grid-golden .description span[i18n-content=label_grid_golden],
-body.timer-3s .description span[i18n-content=label_timer_3s],
-body.timer-10s .description span[i18n-content=label_timer_10s],
+body.grid-3x3 .description span[i18n-text=label_grid_3x3],
+body.grid-4x4 .description span[i18n-text=label_grid_4x4],
+body.grid-golden .description span[i18n-text=label_grid_golden],
+body.timer-3s .description span[i18n-text=label_timer_3s],
+body.timer-10s .description span[i18n-text=label_timer_10s],
 .menu-item.resol-item .description span {
   display: inline;
 }

chromeos/components/camera_app_ui/resources/js/util.js

@@ -98,10 +98,9 @@ export function setupI18nElements(rootElement) {
   const setAriaLabel = (element, attr) =>
       element.setAttribute('aria-label', getMessage(element, attr));
 
-  getElements('i18n-content')
+  getElements('i18n-text')
       .forEach(
-          (element) => element.textContent =
-              getMessage(element, 'i18n-content'));
+          (element) => element.textContent = getMessage(element, 'i18n-text'));
   getElements('i18n-tooltip-true')
       .forEach(
           (element) => element.setAttribute(

chromeos/components/camera_app_ui/resources/views/main.html

@@ -136,28 +136,28 @@
             <input type="radio" name="mode"
                  data-mode="video" tabindex="0"
                  i18n-aria="switch_record_video_button">
-            <span i18n-content="label_switch_record_video_button"
+            <span i18n-text="label_switch_record_video_button"
                   aria-hidden="true"></span>
           </div>
           <div class="mode-item">
             <input type="radio" name="mode"
                  data-mode="photo" tabindex="0"
                  i18n-aria="switch_take_photo_button">
-            <span i18n-content="label_switch_take_photo_button"
+            <span i18n-text="label_switch_take_photo_button"
                   aria-hidden="true"></span>
           </div>
           <div class="mode-item">
             <input type="radio" name="mode"
                  data-mode="square" tabindex="0"
                  i18n-aria="switch_take_square_photo_button">
-            <span i18n-content="label_switch_take_square_photo_button"
+            <span i18n-text="label_switch_take_square_photo_button"
                   aria-hidden="true"></span>
           </div>
           <div class="mode-item">
             <input type="radio" name="mode"
                  data-mode="portrait" tabindex="0"
                  i18n-aria="switch_take_portrait_photo_button">
-            <span i18n-content="label_switch_take_portrait_photo_button"
+            <span i18n-text="label_switch_take_portrait_photo_button"
                   aria-hidden="true"></span>
           </div>
         </div>
@@ -165,10 +165,10 @@
       <div id="banner" class="horizontal-center-stripe" aria-live="polite">
         <div id="banner-title">
           <div id="banner-title-icon"></div>
-          <span id="banner-title-text" i18n-content="banner_title"></span>
+          <span id="banner-title-text" i18n-text="banner_title"></span>
         </div>
         <div id="banner-msg">
-          <span i18n-content="banner_msg"></span>
+          <span i18n-text="banner_msg"></span>
         </div>
         <button id="banner-close" i18n-label="banner_close_button"></button>
       </div>
@@ -202,7 +202,7 @@
       </div>
       <div id="record-time" class="top-stripe horizontal-center-stripe" hidden>
         <div class="icon"></div>
-        <div id="paused-msg" i18n-content="record_video_paused_msg"></div>
+        <div id="paused-msg" i18n-text="record_video_paused_msg"></div>
         <div id="record-time-msg"></div>
       </div>
       <div class="top-stripe right-stripe buttons">
@@ -222,17 +222,17 @@
       <div class="menu">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="settings_button"></div>
+          <div i18n-text="settings_button"></div>
         </div>
         <button id="settings-gridtype" class="menu-item" tabindex="0"
                 aria-describedby="gridtype-desc">
           <div class="icon"></div>
           <div>
-            <div i18n-content="grid_type_button"></div>
+            <div i18n-text="grid_type_button"></div>
             <div id="gridtype-desc" class="description" aria-hidden="true">
-              <span i18n-content="label_grid_3x3" i18n-aria="aria_grid_3x3"></span>
-              <span i18n-content="label_grid_4x4" i18n-aria="aria_grid_4x4"></span>
-              <span i18n-content="label_grid_golden"></span>
+              <span i18n-text="label_grid_3x3" i18n-aria="aria_grid_3x3"></span>
+              <span i18n-text="label_grid_4x4" i18n-aria="aria_grid_4x4"></span>
+              <span i18n-text="label_grid_golden"></span>
             </div>
           </div>
           <div class="icon end"></div>
@@ -241,33 +241,33 @@
                 aria-describedby="timerdur-desc">
           <div class="icon"></div>
           <div>
-            <div i18n-content="timer_duration_button"></div>
+            <div i18n-text="timer_duration_button"></div>
             <div id="timerdur-desc" class="description" aria-hidden="true">
-              <span i18n-content="label_timer_3s"></span>
-              <span i18n-content="label_timer_10s"></span>
+              <span i18n-text="label_timer_3s"></span>
+              <span i18n-text="label_timer_10s"></span>
             </div>
           </div>
           <div class="icon end"></div>
         </button>
         <button id="settings-resolution" class="menu-item" tabindex="0">
           <div class="icon"></div>
-          <div i18n-content="camera_resolution_button">
+          <div i18n-text="camera_resolution_button">
           </div>
           <div class="icon end"></div>
         </button>
         <button id="settings-expert" class="menu-item" tabindex="0">
           <div class="icon"></div>
-          <div i18n-content="expert_mode_button">
+          <div i18n-text="expert_mode_button">
           </div>
           <div class="icon end"></div>
         </button>
         <button id="settings-feedback" class="menu-item" tabindex="0">
           <div class="icon"></div>
-          <div i18n-content="feedback_button"></div>
+          <div i18n-text="feedback_button"></div>
         </button>
         <button id="settings-help" class="menu-item" tabindex="0">
           <div class="icon"></div>
-          <div i18n-content="help_button"></div>
+          <div i18n-text="help_button"></div>
         </button>
       </div>
     </div>
@@ -275,24 +275,24 @@
       <div class="menu">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="grid_type_button"></div>
+          <div i18n-text="grid_type_button"></div>
         </div>
         <label class="menu-item circle">
           <input id="grid-3x3" class="icon" type="radio" tabindex="0"
                  name="gridtype" data-state="grid-3x3" data-key="toggle3x3"
                  checked>
-          <span i18n-content="label_grid_3x3" i18n-aria="aria_grid_3x3"></span>
+          <span i18n-text="label_grid_3x3" i18n-aria="aria_grid_3x3"></span>
         </label>
         <label class="menu-item circle">
           <input id="grid-4x4" class="icon" type="radio" tabindex="0"
                  name="gridtype" data-state="grid-4x4" data-key="toggle4x4">
-          <span i18n-content="label_grid_4x4" i18n-aria="aria_grid_4x4"></span>
+          <span i18n-text="label_grid_4x4" i18n-aria="aria_grid_4x4"></span>
         </label>
         <label class="menu-item circle">
           <input id="grid-golden" class="icon" type="radio" tabindex="0"
                  name="gridtype" data-state="grid-golden"
                  data-key="toggleGolden">
-          <span i18n-content="label_grid_golden"></span>
+          <span i18n-text="label_grid_golden"></span>
         </label>
       </div>
     </div>
@@ -300,18 +300,18 @@
       <div class="menu">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="timer_duration_button"></div>
+          <div i18n-text="timer_duration_button"></div>
         </div>
         <label class="menu-item circle">
           <input id="timer-3s" class="icon" type="radio" tabindex="0"
                  name="timerdur" data-state="timer-3s" data-key="toggle3sec"
                  checked>
-          <span i18n-content="label_timer_3s"></span>
+          <span i18n-text="label_timer_3s"></span>
         </label>
         <label class="menu-item circle">
           <input id="timer-10s" class="icon" type="radio" tabindex="0"
                  name="timerdur" data-state="timer-10s" data-key="toggle10sec">
-          <span i18n-content="label_timer_10s"></span>
+          <span i18n-text="label_timer_10s"></span>
         </label>
       </div>
     </div>
@@ -319,15 +319,15 @@
       <div class="menu">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="camera_resolution_button"></div>
+          <div i18n-text="camera_resolution_button"></div>
         </div>
         <div id="builtin-photo-header" class="menu-item"
-          i18n-content="label_switch_take_photo_button"></div>
+          i18n-text="label_switch_take_photo_button"></div>
         <button id="settings-front-photores"
                 class="menu-item resol-item photo-item" tabindex="0"
                 aria-describedby="front-photores-desc">
           <div>
-            <div i18n-content="label_front_camera"></div>
+            <div i18n-text="label_front_camera"></div>
             <div id="front-photores-desc" class="description"
                  aria-hidden="true">
               <span></span>
@@ -339,7 +339,7 @@
                 class="menu-item resol-item photo-item" tabindex="0"
                 aria-describedby="back-photores-desc">
           <div>
-            <div i18n-content="label_back_camera"></div>
+            <div i18n-text="label_back_camera"></div>
             <div id="back-photores-desc" class="description" aria-hidden="true">
               <span></span>
             </div>
@@ -347,12 +347,12 @@
           <div class="icon end"></div>
         </button>
         <div id="builtin-video-header" class="menu-item"
-          i18n-content="label_switch_record_video_button"></div>
+          i18n-text="label_switch_record_video_button"></div>
         <button id="settings-front-videores"
                 class="menu-item resol-item video-item" tabindex="0"
                 aria-describedby="front-videores-desc">
           <div>
-            <div i18n-content="label_front_camera"></div>
+            <div i18n-text="label_front_camera"></div>
             <div id="front-videores-desc" class="description"
                  aria-hidden="true">
               <span></span>
@@ -364,7 +364,7 @@
                 class="menu-item resol-item video-item" tabindex="0"
                 aria-describedby="back-videores-desc">
           <div>
-            <div i18n-content="label_back_camera"></div>
+            <div i18n-text="label_back_camera"></div>
             <div id="back-videores-desc" class="description" aria-hidden="true">
               <span></span>
             </div>
@@ -377,7 +377,7 @@
       <div class="menu" data-name="photores">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="photo_resolution_button"></div>
+          <div i18n-text="photo_resolution_button"></div>
         </div>
       </div>
     </div>
@@ -385,7 +385,7 @@
       <div class="menu" data-name="videores">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="video_resolution_button"></div>
+          <div i18n-text="video_resolution_button"></div>
         </div>
       </div>
     </div>
@@ -393,25 +393,25 @@
       <div class="menu">
         <div class="menu-header circle">
           <button class="icon" tabindex="0" i18n-aria="back_button"></button>
-          <div i18n-content="expert_mode_button"></div>
+          <div i18n-text="expert_mode_button"></div>
         </div>
         <label class="menu-item">
           <input id="expert-show-metadata" class="icon" type="checkbox"
                  tabindex="0" data-state="show-metadata"
                  data-key="showMetadata">
-          <span i18n-content="expert_preview_metadata"></span>
+          <span i18n-text="expert_preview_metadata"></span>
         </label>
         <label class="menu-item">
           <input id="expert-save-metadata" class="icon" type="checkbox"
                  tabindex="0" data-state="save-metadata"
                  data-key="saveMetadata">
-          <span i18n-content="expert_save_metadata"></span>
+          <span i18n-text="expert_save_metadata"></span>
         </label>
         <label class="menu-item">
           <input id="expert-print-performance-logs" class="icon" type="checkbox"
                  tabindex="0" data-state="print-performance-logs"
                  data-key="printPerformanceLogs">
-          <span i18n-content="expert_print_performance_logs"></span>
+          <span i18n-text="expert_print_performance_logs"></span>
         </label>
       </div>
     </div>
@@ -425,9 +425,9 @@
         <div class="dialog-msg dialog-msg-holder"></div>
         <div class="dialog-buttons">
           <button class="dialog-negative-button" tabindex="0"
-                  i18n-content="dialog_cancel_button"></button>
+                  i18n-text="dialog_cancel_button"></button>
           <button class="dialog-positive-button" tabindex="0"
-                  i18n-content="dialog_ok_button"></button>
+                  i18n-text="dialog_ok_button"></button>
         </div>
       </div>
     </div>
@@ -452,11 +452,11 @@
     </template>
     <template id="extcam-resolution-item-template">
         <div class="menu-item external-camera title-item"
-          i18n-content="label_external_camera"></div>
+          i18n-text="label_external_camera"></div>
         <button class="menu-item external-camera resol-item photo-item"
               tabindex="0">
           <div>
-            <div i18n-content="photo_resolution_button"></div>
+            <div i18n-text="photo_resolution_button"></div>
             <div class="description" aria-hidden="true">
               <span></span>
             </div>
@@ -466,7 +466,7 @@
         <button class="menu-item external-camera resol-item video-item"
               tabindex="0">
           <div>
-            <div i18n-content="video_resolution_button"></div>
+            <div i18n-text="video_resolution_button"></div>
             <div class="description" aria-hidden="true">
               <span></span>
             </div>