Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIEUS-351: Save and close translation key #463

Merged
merged 4 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 8.1.0 (IN PROGRESS)
* Remove deprecated pane properties ([UIEUS-349](https://issues.folio.org/browse/UIEUS-349))
* Use translation keys of stripes-components ([UIEUS-351](https://folio-org.atlassian.net/browse/UIEUS-351))

## [8.0.1](https://github.com/folio-org/ui-erm-usage/tree/v8.0.1) (2023-11-08)
* Address test warnings ([UIEUS-321](https://issues.folio.org/browse/UIEUS-321))
Expand Down
12 changes: 6 additions & 6 deletions src/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ import { FormattedMessage } from 'react-intl';
const commands = [
{
name: 'new',
label: (<FormattedMessage id="ui-erm-usage.shortcut.createRecord" />),
label: (<FormattedMessage id="stripes-component.shortcut.createRecord" />),
shortcut: 'alt+n'
},
{
name: 'edit',
label: (<FormattedMessage id="ui-erm-usage.shortcut.editRecord" />),
label: (<FormattedMessage id="stripes-component.shortcut.editRecord" />),
shortcut: 'mod+alt+e'
},
{
name: 'save',
label: (<FormattedMessage id="ui-erm-usage.shortcut.saveRecord" />),
label: (<FormattedMessage id="stripes-component.shortcut.saveRecord" />),
shortcut: 'mod+s'
},
{
name: 'expandAllSections',
label: (<FormattedMessage id="ui-erm-usage.shortcut.expandAll" />),
label: (<FormattedMessage id="stripes-component.shortcut.expandAll" />),
shortcut: 'mod+alt+b'
},
{
name: 'collapseAllSections',
label: (<FormattedMessage id="ui-erm-usage.shortcut.collapseAll" />),
label: (<FormattedMessage id="stripes-component.shortcut.collapseAll" />),
shortcut: 'mod+alt+g'
},
{
name: 'search',
label: (<FormattedMessage id="ui-erm-usage.shortcut.goToSearchFilter" />),
label: (<FormattedMessage id="stripes-component.shortcut.goToSearchFilter" />),
shortcut: 'mod+alt+h'
}
];
Expand Down
12 changes: 6 additions & 6 deletions src/commandsGeneral.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ import { FormattedMessage } from 'react-intl';
const commandsGeneral = [
{
name: 'expandCollapse',
label: (<FormattedMessage id="ui-erm-usage.shortcut.expandCollapse" />),
label: (<FormattedMessage id="stripes-components.shortcut.expandOrCollapse" />),
shortcut: 'spacebar'
},
{
name: 'close',
label: (<FormattedMessage id="ui-erm-usage.shortcut.closeModal" />),
label: (<FormattedMessage id="stripes-components.shortcut.closeModal" />),
shortcut: 'esc'
},
{
name: 'copy',
label: (<FormattedMessage id="ui-erm-usage.shortcut.copy" />),
label: (<FormattedMessage id="stripes-components.shortcut.copy" />),
shortcut: 'mod+c'
},
{
name: 'cut',
label: (<FormattedMessage id="ui-erm-usage.shortcut.cut" />),
label: (<FormattedMessage id="stripes-components.shortcut.cut" />),
shortcut: 'mod+x'
},
{
name: 'paste',
label: (<FormattedMessage id="ui-erm-usage.shortcut.paste" />),
label: (<FormattedMessage id="stripes-components.shortcut.paste" />),
shortcut: 'mod+v'
},
{
name: 'find',
label: (<FormattedMessage id="ui-erm-usage.shortcut.find" />),
label: (<FormattedMessage id="stripes-components.shortcut.find" />),
shortcut: 'mod+f'
}
];
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/UDPForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class UDPForm extends React.Component {
onClick={handleSubmit}
disabled={disabled}
>
<FormattedMessage id="ui-erm-usage.udp.form.saveAndClose" />
<FormattedMessage id="stripes-components.saveAndClose" />
</Button>
);

Expand Down
2 changes: 1 addition & 1 deletion src/settings/Aggregators/AggregatorForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class AggregatorForm extends React.Component {
type="submit"
disabled={disabled}
>
<FormattedMessage id="ui-erm-usage.udp.form.saveAndClose" />
<FormattedMessage id="stripes-components.saveAndClose" />
</Button>
);

Expand Down
14 changes: 0 additions & 14 deletions translations/ui-erm-usage/en.json
alb3rtino marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@
"usage-data-providers": "Usage data providers",
"usage-data-provider-pluralizable": "{count} {count, plural, one {usage-data-provider} other {usage-data-providers}}",
"appMenu.keyboardShortcuts": "Keyboard shortcuts",
"shortcut.createRecord": "Create a new record",
"shortcut.editRecord": "Edit a record",
"shortcut.saveRecord": "Save a record",
"shortcut.expandCollapse": "Expand or collapse an accordion",
"shortcut.expandAll": "Expand all accordions",
"shortcut.collapseAll": "Collapse all accordions",
"shortcut.goToSearchFilter": "Go to Search & Filter pane",
"shortcut.closeModal": "Close a modal or pop-up",
"shortcut.copy": "Copy",
"shortcut.cut": "Cut",
"shortcut.paste": "Paste",
"shortcut.find": "Find",

"meta.title": "eUsage",

Expand Down Expand Up @@ -185,7 +173,6 @@
"report.error.3080": "Limit requested greater than maximum server limit",

"udp.form.cancel": "Cancel",
"udp.form.saveAndClose": "Save & close",
"udp.form.close": "Close new usage data provider Dialog",
"udp.form.createUDP": "Create usage data provider",
"udp.form.udpInfo.title": "Usage data provider information",
Expand Down Expand Up @@ -239,7 +226,6 @@
"aggregator.config.popover": "For German National Statistic Server specify the keys:",
"aggregator.config.addParam": "Add config parameter",

"aggregator.form.saveAndClose": "Save and close",
"aggregator.form.create": "Create aggregator",
"aggregator.form.delete.confirm.title": "Delete aggregator",
"aggregator.form.newAggregator": "New aggregator",
Expand Down
Loading