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.

Sign up for GitHub

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

change message into warning #1804

Merged
merged 3 commits into from
Nov 8, 2024
Merged

change message into warning #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
570c58c
change message into warning
qdraw Nov 8, 2024
af31ba5
#1804 fix test
qdraw Nov 8, 2024
bc8c6bd
#1804 message
qdraw Nov 8, 2024
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 history.md
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...on-no-select-warning/menu-option-desktop-editor-open-selection-no-select-warning.spec.tsx
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions ...lection-no-select-warning/menu-option-desktop-editor-open-selection-no-select-warning.tsx
View file
Open in desktop
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
View file
Open in desktop
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