[release/8.0] Add missing translations (#4004)

* wip missing translations * Update filter message usages * remove duplicate Logs.resx csproj entries * add logs xlf files * Fix generated code for .resx files (#3632) Somehow the `.Designer.cs` files for `Columns.resx` and `Logs.resx` were inverted. Any change to one of these files would result in compilation errors due to duplicate classes. This change renames the files so that future regeneration won't hit problems. * and translations --------- Co-authored-by: Adam Ratzman <[email protected]> Co-authored-by: Drew Noakes <[email protected]> Co-authored-by: Dan Moseley <[email protected]>
dotnet · Apr 29, 2024 · 6c8ddfa · 6c8ddfa
1 parent 430e112
commit 6c8ddfa
Show file tree

Hide file tree

Showing 35 changed files with 526 additions and 21 deletions.
diff --git a/src/Aspire.Dashboard/Aspire.Dashboard.csproj b/src/Aspire.Dashboard/Aspire.Dashboard.csproj
@@ -95,6 +95,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Routes.resx</DependentUpon>
     </Compile>
+    <Compile Update="Resources\Logs.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Logs.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -182,6 +187,13 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Routes.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Logs.resx">
+      <XlfSourceFormat>Resx</XlfSourceFormat>
+      <XlfOutputItem>EmbeddedResource</XlfOutputItem>
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Logs.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor b/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor
@@ -1,18 +1,18 @@
 @using Aspire.Dashboard.Model
 @using Aspire.Dashboard.Model.Otlp
-@using Aspire.Dashboard.Otlp.Storage
 @using Aspire.Dashboard.Resources
-@using Microsoft.FluentUI.AspNetCore.Components;
 @implements IDialogContentComponent<FilterDialogViewModel>
+
 @inject IStringLocalizer<Dialogs> Loc
+@inject IStringLocalizer<Logs> LogsLoc
 
 <EditForm EditContext="@EditContext" OnValidSubmit="@Apply">
     <DataAnnotationsValidator />
 
     <FluentStack Orientation="Orientation.Vertical" VerticalGap="8">
         <FluentCombobox Placeholder="@Loc[nameof(Dialogs.FilterDialogFieldPlaceholder)]" Items=@Parameters @bind-Value="@_formModel.Parameter" Width="100%" Height="500px" />
 
-        <FluentSelect TOption="SelectViewModel<FilterCondition>" Items="@s_filterConditions" @bind-SelectedOption="@_formModel.Condition" aria-label="@Loc[Dialogs.FilterDialogConditionSelectLabel]" OptionText="@(i => i.Name)" Width="100%" />
+        <FluentSelect TOption="SelectViewModel<FilterCondition>" Items="@_filterConditions" @bind-SelectedOption="@_formModel.Condition" aria-label="@Loc[Dialogs.FilterDialogConditionSelectLabel]" OptionText="@(i => i.Name)" Width="100%" />
 
         <FluentTextField @bind-Value="_formModel.Value" Placeholder="@Loc[nameof(Dialogs.FilterDialogTextValuePlaceholder)]" />
         <ValidationMessage For="() => _formModel.Value" />

diff --git a/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor.cs b/src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor.cs
@@ -12,16 +12,10 @@ namespace Aspire.Dashboard.Components.Dialogs;
 
 public partial class FilterDialog
 {
-    private static readonly List<SelectViewModel<FilterCondition>> s_filterConditions = new()
-    {
-        CreateFilterSelectViewModel(FilterCondition.Equals),
-        CreateFilterSelectViewModel(FilterCondition.Contains),
-        CreateFilterSelectViewModel(FilterCondition.NotEqual),
-        CreateFilterSelectViewModel(FilterCondition.NotContains),
-    };
+    private List<SelectViewModel<FilterCondition>> _filterConditions = null!;
 
-    private static SelectViewModel<FilterCondition> CreateFilterSelectViewModel(FilterCondition condition) =>
-        new SelectViewModel<FilterCondition> { Id = condition, Name = LogFilter.ConditionToString(condition) };
+    private SelectViewModel<FilterCondition> CreateFilterSelectViewModel(FilterCondition condition) =>
+        new SelectViewModel<FilterCondition> { Id = condition, Name = LogFilter.ConditionToString(condition, LogsLoc) };
 
     [CascadingParameter]
     public FluentDialog? Dialog { get; set; }
@@ -37,19 +31,27 @@ private static SelectViewModel<FilterCondition> CreateFilterSelectViewModel(Filt
 
     protected override void OnInitialized()
     {
+        _filterConditions =
+        [
+            CreateFilterSelectViewModel(FilterCondition.Equals),
+            CreateFilterSelectViewModel(FilterCondition.Contains),
+            CreateFilterSelectViewModel(FilterCondition.NotEqual),
+            CreateFilterSelectViewModel(FilterCondition.NotContains)
+        ];
+
         _formModel = new LogDialogFormModel();
         EditContext = new EditContext(_formModel);
 
         if (Content.Filter is { } logFilter)
         {
             _formModel.Parameter = logFilter.Field;
-            _formModel.Condition = s_filterConditions.Single(c => c.Id == logFilter.Condition);
+            _formModel.Condition = _filterConditions.Single(c => c.Id == logFilter.Condition);
             _formModel.Value = logFilter.Value;
         }
         else
         {
             _formModel.Parameter = "Message";
-            _formModel.Condition = s_filterConditions.Single(c => c.Id == FilterCondition.Contains);
+            _formModel.Condition = _filterConditions.Single(c => c.Id == FilterCondition.Contains);
             _formModel.Value = "";
         }
     }

diff --git a/src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor b/src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor
@@ -5,13 +5,14 @@
 @using Aspire.Dashboard.Otlp.Model
 @using Aspire.Dashboard.Utils
 @using Microsoft.Extensions.Logging
-@using System.Web
 @using Aspire.Dashboard.Resources
 @using System.Globalization
 @inject IJSRuntime JS
 @implements IDisposable
+
 @inject IStringLocalizer<Dashboard.Resources.StructuredLogs> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
+@inject IStringLocalizer<Logs> LogsLoc
 
 <PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.StructuredLogs.StructuredLogsPageTitle)" Loc="@Loc" /></PageTitle>
 
@@ -30,7 +31,7 @@
                       slot="end" />
         <FluentDivider slot="end" Role="DividerRole.Presentation" Orientation="Orientation.Vertical" />
         <div title="@Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsMinimumLogFilter)]" slot="end" style="display: flex;align-items: center;">
-            <span>Level:</span>
+            <span>@Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsLevels)]</span>
             <FluentDivider Role="DividerRole.Presentation" Orientation="Orientation.Vertical" />
             <FluentSelect TOption="SelectViewModel<LogLevel?>"
                           Items="@_logLevels"
@@ -52,7 +53,7 @@
         {
             foreach (var filter in ViewModel.Filters)
             {
-                <FluentButton slot="end" Appearance="Appearance.Outline" OnClick="() => OpenFilterAsync(filter)">@filter.FilterText</FluentButton>
+                <FluentButton slot="end" Appearance="Appearance.Outline" OnClick="() => OpenFilterAsync(filter)">@filter.GetDisplayText(LogsLoc)</FluentButton>
                 <FluentDivider slot="end" Role="DividerRole.Presentation" Orientation="Orientation.Vertical" />
             }
         }

diff --git a/src/Aspire.Dashboard/Model/Otlp/LogFilter.cs b/src/Aspire.Dashboard/Model/Otlp/LogFilter.cs
@@ -4,6 +4,8 @@
 using System.Diagnostics;
 using System.Globalization;
 using Aspire.Dashboard.Otlp.Model;
+using Aspire.Dashboard.Resources;
+using Microsoft.Extensions.Localization;
 
 namespace Aspire.Dashboard.Model.Otlp;
 
@@ -14,7 +16,9 @@ public class LogFilter
     public FilterCondition Condition { get; set; }
     public string Value { get; set; } = default!;
 
-    public string FilterText => $"{Field} {ConditionToString(Condition)} {Value}";
+    public string DebuggerDisplayText => $"{Field} {ConditionToString(Condition, null)} {Value}";
+
+    public string GetDisplayText(IStringLocalizer<Logs> loc) => $"{Field} {ConditionToString(Condition, loc)} {Value}";
 
     public static List<string> GetAllPropertyNames(List<string> propertyKeys)
     {
@@ -23,17 +27,17 @@ public static List<string> GetAllPropertyNames(List<string> propertyKeys)
         return result;
     }
 
-    public static string ConditionToString(FilterCondition c) =>
+    public static string ConditionToString(FilterCondition c, IStringLocalizer<Logs>? loc) =>
         c switch
         {
             FilterCondition.Equals => "==",
-            FilterCondition.Contains => "contains",
+            FilterCondition.Contains => loc?[nameof(Logs.LogContains)] ?? "contains",
             FilterCondition.GreaterThan => ">",
             FilterCondition.LessThan => "<",
             FilterCondition.GreaterThanOrEqual => ">=",
             FilterCondition.LessThanOrEqual => "<=",
             FilterCondition.NotEqual => "!=",
-            FilterCondition.NotContains => "not contains",
+            FilterCondition.NotContains => loc?[nameof(Logs.LogNotContains)] ?? "not contains",
             _ => throw new ArgumentOutOfRangeException(nameof(c), c, null)
         };
 

diff --git a/src/Aspire.Dashboard/Resources/Logs.Designer.cs b/src/Aspire.Dashboard/Resources/Logs.Designer.cs
diff --git a/src/Aspire.Dashboard/Resources/Logs.resx b/src/Aspire.Dashboard/Resources/Logs.resx
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!--
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format
+		that is mostly human readable. The generation and parsing of the
+		various data types are done through the TypeConverter classes
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a
+		type or mimetype. Type corresponds to a .NET class that support
+		text/value conversion through the TypeConverter architecture.
+		Classes that don't support this are serialized and stored with the
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the
+		ResXResourceReader how to depersist the object. This is currently not
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format
+		that the ResXResourceWriter will generate, however the reader can
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="LogContains" xml:space="preserve">
+    <value>contains</value>
+  </data>
+  <data name="LogNotContains" xml:space="preserve">
+    <value>not contains</value>
+    <comment>corresponds to A !contains B</comment>
+  </data>
+</root>
diff --git a/src/Aspire.Dashboard/Resources/StructuredLogs.Designer.cs b/src/Aspire.Dashboard/Resources/StructuredLogs.Designer.cs
diff --git a/src/Aspire.Dashboard/Resources/StructuredLogs.resx b/src/Aspire.Dashboard/Resources/StructuredLogs.resx
@@ -73,4 +73,7 @@
   <data name="StructuredLogsAllApplications" xml:space="preserve">
     <value>(All)</value>
   </data>
+  <data name="StructuredLogsLevels" xml:space="preserve">
+    <value>Level:</value>
+  </data>
 </root>