DataLocalizedString.ToString() should return the Value (#19056)

Author: hishamco

src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml

@@ -12,7 +12,7 @@
 
     var selectedDisplayNames = allContentTypes
         .Where(x => isSelected(x, selectedContentTypes))
-        .Select(x => D[x.DisplayName, "Content Types"].Value)
+        .Select(x => D[x.DisplayName, "Content Types"])
         .ToList();
 
     bool isSelected(ContentTypeDefinition ctd, ContentTypeEntry[] selectedList)

src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml

@@ -71,7 +71,7 @@
        data-flowmetadata="false"
        data-parent-content-type="@parentContentType"
        data-part-name="@partName"
-       href="javascript:;">@T["Add {0}", D[type.DisplayName, "Content Types"].Value]</a>
+       href="javascript:;">@T["Add {0}", D[type.DisplayName, "Content Types"]]</a>
     }
     else if (totalItems > 1)
     {

src/OrchardCore.Modules/OrchardCore.Lists/Views/ListPartNavigationAdmin.cshtml

@@ -31,7 +31,7 @@
             @if (await AuthorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, Model.Container))
             {
                 <a class="btn btn-primary me-1" asp-action="Edit" asp-controller="Admin" asp-route-contentItemId="@Model.Container.ContentItemId" asp-route-area="OrchardCore.Contents">
-                    @T["Edit {0}", D[Model.ContainerContentTypeDefinition?.DisplayName, "Content Types"].Value]
+                    @T["Edit {0}", D[Model.ContainerContentTypeDefinition?.DisplayName, "Content Types"]]
                 </a>
             }
 
@@ -40,7 +40,7 @@
                 var contentTypeDefinition = authorizedContentTypeDefinitions.FirstOrDefault();
 
                 <a class="btn btn-secondary" asp-action="Create" asp-controller="Admin" asp-route-id="@contentTypeDefinition.Name" asp-route-area="OrchardCore.Contents" asp-route-ListPart.ContainerId="@Model.Container.ContentItemId" asp-route-ListPart.ContainerContentType="@Model.ContainerContentTypeDefinition?.Name" asp-route-ListPart.ContentType="@contentTypeDefinition.Name" asp-route-ListPart.EnableOrdering="@Model.EnableOrdering" asp-route-returnUrl="@FullRequestPath">
-                    @T["Create {0}", D[contentTypeDefinition.DisplayName, "Content Types"].Value]
+                    @T["Create {0}", D[contentTypeDefinition.DisplayName, "Content Types"]]
                 </a>
             }
             else if (authorizedContentTypeDefinitions.Count > 1)

src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuPart.Edit.cshtml

@@ -66,7 +66,7 @@
                         var menuItem = await ContentManager.NewAsync(type.Name);
                         var thumbnail = await ContentItemDisplayManager.BuildDisplayAsync(menuItem, updater, "Thumbnail");
                         thumbnail.Properties["MenuItemType"] = type.Name;
-                        thumbnail.Properties["MenuItemTypeDisplayName"] = D[type.DisplayName, "Content Types"].Value;
+                        thumbnail.Properties["MenuItemTypeDisplayName"] = D[type.DisplayName, "Content Types"];
                         thumbnail.Properties["MenuContentItemId"] = Model.MenuPart.ContentItem.ContentItemId;
                         <div class="col">
                             @await DisplayAsync(thumbnail)

src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyPart.Edit.cshtml

@@ -46,7 +46,7 @@
                    asp-route-id="@Model.TaxonomyPart.TermContentType"
                    asp-route-taxonomyContentItemId="@Model.TaxonomyPart.ContentItem.ContentItemId"
                    asp-route-area="OrchardCore.Taxonomies">
-                    @T["Add {0}", D[termContentType.DisplayName, "Content Types"].Value]
+                    @T["Add {0}", D[termContentType.DisplayName, "Content Types"]]
                 </a>
             }
         }

src/OrchardCore/OrchardCore.Abstractions/Localization/Data/DataLocalizedString.cs

@@ -31,5 +31,6 @@ public DataLocalizedString(string context, string name, string value, bool resou
 
     public bool ResourceNotFound { get; }
 
-    public override string ToString() => $"{Context}.{Name}";
+    /// <inheritdoc/>
+    public override string ToString() => Value;
 }

test/OrchardCore.Tests/Localization/Data/DataLocalizedStringTests.cs

@@ -0,0 +1,79 @@
+namespace OrchardCore.Localization.Data.Tests;
+
+public class DataLocalizedStringTests
+{
+    [Fact]
+    public void DataLocalizedString_ReturnsValue_WithStringDataType()
+    {
+        // Arrange
+        var dataLocalizedString = new DataLocalizedString("Content Types", "Blog", "Translated Blog");
+
+        // Act
+        string value = dataLocalizedString;
+
+        // Assert
+        Assert.Equal("Translated Blog", value);
+    }
+
+    [Fact]
+    public void DataLocalizedString_ReturnsValue_WithVarDataType()
+    {
+        // Arrange
+        var dataLocalizedString = new DataLocalizedString("Content Types", "Blog", "Translated Blog");
+
+        // Act
+        var value = dataLocalizedString;
+
+        // Assert
+        Assert.Equal("Translated Blog", value);
+    }
+
+    [Fact]
+    public void DataLocalizedString_ReturnsValue_WithToString()
+    {
+        // Arrange
+        var dataLocalizedString = new DataLocalizedString("Content Types", "Blog", "Translated Blog");
+
+        // Act
+        var value = dataLocalizedString.ToString();
+
+        // Assert
+        Assert.Equal("Translated Blog", value);
+    }
+
+    [Fact]
+    public void DataLocalizedString_ReturnsValue_WithLocalizer()
+    {
+        // Arrange
+        var context = "context";
+        var culture = "it";
+        var dataLocalizedString = new DataLocalizedString("Content Types", "Blog", "Blog");
+        var dataTranslationProviderMock = new Mock<IDataTranslationProvider>();
+
+        dataTranslationProviderMock
+            .Setup(tp => tp.LoadTranslations(It.Is<string>(c => c == culture), It.IsAny<CultureDictionary>()))
+            .Callback<string, CultureDictionary>((c, d) => d.MergeTranslations(new CultureDictionaryRecord[]
+            {
+               new CultureDictionaryRecord("Create {0}", context, [ "Creare {0}" ]),
+            }));
+
+        var memoryCache = new ServiceCollection()
+            .AddMemoryCache()
+            .BuildServiceProvider()
+            .GetService<IMemoryCache>();
+
+        var localizer = new DataLocalizer(
+            new DataResourceManager(dataTranslationProviderMock.Object, memoryCache),
+            fallBackToParentCulture: true,
+            Mock.Of<ILogger>());
+
+        CultureInfo.CurrentUICulture = new CultureInfo(culture);
+
+        // Act
+        var translation = localizer["Create {0}", context, dataLocalizedString];
+
+        // Assert
+        Assert.NotEqual("Creare Content Types.Blog", translation);
+        Assert.Equal("Creare Blog", translation);
+    }
+}