Skip to content

Commit

Permalink
Merge pull request #1804 from qdraw/feature/202411_command_e_folder_w…
Browse files Browse the repository at this point in the history
…arning

change message into warning
  • Loading branch information
qdraw authored Nov 8, 2024
2 parents 0b0e899 + bc8c6bd commit 8ca8c3e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions history.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Semantic Versioning 2.0.0 is from version 0.1.6+
- [x] (Fixed) _Front-end_ Invalid date parsing (PR #1802, Issue #1508)
- [x] (Fixed) _Back-end_ Fix for query home item (PR #1803)
- [x] (Added) _Front-end_ Add UI element to open current folder in archive view (PR #1803)
- [x] (Fixed) _Front-end_ Change command + e message (PR #1804)

## version 0.6.2 - 2024-10-11 {#v0.6.2}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ describe("MenuOptionDesktopEditorOpenSelectionNoSelectWarning", () => {

const settings = useGlobalSettings();
const language = new Language(settings.language);
const MessageItemSelectionRequired = language.key(localization.MessageItemSelectionRequired);
const MessageItemSelectionRequired = language.key(localization.MessageItemSelectionAdvised);

const component = render(
<MenuOptionDesktopEditorOpenSelectionNoSelectWarning select={[]} isReadOnly={false} />
Expand Down Expand Up @@ -175,7 +175,7 @@ describe("MenuOptionDesktopEditorOpenSelectionNoSelectWarning", () => {

const settings = useGlobalSettings();
const language = new Language(settings.language);
const MessageItemSelectionRequired = language.key(localization.MessageItemSelectionRequired);
const MessageItemSelectionRequired = language.key(localization.MessageItemSelectionAdvised);

const component = render(
<MenuOptionDesktopEditorOpenSelectionNoSelectWarning select={[]} isReadOnly={false} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { memo, useState } from "react";
import { FunctionComponent, memo, useState } from "react";
import useFetch from "../../../hooks/use-fetch";
import useGlobalSettings from "../../../hooks/use-global-settings";
import useHotKeys from "../../../hooks/use-keyboard/use-hotkeys";
Expand All @@ -13,7 +13,7 @@ interface IMenuOptionDesktopEditorOpenSelectionNoSelectWarningProps {
isReadOnly: boolean;
}

const MenuOptionDesktopEditorOpenSelectionNoSelectWarning: React.FunctionComponent<IMenuOptionDesktopEditorOpenSelectionNoSelectWarningProps> =
const MenuOptionDesktopEditorOpenSelectionNoSelectWarning: FunctionComponent<IMenuOptionDesktopEditorOpenSelectionNoSelectWarningProps> =
memo(({ select, isReadOnly }) => {
const selectArray = select ?? [];
// Check API to know if feature is needed!
Expand All @@ -26,7 +26,7 @@ const MenuOptionDesktopEditorOpenSelectionNoSelectWarning: React.FunctionCompone
// Get language keys
const settings = useGlobalSettings();
const language = new Language(settings.language);
const MessageItemSelectionRequired = language.key(localization.MessageItemSelectionRequired);
const MessageItemSelectionAdvised = language.key(localization.MessageItemSelectionAdvised);

/**
* Open editor with keys - command + e
Expand All @@ -36,7 +36,7 @@ const MenuOptionDesktopEditorOpenSelectionNoSelectWarning: React.FunctionCompone
setIsError("");
return;
}
setIsError(MessageItemSelectionRequired);
setIsError(MessageItemSelectionAdvised);
});

return (
Expand Down
8 changes: 4 additions & 4 deletions starsky/starsky/clientapp/src/localization/localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,10 @@
"nl": "Deze melding is bedoeld om te voorkomen dat er eventuele problemen optreden, zoals het vastlopen van je computer.",
"de": "Dieser Hinweis soll potenzielle Probleme wie das Einfrieren Ihres Computers verhindern"
},
"MessageItemSelectionRequired": {
"en": "Please select at least one item before proceeding.",
"nl": "Selecteer alstublieft eerst minstens één item voordat u doorgaat.",
"de": "Bitte wählen Sie mindestens einen Artikel aus, bevor Sie fortfahren."
"MessageItemSelectionAdvised": {
"en": "The current folder will open. Press 'Select' to open an item",
"nl": "De huidige map wordt geopend. Druk op 'Selecteren' om een item te openen.",
"de": "Der aktuelle Ordner wird geöffnet. Drücken Sie 'Auswählen', um ein Element zu öffnen."
},
"MessageAppSettingsEntireAppScope": {
"en": "The AppSettings may only be modified by Administrators. These settings are applied for the entire application.",
Expand Down

1 comment on commit 8ca8c3e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.