Bug 1615501 - fix fluent id duplications in mail/. r=me
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 01 Jun 2020 12:57:42 +0300
changeset 38411 64d27f1a0583787a078a7ce0816be8205fa59229
parent 38410 47aa8304f805f5f3d5603b59a2be899c2927c79a
child 38412 61ac6bd1437164bdf56c15b96cd14080f078da73
push id2607
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:50:20 +0000
treeherdercomm-beta@9d45cd34927b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1615501
Bug 1615501 - fix fluent id duplications in mail/. r=me
mail/components/preferences/chat.inc.xhtml
mail/components/preferences/general.inc.xhtml
mail/locales/en-US/messenger/preferences/preferences.ftl
python/l10n/tb_fluent_migrations/bug_1615501_preferences.py
--- a/mail/components/preferences/chat.inc.xhtml
+++ b/mail/components/preferences/chat.inc.xhtml
@@ -81,49 +81,49 @@
           </menupopup>
         </menulist>
       </hbox>
       <checkbox id="getAttention"
                 preference="messenger.options.getAttentionOnNewMessages"
                 data-l10n-id="notification-type-label"/>
       <hbox align="center">
         <checkbox id="chatNotification"
-                  data-l10n-id="sound-label"
+                  data-l10n-id="chat-play-sound-label"
                   preference="mail.chat.play_sound"/>
         <spacer flex="1"/>
-        <button id="playChatSound" data-l10n-id="play-button"
+        <button id="playChatSound" data-l10n-id="chat-play-button"
                 oncommand="gChatPane.previewSound();"/>
       </hbox>
       <radiogroup id="chatSoundType"
                   class="indent"
                   orient="vertical"
                   preference="mail.chat.play_sound.type"
                   aria-labelledby="chatNotification">
         <hbox>
           <radio id="chatSoundSystemSound"
-                 data-l10n-id="system-sound-label"
+                 data-l10n-id="chat-system-sound-label"
                  value="0"/>
           <spacer flex="1"/>
         </hbox>
         <hbox>
           <radio id="chatSoundCustom"
-                 data-l10n-id="custom-sound-label"
+                 data-l10n-id="chat-custom-sound-label"
                  value="1"/>
           <spacer flex="1"/>
         </hbox>
         <hbox align="center" class="input-container">
           <html:input id="chatSoundUrlLocation"
                       type="text"
                       class="input-filefield indent"
                       readonly="readonly"
                       preference="mail.chat.play_sound.url"
                       preference-editable="true"
                       aria-labelledby="chatSoundCustom"/>
           <button id="browseForChatSound"
-                  data-l10n-id="browse-sound-button"
+                  data-l10n-id="chat-browse-sound-button"
                   oncommand="gChatPane.browseForSoundFile();"/>
         </hbox>
       </radiogroup>
     </html:fieldset>
 
     <hbox id="chatPaneStylingCategory"
           class="subcategory"
           data-category="paneChat">
--- a/mail/components/preferences/general.inc.xhtml
+++ b/mail/components/preferences/general.inc.xhtml
@@ -294,55 +294,55 @@
                   data-l10n-id="tray-icon-label"/>
       </hbox>
 #endif
 
       <hbox align="center">
 #ifndef XP_MACOSX
         <checkbox id="newMailNotification"
                   preference="mail.biff.play_sound"
-                  data-l10n-id="play-sound-label"
+                  data-l10n-id="mail-play-sound-label"
                   oncommand="gGeneralPane.updatePlaySound();"/>
         <spacer flex="1"/>
         <button id="playSound"
-                data-l10n-id="play-button"
+                data-l10n-id="mail-play-button"
                 oncommand="gGeneralPane.previewSound();"/>
       </hbox>
 
 #ifndef XP_MACOSX
       <radiogroup id="soundType"
                   class="indent"
                   preference="mail.biff.play_sound.type"
                   orient="vertical"
                   oncommand="gGeneralPane.updatePlaySound();"
                   aria-labelledby="newMailNotification">
         <hbox>
           <radio id="system"
                  value="0"
