Fix <wizard> sometimes starts with the wrong title. Resolve #4533.
Some checks are pending
CI / Build, Upload, Test (push) Waiting to run

This is caused by
https://searchfox.org/mozilla-central/source/toolkit/content/widgets/wizard.js#417-428
where fluent attribute is removed and replaced with the default value.
We need to stick with `data-header-label-id` until this is resolved
upstream.
This commit is contained in:
Tom Najdek 2024-08-14 17:53:33 +02:00
parent ca83e4303c
commit 4f1e44978e
No known key found for this signature in database
GPG key ID: EEC61A7B4C667D77
3 changed files with 21 additions and 30 deletions

View file

@ -48,7 +48,7 @@
id="publications-dialog-wizard" id="publications-dialog-wizard"
class="publications-dialog-wizard" class="publications-dialog-wizard"
> >
<wizardpage pageid="intro" data-l10n-id="publications-intro-page"> <wizardpage pageid="intro" data-header-label-id="publications-intro-page">
<p class="description" data-l10n-id="publications-intro" /> <p class="description" data-l10n-id="publications-intro" />
<checkbox native="true" id="include-files" data-l10n-id="publications-include-checkbox-files" /> <checkbox native="true" id="include-files" data-l10n-id="publications-include-checkbox-files" />
<checkbox native="true" id="include-notes" data-l10n-id="publications-include-checkbox-notes" /> <checkbox native="true" id="include-notes" data-l10n-id="publications-include-checkbox-notes" />
@ -58,7 +58,7 @@
</div> </div>
</wizardpage> </wizardpage>
<wizardpage pageid="choose-sharing" data-l10n-id="publications-sharing-page"> <wizardpage pageid="choose-sharing" data-header-label-id="publications-sharing-page">
<div id="keep-rights"> <div id="keep-rights">
<checkbox native="true" id="keep-rights-checkbox" data-l10n-id="publications-sharing-keep-rights-field" /> <checkbox native="true" id="keep-rights-checkbox" data-l10n-id="publications-sharing-keep-rights-field" />
</div> </div>
@ -74,7 +74,7 @@
</div> </div>
</wizardpage> </wizardpage>
<wizardpage pageid="choose-license" data-l10n-id="publications-license-page"> <wizardpage pageid="choose-license" data-header-label-id="publications-license-page">
<p class="description" data-l10n-id="publications-choose-license-text" /> <p class="description" data-l10n-id="publications-choose-license-text" />
<h2 data-l10n-id="publications-choose-license-adaptations-prompt" /> <h2 data-l10n-id="publications-choose-license-adaptations-prompt" />
<radiogroup id="choose-adaptations" align="start"> <radiogroup id="choose-adaptations" align="start">

View file

@ -5,7 +5,8 @@
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd"> <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window data-l10n-id="rtfScan-wizard"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
id="rtfscan-wizard-window" id="rtfscan-wizard-window"
onload="Zotero_RTFScan.init()" onload="Zotero_RTFScan.init()"
@ -21,8 +22,8 @@
Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this); Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
</script> </script>
<wizard id="rtfscan-wizard" class="rtfscan-wizard zotero-dialog-window" data-l10n-id="rtfScan-wizard"> <wizard id="rtfscan-wizard" class="rtfscan-wizard zotero-dialog-window">
<wizardpage pageid="page-start" data-l10n-id="rtfScan-intro-page"> <wizardpage pageid="page-start" data-header-label-id="rtfScan-intro-page">
<div> <div>
<span class="page-start-1" data-l10n-id="rtfScan-introPage-description" /> <span class="page-start-1" data-l10n-id="rtfScan-introPage-description" />
<span class="example">{Smith, 2009}</span> <span class="example">{Smith, 2009}</span>
@ -44,30 +45,29 @@
<button id="choose-output-file" data-l10n-id="rtfScan-choose-output-file" /> <button id="choose-output-file" data-l10n-id="rtfScan-choose-output-file" />
</div> </div>
</wizardpage> </wizardpage>
<wizardpage pageid="scan-page" data-l10n-id="rtfScan-scan-page" > <wizardpage pageid="scan-page" data-header-label-id="rtfScan-scan-page" >
<p data-l10n-id="rtfScan-scanPage-description" /> <p data-l10n-id="rtfScan-scanPage-description" />
<html:progress id="scan-progress" /> <html:progress id="scan-progress" />
</wizardpage> </wizardpage>
<wizardpage class="citations-page" pageid="citations-page" data-l10n-id="rtfScan-citations-page"> <wizardpage class="citations-page" pageid="citations-page" data-header-label-id="rtfScan-citations-page">
<p class="citations-page-description" data-l10n-id="rtfScan-citations-page-description" /> <p class="citations-page-description" data-l10n-id="rtfScan-citations-page-description" />
<div class="table-container"> <div class="table-container">
<div id="tree" /> <div id="tree" />
</div> </div>
</wizardpage> </wizardpage>
<wizardpage pageid="style-page" data-l10n-id="rtfScan-style-page"> <wizardpage pageid="style-page" data-header-label-id="rtfScan-style-page">
<div class="style-selector-container"> <div class="style-selector-container">
<style-configurator id="style-configurator" /> <style-configurator id="style-configurator" />
</div> </div>
</wizardpage> </wizardpage>
<wizardpage pageid="format-page" data-l10n-id="rtfScan-format-page"> <wizardpage pageid="format-page" data-header-label-id="rtfScan-format-page">
<p data-l10n-id="rtfScan-format-page-description" /> <p data-l10n-id="rtfScan-format-page-description" />
<html:progress id="format-progress" /> <html:progress id="format-progress" />
</wizardpage> </wizardpage>
<wizardpage pageid="complete-page" data-l10n-id="rtfScan-complete-page"> <wizardpage pageid="complete-page" data-header-label-id="rtfScan-complete-page">
<p data-l10n-id="rtfScan-complete-page-description" /> <p data-l10n-id="rtfScan-complete-page-description" />
</wizardpage> </wizardpage>
</wizard> </wizard>
<script src="include.js" />
<script src="fileInterface.js" /> <script src="fileInterface.js" />
<script src="rtfScan.js" /> <script src="rtfScan.js" />
</window> </window>

