Bug 1615501 - fix fluent id duplications in calendar/. r=me
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 01 Jun 2020 12:57:52 +0300
changeset 39301 47aa8304f805f5f3d5603b59a2be899c2927c79a
parent 39300 907599e03dc45bb2a96edeb058dea5e2a6d52fd6
child 39302 64d27f1a0583787a078a7ce0816be8205fa59229
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersme
bugs1615501
Bug 1615501 - fix fluent id duplications in calendar/. r=me
calendar/base/content/preferences/alarms.inc.xhtml
calendar/locales/en-US/calendar/preferences.ftl
python/l10n/tb_fluent_migrations/bug_1615501_preferences_calendar.py
--- a/calendar/base/content/preferences/alarms.inc.xhtml
+++ b/calendar/base/content/preferences/alarms.inc.xhtml
@@ -2,48 +2,48 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, you can obtain one at http://mozilla.org/MPL/2.0/.
     <html:fieldset data-category="paneCalendar">
         <html:legend data-l10n-id="reminder-legend"></html:legend>
         <vbox id="alarm-sound-box">
             <hbox align="center">
                 <checkbox id="alarmSoundCheckbox"
                           preference="calendar.alarms.playsound"
-                          data-l10n-id="play-checkbox"/>
+                          data-l10n-id="reminder-play-checkbox"/>
                 <spacer flex="1"/>
                 <button id="calendar.prefs.alarm.sound.play"
-                        data-l10n-id="play-alarm-button"
+                        data-l10n-id="reminder-play-alarm-button"
                         oncommand="gAlarmsPane.previewAlarm()"/>
             </hbox>
             <radiogroup id="alarmSoundType"
                         class="indent"
                         orient="vertical"
                         preference="calendar.alarms.soundType"
                         aria-labelledby="alarmSoundCheckbox">
                 <hbox>
                     <radio id="alarmSoundSystem"
                            value="0"
-                           data-l10n-id="default-sound-label"/>
+                           data-l10n-id="reminder-default-sound-label"/>
                 </hbox>
                 <hbox>
                     <radio id="alarmSoundCustom"
                            value="1"
-                           data-l10n-id="custom-sound-label"/>
+                           data-l10n-id="reminder-custom-sound-label"/>
                 </hbox>
             </radiogroup>
             <hbox align="center" class="input-container">
                 <html:input id="alarmSoundFileField"
                             type="text"
                             class="input-filefield indent"
                             readonly="readonly"
                             preference="calendar.alarms.soundURL"
                             preference-editable="true"
                             aria-labelledby="alarmSoundCustom"/>
                 <button id="calendar.prefs.alarm.sound.browse"
-                        data-l10n-id="browse-sound-label"
+                        data-l10n-id="reminder-browse-sound-label"
                         oncommand="gAlarmsPane.browseAlarm()"/>
             </hbox>
         </vbox>
         <hbox align="center" flex="1">
             <checkbox id="alarmshow"
                       preference="calendar.alarms.show"
                       data-l10n-id="reminder-dialog-label"/>
         </hbox>
--- a/calendar/locales/en-US/calendar/preferences.ftl
+++ b/calendar/locales/en-US/calendar/preferences.ftl
@@ -165,32 +165,36 @@ edit-intab-label =
 accessibility-legend = Accessibility
 
 accessibility-colors-label =
     .label = Optimize colors for accessibility
     .accesskey = c
 
 reminder-legend = When a Reminder is Due:
 
-play-checkbox =
+reminder-play-checkbox =
     .label = Play a sound
     .accesskey = s
 
-play-alarm-button =
+reminder-play-alarm-button =
     .label = Play
     .accesskey = P
 
-default-sound-label =
+reminder-default-sound-label =
     .label = Use default sound
     .accesskey = d
 
-custom-sound-label =
+reminder-custom-sound-label =
     .label = Use the following sound file
     .accesskey = U
 
+reminder-browse-sound-label =
+    .label = Browse…
+    .accesskey = B
+
 reminder-dialog-label =
     .label = Show the reminder dialog
     .accesskey = x
 
 missed-reminder-label =
     .label = Show missed reminders for writable calendars
     .accesskey = m
 
--- a/python/l10n/tb_fluent_migrations/bug_1615501_preferences_calendar.py
+++ b/python/l10n/tb_fluent_migrations/bug_1615501_preferences_calendar.py
@@ -215,32 +215,36 @@ task-due-label =
 
     ctx.add_transforms(
         "calendar/calendar/preferences.ftl",
         "calendar/calendar/preferences.ftl",
         transforms_from(
 """
 reminder-legend = { COPY(from_path, "pref.alarmgoesoff.label") }
 
-play-checkbox =
+reminder-play-checkbox =
     .label = { COPY(from_path, "pref.playasound") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.playsound.accessKey") }
 
-play-alarm-button =
+reminder-play-alarm-button =
     .label = { COPY(from_path, "pref.calendar.alarms.sound.play.label") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.sound.play.accessKey") }
 
-default-sound-label =
+reminder-default-sound-label =
     .label = { COPY(from_path, "pref.calendar.alarms.sound.useDefault.label") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.sound.useDefault.accessKey") }
 
-custom-sound-label =
+reminder-custom-sound-label =
     .label = { COPY(from_path, "pref.calendar.alarms.sound.useCustom.label") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.sound.useCustom.accessKey") }
 
+reminder-browse-sound-label =
+    .label = { COPY(from_path, "pref.calendar.alarms.sound.browse.label") }
+    .accesskey = { COPY(from_path, "pref.calendar.alarms.sound.browse.accessKey") }
+
 reminder-dialog-label =
     .label = { COPY(from_path, "pref.showalarmbox") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.showAlarmBox.accessKey") }
 
 missed-reminder-label =
     .label = { COPY(from_path, "pref.missedalarms2") }
     .accesskey = { COPY(from_path, "pref.calendar.alarms.missedAlarms.accessKey") }