diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index 1c264d3d13..99128087c3 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -1542,7 +1542,7 @@ export function createModel (builder: Builder): void { }, label: tracker.string.Priority, icon: tracker.icon.PriorityHigh, - keyBinding: ['keyP-keyR'], + keyBinding: ['keyP->keyR'], input: 'any', category: tracker.category.Tracker, target: tracker.class.Issue, diff --git a/models/view/src/plugin.ts b/models/view/src/plugin.ts index 91bd2f3a39..6eafa7956b 100644 --- a/models/view/src/plugin.ts +++ b/models/view/src/plugin.ts @@ -77,7 +77,6 @@ export default mergeIds(viewId, view, { }, string: { Table: '' as IntlString, - Delete: '' as IntlString, Role: '' as IntlString, // Keybaord actions MoveUp: '' as IntlString, @@ -91,7 +90,6 @@ export default mergeIds(viewId, view, { SelectDown: '' as IntlString, ShowPreview: '' as IntlString, ShowActions: '' as IntlString, - Open: '' as IntlString, // Action categories General: '' as IntlString, Navigation: '' as IntlString, diff --git a/plugins/view-assets/lang/en.json b/plugins/view-assets/lang/en.json index 63e024952c..8d8aec5899 100644 --- a/plugins/view-assets/lang/en.json +++ b/plugins/view-assets/lang/en.json @@ -100,6 +100,7 @@ "ShowColors": "Use colors", "Show": "Show", "FilterArrayAll": "includes all", - "FilterArrayAny": "includes any" + "FilterArrayAny": "includes any", + "Or": "Or" } } diff --git a/plugins/view-assets/lang/ru.json b/plugins/view-assets/lang/ru.json index 28e08e1b97..da58b822ca 100644 --- a/plugins/view-assets/lang/ru.json +++ b/plugins/view-assets/lang/ru.json @@ -96,6 +96,7 @@ "ShowColors": "Использовать цвета", "Show": "Отображение", "FilterArrayAll": "содержит все", - "FilterArrayAny": "содержит любое из" + "FilterArrayAny": "содержит любое из", + "Or": "Или" } } diff --git a/plugins/view-resources/src/components/ActionsPopup.svelte b/plugins/view-resources/src/components/ActionsPopup.svelte index 0ff1fc9ccf..671e14fb56 100644 --- a/plugins/view-resources/src/components/ActionsPopup.svelte +++ b/plugins/view-resources/src/components/ActionsPopup.svelte @@ -291,12 +291,12 @@ {#if action.keyBinding} {#each action.keyBinding as key, i} {#if i !== 0} -
or
+
{/if}
{#each formatKey(key) as k, jj} {#if jj !== 0} -
then
+
{/if} {#each k as kk, j}
diff --git a/plugins/view-resources/src/plugin.ts b/plugins/view-resources/src/plugin.ts index 97efc17822..63170e74d6 100644 --- a/plugins/view-resources/src/plugin.ts +++ b/plugins/view-resources/src/plugin.ts @@ -71,7 +71,6 @@ export default mergeIds(viewId, view, { Grouping: '' as IntlString, Ordering: '' as IntlString, Manual: '' as IntlString, - Then: '' as IntlString, ShowPreviewOnClick: '' as IntlString, Shown: '' as IntlString, ShowEmptyGroups: '' as IntlString, diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts index 3f15992e90..c2fb2f9cd4 100644 --- a/plugins/view/src/index.ts +++ b/plugins/view/src/index.ts @@ -753,7 +753,11 @@ const view = plugin(viewId, { Public: '' as IntlString, Hide: '' as IntlString, Assigned: '' as IntlString, + Open: '' as IntlString, Created: '' as IntlString, + Delete: '' as IntlString, + Then: '' as IntlString, + Or: '' as IntlString, Subscribed: '' as IntlString }, icon: { diff --git a/plugins/workbench-resources/src/components/HelpAndSupport.svelte b/plugins/workbench-resources/src/components/HelpAndSupport.svelte index 81d01eedb6..b8ae8e746c 100644 --- a/plugins/workbench-resources/src/components/HelpAndSupport.svelte +++ b/plugins/workbench-resources/src/components/HelpAndSupport.svelte @@ -59,18 +59,18 @@ const rawActions = await client.findAll(view.class.Action, []) const openAction = rawActions.find( - (action) => action.label === 'view:string:Open' && action.category === 'view:category:General' + (action) => action.label === view.string.Open && action.category === view.category.General ) const deleteAction = rawActions.find( - (action) => action.label === 'view:string:Delete' && action.category === 'view:category:General' + (action) => action.label === view.string.Delete && action.category === view.category.General ) actions = rawActions.filter( (action) => action.keyBinding && action.keyBinding.length !== 0 && - action.label !== 'view:string:Open' && - action.label !== 'view:string:Delete' + action.label !== view.string.Open && + action.label !== view.string.Delete ) deleteAction && actions.unshift(deleteAction) @@ -165,12 +165,12 @@ {#if action.keyBinding} {#each action.keyBinding as key, i} {#if i !== 0} -
or
+
{/if}
{#each formatKey(key) as k, jj} {#if jj !== 0} -
then
+
{/if} {#each k as kk, j}