-                 data-l10n-id="system-sound-label"/>
+                 data-l10n-id="mail-system-sound-label"/>
           <spacer flex="1"/>
         </hbox>
         <hbox>
           <radio id="custom"
                  value="1"
-                 data-l10n-id="custom-sound-label"/>
+                 data-l10n-id="mail-custom-sound-label"/>
           <spacer flex="1"/>
         </hbox>
       </radiogroup>
 #endif
       <hbox align="center" class="input-container">
         <html:input id="soundUrlLocation"
                     type="text"
                     class="input-filefield indent"
                     readonly="readonly"
                     preference="mail.biff.play_sound.url"
                     preference-editable="true"
                     aria-labelledby="custom"/>
         <button id="browseForSound"
-                data-l10n-id="browse-sound-label"
+                data-l10n-id="mail-browse-sound-button"
                 oncommand="gGeneralPane.browseForSoundFile();"/>
       </hbox>
     </html:fieldset>
 
     <hbox id="filesAttachmentCategory"
           class="subcategory"
           data-category="paneGeneral">
       <html:h1 data-l10n-id="general-files-and-attachment-header"/>
--- a/mail/locales/en-US/messenger/preferences/preferences.ftl
+++ b/mail/locales/en-US/messenger/preferences/preferences.ftl
@@ -172,23 +172,23 @@ remove-search-engine =
     .label = Remove
     .accesskey = v
 
 minimize-to-tray-label =
     .label = When { -brand-short-name } is minimized, move it to the tray
     .accesskey = m
 
 new-message-arrival = When new messages arrive:
-play-sound-label =
+mail-play-sound-label =
     .label = { PLATFORM() ->
         [macos] Play the following sound file:
         *[other] Play a sound
     }
     .accesskey = d
-play-button =
+mail-play-button =
     .label = Play
     .accesskey = P
 
 change-dock-icon = Change preferences for the app icon
 app-icon-options =
     .label = App Icon Options…
     .accesskey = n
 
@@ -200,23 +200,23 @@ animated-alert-label =
 customize-alert-label =
     .label = Customize…
     .accesskey = C
 
 tray-icon-label =
     .label = Show a tray icon
     .accesskey = t
 
-system-sound-label =
+mail-system-sound-label =
     .label = Default system sound for new mail
     .accesskey = D
-custom-sound-label =
+mail-custom-sound-label =
     .label = Use the following sound file
     .accesskey = U
-browse-sound-label =
+mail-browse-sound-button =
     .label = Browse…
     .accesskey = B
 
 enable-gloda-search-label =
     .label = Enable Global Search and Indexer
     .accesskey = G
 
 datetime-formatting-legend = Date and Time Formatting
@@ -804,29 +804,33 @@ notification-type-label =
         [macos] Animate dock icon
         *[other] Flash the taskbar item
     }
     .accesskey = { PLATFORM() ->
         [macos] o
         *[other] F
     }
 
-sound-label =
+chat-play-sound-label =
     .label = Play a sound
     .accesskey = d
 
-play-button =
+chat-play-button =
     .label = Play
     .accesskey = P
 
-custom-sound-label =
+chat-system-sound-label =
+    .label = Default system sound for new mail
+    .accesskey = D
+
+chat-custom-sound-label =
     .label = Use the following sound file
     .accesskey = U
 
-browse-sound-button =
+chat-browse-sound-button =
     .label = Browse…
     .accesskey = B
 
 theme-label =
     .value = Theme:
     .accesskey = T
 
 style-thunderbird =
