diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
index fe90fef07af2..ceae7c3bb991 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html
@@ -15,7 +15,14 @@
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
index 7cead8611432..a876b1a6b767 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
@@ -247,7 +247,7 @@
Dette dokument er udgivet, men dets URL kan ikke dirigeresUdgivUdgivet
- Udgivet (Afventende ændringer)
+ Udgivet (Ventede ændringer)UdgivelsesstatusUdgiv med undersider for at udgive %0% og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]>Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]>
@@ -426,6 +426,7 @@
Internt link:Ved lokalt link, indsæt da en "#" foran linketÅben i nyt vindue?
+ MakroindstillingerDenne makro har ingen egenskaber du kan redigereIndsæt tekstRediger rettigheder for
@@ -663,6 +664,7 @@
IkonIdImporter
+ Inkludér undermapper i søgningSøg kun i denne mappeInfoIndre margen
@@ -1749,6 +1751,12 @@ Mange hilsner fra Umbraco robotten
Åben backoffice søgningÅben/Luk backoffice hjælpÅben/Luk dine profil indstillinger
+ Tilføj domæne på %0%
+ Opret ny node under %0%
+ Opsæt offentlig adgang på %0%
+ Opsæt rettigheder på %0%
+ Juster soterings rækkefølgen for %0%
+ Opret indholds skabelon baseret på %0%Aktivt sprogSkift sprog tilOpret ny mappe
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
index e764b5591e25..e4f9ed7b914c 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -141,6 +141,7 @@
Save and send for approvalSave list viewSchedule
+ PreviewSave and previewPreview is disabled because there's no template assignedChoose style
@@ -686,6 +687,7 @@
IconIdImport
+ Include subfolders in searchSearch only this folderInfoInner margin
@@ -2228,6 +2230,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Open backoffice searchOpen/Close backoffice helpOpen/Close your profile options
+ Setup Culture and Hostnames for %0%
+ Create new node under %0%
+ Setup Public access on %0%
+ Setup Permissions on %0%
+ Change sort order for %0%
+ Create Content Template based on %0%Open context menu forCurrent languageSwitch language to
@@ -2243,7 +2251,7 @@ To manage your website, simply open the Umbraco back office and start adding con
CreateEditName
- Add new row
+ Add new rowView more options
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index e1b1df2c343d..5fc037d8b3e7 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -140,6 +140,7 @@
Send for approvalSave list viewSchedule
+ PreviewSave and previewPreview is disabled because there's no template assignedChoose style
@@ -369,7 +370,8 @@
Document Types within the Settings section, by changing the Allow as root option under Permissions.]]>Media Types Types within the Settings section, by editing the Allowed child node types under Permissions.]]>The selected media in the tree doesn't allow for any other media to be created below it.
- Edit permissions for this media typeDocument Type without a template
+ Edit permissions for this media type
+ Document Type without a templateNew folderNew data typeNew JavaScript file
@@ -570,6 +572,9 @@
#value or ?key=valueEnter alias...Generating alias...
+ Create item
+ Edit
+ NameCreate custom list view
@@ -690,6 +695,7 @@
IconIdImport
+ Include subfolders in searchSearch only this folderInfoInner margin
@@ -2244,6 +2250,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Open backoffice searchOpen/Close backoffice helpOpen/Close your profile options
+ Setup Culture and Hostnames for %0%
+ Create new node under %0%
+ Setup Public access on %0%
+ Setup Permissions on %0%
+ Change sort order for %0%
+ Create Content Template based on %0%Open context menu forCurrent languageSwitch language to
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index 9d4c76eea125..094c6b24ff0b 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -5,6 +5,7 @@
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Web.Actions;
+using System.Threading;
namespace Umbraco.Web.Models.Trees
{
@@ -28,12 +29,15 @@ public MenuItem(string alias, string name)
Name = name;
}
-
public MenuItem(string alias, ILocalizedTextService textService)
: this()
{
+ var values = textService.GetAllStoredValues(Thread.CurrentThread.CurrentUICulture);
+ values.TryGetValue($"visuallyHiddenTexts/{alias}_description", out var textDescription);
+
Alias = alias;
Name = textService.Localize($"actions/{Alias}");
+ TextDescription = textDescription;
}
///
@@ -74,6 +78,9 @@ public MenuItem(IAction action, string name = "")
[Required]
public string Alias { get; set; }
+ [DataMember(Name = "textDescription")]
+ public string TextDescription { get; set; }
+
///
/// Ensures a menu separator will exist before this menu item
///
diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
index 1df486ebdf0d..4aaf0632ab34 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Threading;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Web.Actions;
@@ -75,7 +76,7 @@ public MenuItem Add(ILocalizedTextService textService, bool hasSeparator = fa
}
return null;
}
-
+
internal MenuItem CreateMenuItem(string name, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
@@ -96,14 +97,18 @@ internal MenuItem CreateMenuItem(ILocalizedTextService textService, bool hasS
var item = Current.Actions.GetAction();
if (item == null) return null;
+ var values = textService.GetAllStoredValues(Thread.CurrentThread.CurrentUICulture);
+ values.TryGetValue($"visuallyHiddenTexts/{item.Alias}Description", out var textDescription);
+
var menuItem = new MenuItem(item, textService.Localize($"actions/{item.Alias}"))
{
SeparatorBefore = hasSeparator,
- OpensDialog = opensDialog
+ OpensDialog = opensDialog,
+ TextDescription = textDescription,
};
return menuItem;
}
-
+
}
}
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 85ff30487d53..663af436438b 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -323,7 +323,7 @@ private void EnsureName(IEntitySlim entity, string culture)
private void AddActionNode(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool opensDialog = false)
where TAction : IAction
{
- var menuItem = menu.Items.Add(Services.TextService.Localize("actions", _actions.GetAction().Alias), hasSeparator, opensDialog);
+ var menuItem = menu.Items.Add(Services.TextService, hasSeparator, opensDialog);
}
public IEnumerable Search(string query, int pageSize, long pageIndex, out long totalFound, string searchFrom = null)