View file

@ -236,29 +236,23 @@ rtfScan-choose-output-file =
.label = { general-choose-file } .label = { general-choose-file }
.aria-label = Choose Output File .aria-label = Choose Output File
rtfScan-intro-page = rtfScan-intro-page = Introduction
.label = Introduction
rtfScan-scan-page = rtfScan-scan-page = Scanning for Citations
.label = Scanning for Citations
rtfScan-scanPage-description = { -app-name } is scanning your document for citations. Please be patient. rtfScan-scanPage-description = { -app-name } is scanning your document for citations. Please be patient.
rtfScan-citations-page = rtfScan-citations-page = Verify Cited Items
.label = Verify Cited Items
rtfScan-citations-page-description = Please review the list of recognized citations below to ensure that { -app-name } has selected the corresponding items correctly. Any unmapped or ambiguous citations must be resolved before proceeding to the next step. rtfScan-citations-page-description = Please review the list of recognized citations below to ensure that { -app-name } has selected the corresponding items correctly. Any unmapped or ambiguous citations must be resolved before proceeding to the next step.
rtfScan-style-page = rtfScan-style-page = Document Formatting
.label = Document Formatting
rtfScan-format-page = rtfScan-format-page = Formatting Citations
.label = Formatting Citations
rtfScan-format-page-description = { -app-name } is processing and formatting your RTF file. Please be patient. rtfScan-format-page-description = { -app-name } is processing and formatting your RTF file. Please be patient.
rtfScan-complete-page = rtfScan-complete-page = RTF Scan Complete
.label = RTF Scan Complete
rtfScan-complete-page-description = Your document has now been scanned and processed. Please ensure that it is formatted correctly. rtfScan-complete-page-description = Your document has now been scanned and processed. Please ensure that it is formatted correctly.
rtfScan-action-find-match = rtfScan-action-find-match =
@ -340,8 +334,7 @@ integration-prefs-exportDocument =
integration-error-unable-to-find-winword = { -app-name } could not find a running Word instance. integration-error-unable-to-find-winword = { -app-name } could not find a running Word instance.
publications-intro-page = publications-intro-page = My Publications
.label = My Publications
publications-intro = Items you add to My Publications will be shown on your profile page on zotero.org. If you choose to include attached files, they will be made publicly available under the license you specify. Only add work you yourself have created, and only include files if you have the rights to distribute them and wish to do so. publications-intro = Items you add to My Publications will be shown on your profile page on zotero.org. If you choose to include attached files, they will be made publicly available under the license you specify. Only add work you yourself have created, and only include files if you have the rights to distribute them and wish to do so.
publications-include-checkbox-files = publications-include-checkbox-files =
@ -355,8 +348,7 @@ publications-intro-authorship =
publications-intro-authorship-files = publications-intro-authorship-files =
.label = I created this work and have the rights to distribute included files. .label = I created this work and have the rights to distribute included files.
publications-sharing-page = publications-sharing-page = Choose how your work may be shared
.label = Choose how your work may be shared
publications-sharing-keep-rights-field = publications-sharing-keep-rights-field =
.label = Keep the existing Rights field .label = Keep the existing Rights field
@ -371,8 +363,7 @@ publications-sharing-cc =
publications-sharing-cc0 = publications-sharing-cc0 =
.label = Yes, and place my work in the public domain .label = Yes, and place my work in the public domain
publications-license-page = publications-license-page = Choose a Creative Commons license
.label = Choose a Creative Commons license
publications-choose-license-text = A Creative Commons license allows others to copy and redistribute your work as long as they give appropriate credit, provide a link to the license, and indicate if changes were made. Additional conditions can be specified below. publications-choose-license-text = A Creative Commons license allows others to copy and redistribute your work as long as they give appropriate credit, provide a link to the license, and indicate if changes were made. Additional conditions can be specified below.
publications-choose-license-adaptations-prompt = Allow adaptations of your work to be shared? publications-choose-license-adaptations-prompt = Allow adaptations of your work to be shared?