Merge branch 'main' of https://github.com/ionite34/StabilityMatrix

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.4.2
+### Added
+- Added Japanese UI language option, thanks to kgmkm_mkgm for the translation
+- Language selection available in Settings, and defaults to system language if supported
+
 ## v2.4.1
 ### Fixed
 - Fixed deleting checkpoints not updating the visual grid until the page is refreshed

README.md

@@ -68,6 +68,14 @@ Multi-Platform Package Manager for Stable Diffusion
 </p>
 
 
+## Localization
+Stability Matrix is now available in the following languages, thanks to our community contributors:
+- 🇺🇸 English
+- 🇯🇵 日本語 
+  - kgmkm_mkgm
+
+If you would like to contribute a translation, please create an issue or contact us on Discord. Include an email where we'll send an invite to our [POEditor](https://poeditor.com/) project.
+
 ## License
 
 This repository maintains the latest source code release for Stability Matrix, and is licensed under the [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html). Binaries and executable releases are licensed under the [End User License Agreement](https://lykos.ai/license).

StabilityMatrix.Avalonia/App.axaml

@@ -18,6 +18,7 @@
                  <ResourceInclude Source="Styles/Card.axaml"/>
              </ResourceDictionary.MergedDictionaries>
              <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+             <FontFamily x:Key="NotoSansJP">avares://StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP#Noto Sans JP</FontFamily>
          </ResourceDictionary>
      </Application.Resources>
 

StabilityMatrix.Avalonia/App.axaml.cs

@@ -222,7 +222,11 @@ private static void ConfigureServiceProvider()
 
         if (settingsManager.TryFindLibrary())
         {
-            Cultures.TrySetSupportedCulture(settingsManager.Settings.Language);
+            Cultures.SetSupportedCultureOrDefault(settingsManager.Settings.Language);
+        }
+        else
+        {
+            Cultures.TrySetSupportedCulture(Settings.GetDefaultCulture());
         }
 
         Services.GetRequiredService<ProgressManagerViewModel>().StartEventListener();

StabilityMatrix.Avalonia/Assets.cs

@@ -16,9 +16,6 @@ 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/Languages/Cultures.cs

@@ -38,6 +38,14 @@ cultureCode is null
         return culture;
     }
 
+    public static void SetSupportedCultureOrDefault(string? cultureCode)
+    {
+        if (!TrySetSupportedCulture(cultureCode))
+        {
+            TrySetSupportedCulture(Default);
+        }
+    }
+
     public static bool TrySetSupportedCulture(string? cultureCode)
     {
         if (