diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx index 22a7c76e03..cd06240431 100644 --- a/chrome/content/zotero/collectionTree.jsx +++ b/chrome/content/zotero/collectionTree.jsx @@ -25,7 +25,6 @@ const React = require('react'); const ReactDOM = require('react-dom'); -const { IntlProvider } = require('react-intl'); const LibraryTree = require('./libraryTree'); const VirtualizedTable = require('components/virtualized-table'); const { TreeSelectionStub } = VirtualizedTable; @@ -42,9 +41,7 @@ var CollectionTree = class CollectionTree extends LibraryTree { var ref; opts.domEl = domEl; let elem = ( - - ref = c } {...opts} /> - + ref = c } {...opts} /> ); await new Promise(resolve => ReactDOM.render(elem, domEl, resolve)); diff --git a/chrome/content/zotero/components/annotation.jsx b/chrome/content/zotero/components/annotation.jsx index cbcc61b68f..bb2f9f3d86 100644 --- a/chrome/content/zotero/components/annotation.jsx +++ b/chrome/content/zotero/components/annotation.jsx @@ -29,7 +29,6 @@ import React, { memo } from 'react'; import ReactDOM from "react-dom"; import PropTypes from 'prop-types'; import cx from 'classnames'; -import { IntlProvider, FormattedMessage } from "react-intl"; // This is a quick reimplementation of the annotation for use in the conflict resolution window. // We'll want to replace this with a single component shared between the PDF reader and the rest @@ -40,31 +39,26 @@ function AnnotationBox({ data }) { }; return ( - -
-
{Zotero.getString('itemTypes.annotation')}
-
-
-
{Zotero.Cite.getLocatorString('page')} {data.pageLabel}
-
- {data.text !== undefined - ?
{data.text}
- : ''} - {data.type == 'image' - // TODO: Localize - // TODO: Render from PDF based on position, if file is the same? Or don't - // worry about it? - ?
[image not shown]
- : ''} - {data.comment !== undefined - ?
{data.comment}
- : ''} +
+
{Zotero.getString('itemTypes.annotation')}
+
+
+
{Zotero.Cite.getLocatorString('page')} {data.pageLabel}
+ {data.text !== undefined + ?
{data.text}
+ : ''} + {data.type == 'image' + // TODO: Localize + // TODO: Render from PDF based on position, if file is the same? Or don't + // worry about it? + ?
[image not shown]
+ : ''} + {data.comment !== undefined + ?
{data.comment}
+ : ''}
- +
); } diff --git a/chrome/content/zotero/components/button.jsx b/chrome/content/zotero/components/button.jsx index 8c15d62070..ca4c6c9cab 100644 --- a/chrome/content/zotero/components/button.jsx +++ b/chrome/content/zotero/components/button.jsx @@ -27,7 +27,6 @@ const React = require('react') const { PureComponent, createElement: create } = React -const { injectIntl } = require('react-intl') const { IconDownChevron } = require('./icons') const cx = require('classnames') const { @@ -59,19 +58,19 @@ class Button extends PureComponent { } get text() { - const { intl, text } = this.props + const { text } = this.props; return text ? - intl.formatMessage({ id: text }) : - null + Zotero.getString(text) : + null; } get title() { - const { intl, title } = this.props + const { title } = this.props; return title ? - intl.formatMessage({ id: title }) : - null + Zotero.getString(title) : + null; } get menuMarker() { @@ -159,5 +158,5 @@ class Button extends PureComponent { module.exports = { ButtonGroup, - Button: injectIntl(Button) + Button } diff --git a/chrome/content/zotero/components/createParent/createParent.jsx b/chrome/content/zotero/components/createParent/createParent.jsx index 7ce4ba0c27..606ca70915 100644 --- a/chrome/content/zotero/components/createParent/createParent.jsx +++ b/chrome/content/zotero/components/createParent/createParent.jsx @@ -29,7 +29,6 @@ import React, { memo } from 'react'; import ReactDOM from "react-dom"; import PropTypes from 'prop-types'; import cx from 'classnames'; -import { IntlProvider } from "react-intl"; function CreateParent({ loading, item, toggleAccept }) { // When the input has/does not have characters toggle the accept button on the dialog @@ -43,31 +42,26 @@ function CreateParent({ loading, item, toggleAccept }) { }; return ( - -
- - { item.attachmentFilename } - -
- -
-
-
+
+ + { item.attachmentFilename } + +
+ +
+
- +
); } diff --git a/chrome/content/zotero/components/progressQueueTable.jsx b/chrome/content/zotero/components/progressQueueTable.jsx index 58011f87bb..4b08ee4c44 100644 --- a/chrome/content/zotero/components/progressQueueTable.jsx +++ b/chrome/content/zotero/components/progressQueueTable.jsx @@ -25,7 +25,6 @@ import React, { memo, useCallback, useEffect, useRef } from 'react'; import PropTypes from 'prop-types'; import { getDOMElement } from 'components/icons'; -import { IntlProvider } from 'react-intl'; import VirtualizedTable, { renderCell } from 'components/virtualized-table'; import { noop } from './utils'; @@ -101,17 +100,15 @@ const ProgressQueueTable = ({ onActivate = noop, progressQueue }) => { }, []); // eslint-disable-line react-hooks/exhaustive-deps return ( - - - + ); }; diff --git a/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx b/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx index 29045e7e0f..f2a67d803d 100644 --- a/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx +++ b/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx @@ -25,7 +25,6 @@ const React = require('react'); const PropTypes = require('prop-types'); -const { FormattedMessage } = require('react-intl'); var { Collection } = require('react-virtualized'); // See also .tag-selector-item in _tag-selector.scss @@ -191,14 +190,14 @@ class TagList extends React.PureComponent { if (!this.props.loaded) { tagList = (
- + {Zotero.getString('zotero.tagSelector.loadingTags')}
); } else if (tagCount == 0) { tagList = (
- + {Zotero.getString('zotero.tagSelector.noTagsToDisplay')}
); } diff --git a/chrome/content/zotero/components/virtualized-table.jsx b/chrome/content/zotero/components/virtualized-table.jsx index 8407a1992c..57eb0be005 100644 --- a/chrome/content/zotero/components/virtualized-table.jsx +++ b/chrome/content/zotero/components/virtualized-table.jsx @@ -30,7 +30,6 @@ const PropTypes = require('prop-types'); const cx = require('classnames'); const WindowedList = require('./windowed-list'); const Draggable = require('./draggable'); -const { injectIntl } = require('react-intl'); const { IconDownChevron, getDOMElement } = require('components/icons'); const TYPING_TIMEOUT = 1000; @@ -1658,7 +1657,7 @@ function makeRowRenderer(getRowData) { function formatColumnName(column) { if (column.label in Zotero.Intl.strings) { - return Zotero.Intl.strings[column.label]; + return Zotero.getString(column.label); } else if (/^[^\s]+\w\.\w[^\s]+$/.test(column.label)) { try { @@ -1674,7 +1673,7 @@ function formatColumnName(column) { return column.label; } -module.exports = injectIntl(VirtualizedTable, { forwardRef: true }); +module.exports = VirtualizedTable; module.exports.TreeSelection = TreeSelection; module.exports.TreeSelectionStub = TreeSelectionStub; module.exports.renderCell = renderCell; diff --git a/chrome/content/zotero/containers/tagSelectorContainer.jsx b/chrome/content/zotero/containers/tagSelectorContainer.jsx index 25aa8d5b17..467ca59263 100644 --- a/chrome/content/zotero/containers/tagSelectorContainer.jsx +++ b/chrome/content/zotero/containers/tagSelectorContainer.jsx @@ -31,7 +31,6 @@ const React = require('react'); const ReactDOM = require('react-dom'); const PropTypes = require('prop-types'); -const { IntlProvider } = require('react-intl'); const TagSelector = require('components/tagSelector.js'); const defaults = { tagColors: new Map(), @@ -772,9 +771,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent { static init(domEl, opts) { var ref; let elem = ( - - ref = c } {...opts} /> - + ref = c } {...opts} /> ); ReactDOM.render(elem, domEl); ref.domEl = domEl; diff --git a/chrome/content/zotero/contextPane.js b/chrome/content/zotero/contextPane.js index 47c7999990..9d5db05864 100644 --- a/chrome/content/zotero/contextPane.js +++ b/chrome/content/zotero/contextPane.js @@ -931,13 +931,13 @@ var ZoteroContextPane = new function () { // Info tab var tabInfo = document.createXULElement('tab'); - tabInfo.setAttribute('label', Zotero.Intl.strings['zotero.tabs.info.label']); + tabInfo.setAttribute('label', Zotero.getString('zotero.tabs.info.label')); // Tags tab var tabTags = document.createXULElement('tab'); - tabTags.setAttribute('label', Zotero.Intl.strings['zotero.tabs.tags.label']); + tabTags.setAttribute('label', Zotero.getString('zotero.tabs.tags.label')); // Related tab var tabRelated = document.createXULElement('tab'); - tabRelated.setAttribute('label', Zotero.Intl.strings['zotero.tabs.related.label']); + tabRelated.setAttribute('label', Zotero.getString('zotero.tabs.related.label')); tabs.append(tabInfo, tabTags, tabRelated); tabbox.append(tabs, tabpanels); diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx index 8283cef47f..719f61c2c6 100644 --- a/chrome/content/zotero/itemTree.jsx +++ b/chrome/content/zotero/itemTree.jsx @@ -27,7 +27,6 @@ const { noop, getDragTargetOrient } = require("components/utils"); const PropTypes = require("prop-types"); const React = require('react'); const ReactDOM = require('react-dom'); -const { IntlProvider } = require('react-intl'); const LibraryTree = require('./libraryTree'); const VirtualizedTable = require('components/virtualized-table'); const { renderCell, formatColumnName } = VirtualizedTable; @@ -48,9 +47,7 @@ var ItemTree = class ItemTree extends LibraryTree { var ref; opts.domEl = domEl; let elem = ( - - ref = c } {...opts} /> - + ref = c } {...opts} /> ); await new Promise(resolve => ReactDOM.render(elem, domEl, resolve)); @@ -3707,7 +3704,7 @@ var ItemTree = class ItemTree extends LibraryTree { // Restore Default Column Order // let menuitem = doc.createXULElement('menuitem'); - menuitem.setAttribute('label', Zotero.Intl.strings['zotero.items.restoreColumnOrder.label']); + menuitem.setAttribute('label', Zotero.getString('zotero.items.restoreColumnOrder.label')); menuitem.setAttribute('anonid', prefix + 'restore-order'); menuitem.addEventListener('command', () => this.tree._columns.restoreDefaultOrder()); menupopup.appendChild(menuitem); diff --git a/chrome/content/zotero/locateManager.jsx b/chrome/content/zotero/locateManager.jsx index a38f6e6649..91829b741f 100644 --- a/chrome/content/zotero/locateManager.jsx +++ b/chrome/content/zotero/locateManager.jsx @@ -24,7 +24,6 @@ */ import VirtualizedTable from 'components/virtualized-table'; -const { IntlProvider } = require('react-intl'); import React from 'react'; import ReactDOM from 'react-dom'; @@ -41,21 +40,19 @@ function init() { engines = Zotero.LocateManager.getEngines(); const domEl = document.querySelector('#locateManager-tree'); let elem = ( - - engines.length} - id="locateManager-table" - ref={ref => tree = ref} - renderItem={VirtualizedTable.makeRowRenderer(getRowData)} - showHeader={true} - multiSelect={true} - columns={columns} - onColumnSort={null} - disableFontSizeScaling={true} - getRowString={index => getRowData(index).name} - onActivate={handleActivate} - /> - + engines.length} + id="locateManager-table" + ref={ref => tree = ref} + renderItem={VirtualizedTable.makeRowRenderer(getRowData)} + showHeader={true} + multiSelect={true} + columns={columns} + onColumnSort={null} + disableFontSizeScaling={true} + getRowString={index => getRowData(index).name} + onActivate={handleActivate} + /> ); return new Promise(resolve => ReactDOM.render(elem, domEl, resolve)); } diff --git a/chrome/content/zotero/preferences/preferences_cite.jsx b/chrome/content/zotero/preferences/preferences_cite.jsx index afd699d78c..0eee275765 100644 --- a/chrome/content/zotero/preferences/preferences_cite.jsx +++ b/chrome/content/zotero/preferences/preferences_cite.jsx @@ -30,7 +30,6 @@ import FilePicker from 'zotero/modules/filePicker'; var React = require('react'); var ReactDOM = require('react-dom'); var VirtualizedTable = require('components/virtualized-table'); -var { IntlProvider } = require('react-intl'); var { makeRowRenderer } = VirtualizedTable; Zotero_Preferences.Cite = { @@ -102,22 +101,20 @@ Zotero_Preferences.Cite = { } }; let elem = ( - - this.styles.length} - id="styleManager-table" - ref={ref => this._tree = ref} - renderItem={makeRowRenderer(index => this.styles[index])} - showHeader={true} - multiSelect={true} - columns={columns} - staticColumns={true} - disableFontSizeScaling={true} - onSelectionChange={selection => document.getElementById('styleManager-delete').disabled = !selection.count} - onKeyDown={handleKeyDown} - getRowString={index => this.styles[index].title} - /> - + this.styles.length} + id="styleManager-table" + ref={ref => this._tree = ref} + renderItem={makeRowRenderer(index => this.styles[index])} + showHeader={true} + multiSelect={true} + columns={columns} + staticColumns={true} + disableFontSizeScaling={true} + onSelectionChange={selection => document.getElementById('styleManager-delete').disabled = !selection.count} + onKeyDown={handleKeyDown} + getRowString={index => this.styles[index].title} + /> ); let styleManager = document.getElementById("styleManager"); diff --git a/chrome/content/zotero/preferences/preferences_export.jsx b/chrome/content/zotero/preferences/preferences_export.jsx index 02f53220bc..33cbabba68 100644 --- a/chrome/content/zotero/preferences/preferences_export.jsx +++ b/chrome/content/zotero/preferences/preferences_export.jsx @@ -28,7 +28,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); var VirtualizedTable = require('components/virtualized-table'); -var { IntlProvider } = require('react-intl'); var { makeRowRenderer } = VirtualizedTable; Zotero_Preferences.Export = { @@ -479,22 +478,20 @@ Zotero_Preferences.Export = { }; let elem = ( - - this._rows.length} - id="quickCopy-siteSettings-table" - ref={ref => this._tree = ref} - renderItem={makeRowRenderer(index => this._rows[index])} - showHeader={true} - columns={columns} - staticColumns={true} - disableFontSizeScaling={true} - onSelectionChange={handleSelectionChange} - onKeyDown={handleKeyDown} - getRowString={index => this._rows[index].domain} - onActivate={(event, indices) => Zotero_Preferences.Export.showQuickCopySiteEditor(true)} - /> - + this._rows.length} + id="quickCopy-siteSettings-table" + ref={ref => this._tree = ref} + renderItem={makeRowRenderer(index => this._rows[index])} + showHeader={true} + columns={columns} + staticColumns={true} + disableFontSizeScaling={true} + onSelectionChange={handleSelectionChange} + onKeyDown={handleKeyDown} + getRowString={index => this._rows[index].domain} + onActivate={(event, indices) => Zotero_Preferences.Export.showQuickCopySiteEditor(true)} + /> ); await new Promise(resolve => ReactDOM.render(elem, document.getElementById("quickCopy-siteSettings"), resolve)); } else { diff --git a/chrome/content/zotero/preferences/preferences_sync.jsx b/chrome/content/zotero/preferences/preferences_sync.jsx index 8b596779d7..167d6df9c8 100644 --- a/chrome/content/zotero/preferences/preferences_sync.jsx +++ b/chrome/content/zotero/preferences/preferences_sync.jsx @@ -32,7 +32,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); var VirtualizedTable = require('components/virtualized-table'); var { getDOMElement } = require('components/icons'); -var { IntlProvider } = require('react-intl'); var { renderCell } = VirtualizedTable; Zotero_Preferences.Sync = { @@ -330,20 +329,18 @@ Zotero_Preferences.Sync = { } }; let elem = ( - - this._rows.length} - id="librariesToSync-table" - ref={ref => this._tree = ref} - renderItem={renderItem} - showHeader={true} - columns={columns} - staticColumns={true} - getRowString={index => this._rows[index].name} - disableFontSizeScaling={true} - onKeyDown={handleKeyDown} - /> - + this._rows.length} + id="librariesToSync-table" + ref={ref => this._tree = ref} + renderItem={renderItem} + showHeader={true} + columns={columns} + staticColumns={true} + getRowString={index => this._rows[index].name} + disableFontSizeScaling={true} + onKeyDown={handleKeyDown} + /> ); ReactDOM.render(elem, document.getElementById("libraries-to-sync-tree")); diff --git a/chrome/content/zotero/preferences/preferences_sync.xhtml b/chrome/content/zotero/preferences/preferences_sync.xhtml index 75eb5bbb85..ad69bb1811 100644 --- a/chrome/content/zotero/preferences/preferences_sync.xhtml +++ b/chrome/content/zotero/preferences/preferences_sync.xhtml @@ -241,8 +241,8 @@ &zotero.preferences.sync.reset;