Merge pull request #239 from ionite34/more-localize

Author: ionite34

StabilityMatrix.Avalonia/App.axaml.cs

@@ -204,6 +204,8 @@ private void ShowMainWindow()
         };
         mainWindow.Closed += (_, _) => Shutdown();
 
+        mainWindow.SetDefaultFonts();
+
         VisualRoot = mainWindow;
         StorageProvider = mainWindow.StorageProvider;
 

StabilityMatrix.Avalonia/Assets.cs

@@ -16,6 +16,9 @@ internal static class Assets
     public static AvaloniaResource AppIconPng { get; } =
         new("avares://StabilityMatrix.Avalonia/Assets/Icon.png");
 
+    public static AvaloniaResource RegionalFontJapanese { get; } =
+        new("avares://StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf");
+
     /// <summary>
     /// Fixed image for models with no images.
     /// </summary>

StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable LICENSE.txt

@@ -0,0 +1,93 @@
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP-Variable.ttf

@@ -13,6 +13,7 @@
 using FluentAvalonia.UI.Controls;
 using Markdown.Avalonia;
 using StabilityMatrix.Avalonia.Controls;
+using StabilityMatrix.Avalonia.Languages;
 
 namespace StabilityMatrix.Avalonia;
 
@@ -22,26 +23,24 @@ public static class DialogHelper
     /// Create a generic textbox entry content dialog.
     /// </summary>
     public static BetterContentDialog CreateTextEntryDialog(
-        string title, 
-        string description, 
-        IReadOnlyList<TextBoxField> textFields)
+        string title,
+        string description,
+        IReadOnlyList<TextBoxField> textFields
+    )
     {
         Dispatcher.UIThread.VerifyAccess();
 
         var stackPanel = new StackPanel();
         var grid = new Grid
         {
-            RowDefinitions = 
+            RowDefinitions =
             {
                 new RowDefinition(GridLength.Auto),
                 new RowDefinition(GridLength.Star)
             },
             Children =
             {
-                new TextBlock
-                {
-                    Text = description
-                },
+                new TextBlock { Text = description },
                 stackPanel
             }
         };
@@ -52,33 +51,32 @@ public static BetterContentDialog CreateTextEntryDialog(
             firstTextBox.Focus();
             firstTextBox.CaretIndex = firstTextBox.Text?.LastIndexOf('.') ?? 0;
         };
-        
+
         // Disable primary button if any textboxes are invalid
-        var primaryCommand = new RelayCommand(delegate { },
+        var primaryCommand = new RelayCommand(
+            delegate { },
             () =>
             {
                 var invalidCount = textFields.Count(field => !field.IsValid);
                 Debug.WriteLine($"Checking can execute: {invalidCount} invalid fields");
                 return invalidCount == 0;
-            });
-        
+            }
+        );
+
         // Create textboxes
         foreach (var field in textFields)
         {
-            var label = new TextBlock
-            {
-                Text = field.Label
-            };
+            var label = new TextBlock { Text = field.Label };
             stackPanel.Children.Add(label);
-            
+
             var textBox = new TextBox
             {
                 [!TextBox.TextProperty] = new Binding("TextProperty"),
                 Watermark = field.Watermark,
                 DataContext = field,
             };
             stackPanel.Children.Add(textBox);
-            
+
             // When IsValid property changes, update invalid count and primary button
             field.PropertyChanged += (_, args) =>
             {
@@ -87,10 +85,10 @@ public static BetterContentDialog CreateTextEntryDialog(
                     primaryCommand.NotifyCanExecuteChanged();
                 }
             };
-            
+
             // Set initial value
             textBox.Text = field.Text;
-            
+
             // See if initial value is valid
             try
             {
@@ -101,13 +99,13 @@ public static BetterContentDialog CreateTextEntryDialog(
                 field.IsValid = false;
             }
         }
-        
+
         return new BetterContentDialog
         {
             Title = title,
             Content = grid,
-            PrimaryButtonText = "OK",
-            CloseButtonText = "Cancel",
+            PrimaryButtonText = Resources.Action_OK,
+            CloseButtonText = Resources.Action_Cancel,
             IsPrimaryButtonEnabled = true,
             PrimaryButtonCommand = primaryCommand,
             DefaultButton = ContentDialogButton.Primary
@@ -121,44 +119,37 @@ public static BetterContentDialog CreateMarkdownDialog(string markdown, string?
     {
         Dispatcher.UIThread.VerifyAccess();
 
-        var viewer = new MarkdownScrollViewer
-        {
-            Markdown = markdown
-        };
-        
+        var viewer = new MarkdownScrollViewer { Markdown = markdown };
+
         return new BetterContentDialog
         {
             Title = title,
             Content = viewer,
-            CloseButtonText = "Close",
+            CloseButtonText = Resources.Action_Close,
             IsPrimaryButtonEnabled = false,
         };
     }
-    
+
     /// <summary>
     /// Create a simple title and description task dialog.
     /// Sets the XamlRoot to the current top level window.
     /// </summary>
     public static TaskDialog CreateTaskDialog(string title, string description)
     {
         Dispatcher.UIThread.VerifyAccess();
-        
+
         var content = new StackPanel
         {
             Children =
             {
                 new TextBlock
                 {
-                    Margin = new Thickness(0,0,0,8),
+                    Margin = new Thickness(0, 0, 0, 8),
                     FontSize = 16,
                     Text = title,
                     TextWrapping = TextWrapping.WrapWithOverflow,
                 },
-                new TextBlock
-                {
-                    Text = description,
-                    TextWrapping = TextWrapping.WrapWithOverflow,
-                }
+                new TextBlock { Text = description, TextWrapping = TextWrapping.WrapWithOverflow, }
             }
         };
 
@@ -176,16 +167,18 @@ public sealed class TextBoxField : INotifyPropertyChanged
 {
     // Label above the textbox
     public string Label { get; init; } = string.Empty;
+
     // Actual text value
     public string Text { get; set; } = string.Empty;
+
     // Watermark text
     public string Watermark { get; init; } = string.Empty;
-    
+
     /// <summary>
     /// Validation action on text changes. Throw exception if invalid.
     /// </summary>
     public Action<string>? Validator { get; init; }
-    
+
     public string TextProperty
     {
         get => Text;
@@ -206,7 +199,7 @@ public string TextProperty
             OnPropertyChanged();
         }
     }
-    
+
     // Default to true if no validator is provided
     private bool isValid;
     public bool IsValid