Merge branch 'master' into release

src/PixiEditor.Extensions.WasmRuntime/WasmMemoryUtility.cs

@@ -94,8 +94,8 @@ public class WasmMemoryUtility
     public int WriteString(string value)
     {
         string valueWithNullTerminator = value + '\0';
-        var ptr = malloc.Invoke(valueWithNullTerminator.Length);
-        memory.WriteString(ptr, valueWithNullTerminator);
+        var ptr = malloc.Invoke(Encoding.UTF8.GetByteCount(valueWithNullTerminator));
+        memory.WriteString(ptr, valueWithNullTerminator, Encoding.UTF8);
         return ptr;
     }
     

src/PixiEditor.Extensions/FlyUI/Elements/Text.cs

@@ -6,6 +6,7 @@ using Avalonia.Media;
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 using PixiEditor.Extensions.Extensions;
 using PixiEditor.Extensions.FlyUI.Converters;
+using PixiEditor.UI.Common.Localization;
 using FontStyle = PixiEditor.Extensions.CommonApi.FlyUI.Properties.FontStyle;
 using FontWeight = PixiEditor.Extensions.CommonApi.FlyUI.Properties.FontWeight;
 
@@ -81,7 +82,7 @@ public class Text : LayoutElement
             Converter = new ColorToAvaloniaBrushConverter(),
         };
         
-        textBlock.Bind(TextBlock.TextProperty, valueBinding);
+        textBlock.Bind(Translator.KeyProperty, valueBinding);
         textBlock.Bind(TextBlock.TextWrappingProperty, textWrapBinding);
         if (TextStyle.FontStyle != null)
         {

src/PixiEditor/ViewModels/SubViewModels/UpdateViewModel.cs

@@ -48,9 +48,9 @@ internal class UpdateViewModel : SubViewModel<ViewModelMain>
         }
     }
 
-    private string versionText;
+    private LocalizedString versionText;
 
-    public string VersionText
+    public LocalizedString VersionText
     {
         get => versionText;
         set

src/PixiEditor/Views/Main/ActionDisplayBar.axaml

@@ -62,7 +62,7 @@
                 HorizontalAlignment="Right"
                 Foreground="{DynamicResource ThemeForegroundBrush}"
                 FontSize="14"
-                Text="{Binding DataContext.UpdateSubViewModel.VersionText, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
+                ui:Translator.LocalizedString="{Binding DataContext.UpdateSubViewModel.VersionText, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
         </StackPanel>
     </Grid>
 </UserControl>