--- a/python/l10n/tb_fluent_migrations/bug_1615501_preferences.py
+++ b/python/l10n/tb_fluent_migrations/bug_1615501_preferences.py
@@ -64,25 +64,16 @@ default-search-engine = { COPY(from_path
 add-search-engine =
     .label = { COPY(from_path, "addSearchEngine.label") }
     .accesskey = { COPY(from_path, "addSearchEngine.accesskey") }
 remove-search-engine =
     .label = { COPY(from_path, "removeSearchEngine.label") }
     .accesskey = { COPY(from_path, "removeSearchEngine.accesskey") }
 
 new-message-arrival = { COPY(from_path, "newMessagesArrive.label") }
-play-sound-label =
-    .label = { PLATFORM() ->
-        [macos] { COPY(from_path, "playSoundMac.label") }
-        *[other] { COPY(from_path, "playSound.label") }
-    }
-    .accesskey = { COPY(from_path, "playSound1.accesskey") }
-play-button =
-    .label = { COPY(from_path, "play.label") }
-    .accesskey = { COPY(from_path, "play.accesskey") }
 
 change-dock-icon = { COPY(from_path, "changeDockIconOptions.label") }
 app-icon-options =
     .label = { COPY(from_path, "dockOptions.label") }
     .accesskey = { COPY(from_path, "dockOptions.accesskey") }
 
 notification-settings = { COPY(from_path, "notificationAlertSettings2.label") }
 
@@ -92,22 +83,42 @@ animated-alert-label =
 customize-alert-label =
     .label = { COPY(from_path, "customizeMailAlert.label") }
     .accesskey = { COPY(from_path, "customizeMailAlert.accesskey") }
 
 tray-icon-label =
     .label = { COPY(from_path, "showTrayIcon.label") }
     .accesskey = { COPY(from_path, "showTrayIcon.accesskey") }
 
-custom-sound-label =
+mail-play-sound-label =
+    .label = { PLATFORM() ->
+        [macos] { COPY(from_path, "playSoundMac.label") }
+        *[other] { COPY(from_path, "playSound.label") }
+    }
+    .accesskey = { PLATFORM() ->
+        [macos] { COPY(from_path, "playSoundMac.accesskey") }
+        *[other] { COPY(from_path, "playSound1.accesskey") }
+    }
+
+mail-play-button =
+    .label = { COPY(from_path, "play.label") }
+    .accesskey = { COPY(from_path, "play.accesskey") }
+
+mail-system-sound-label =
+    .label = { COPY(from_path, "systemSound.label") }
+    .accesskey = { COPY(from_path, "systemSound.accesskey") }
+
+mail-custom-sound-label =
     .label = { COPY(from_path, "customsound.label") }
     .accesskey = { COPY(from_path, "customsound.accesskey") }
-browse-sound-label =
+
+mail-browse-sound-button =
     .label = { COPY(from_path, "browse.label") }
     .accesskey = { COPY(from_path, "browse.accesskey") }
+
 """, from_path="mail/chrome/messenger/preferences/general.dtd"
         )
     )
 
     ctx.add_transforms(
         "mail/messenger/preferences/preferences.ftl",
         "mail/messenger/preferences/preferences.ftl",
         [
@@ -971,33 +982,33 @@ notification-type-label =
         [macos] { COPY(from_path, "getAttentionMac.label") }
         *[other] { COPY(from_path, "getAttention.label") }
     }
     .accesskey = { PLATFORM() ->
         [macos] { COPY(from_path, "getAttentionMac.accesskey") }
         *[other] { COPY(from_path, "getAttention.accesskey") }
     }
 
-sound-label =
+chat-play-sound-label =
     .label = { COPY(from_path, "chatSound.label") }
     .accesskey = { COPY(from_path, "chatSound.accesskey") }
 
-play-button =
+chat-play-button =
     .label = { COPY(from_path, "play.label") }
     .accesskey = { COPY(from_path, "play.accesskey") }
 
-system-sound-label =
+chat-system-sound-label =
     .label = { COPY(from_path, "systemSound.label") }
     .accesskey = { COPY(from_path, "systemSound.accesskey") }
 
-custom-sound-label =
+chat-custom-sound-label =
     .label = { COPY(from_path, "customsound.label") }
     .accesskey = { COPY(from_path, "customsound.accesskey") }
 
-browse-sound-button =
+chat-browse-sound-button =
     .label = { COPY(from_path, "browse.label") }
     .accesskey = { COPY(from_path, "browse.accesskey") }
 
 theme-label =
     .value = { COPY(from_path, "messageStyleTheme.label") }
     .accesskey = { COPY(from_path, "messageStyleTheme.accesskey") }
 
 style-thunderbird =