From 2027fe0a0541130b36afe5eed6a6bd8e6a30f6dc Mon Sep 17 00:00:00 2001 From: DedokEzio <2901vova@gmail.com> Date: Sun, 7 Sep 2025 00:40:42 +0300 Subject: [PATCH] =?utf8?q?=D0=A0=D1=83=D1=81=D1=81=D0=BA=D0=B8=D0=B5=20?= =?utf8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0,=20=D1=84=D0=B8=D0=BA=D1=81=20?= =?utf8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D1=82=D0=B8=D0=BF=D0=B0=20ent-?= =?utf8?q?blabla-eds=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20QoL?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../Localizations/ContentLocalizationManager.cs | 8 ++++++-- Content.Shared/Preferences/HumanoidCharacterProfile.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 1e8516951d..159f13ae65 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Localizations [Dependency] private readonly ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. - private const string Culture = "ru-RU"; - + private const string Culture = "ru-RU"; // RU-Localization + private const string FallbackCulture = "en-US"; // RU-Localization /// /// Custom format strings used for parsing and displaying minutes:seconds timespans. /// @@ -26,8 +26,12 @@ namespace Content.Shared.Localizations public void Initialize() { var culture = new CultureInfo(Culture1); + var fallbackCulture = new CultureInfo(FallbackCulture); // RU-Localization _loc.LoadCulture(culture); + _loc.LoadCulture(fallbackCulture); // RU-Localization + _loc.SetFallbackCluture(fallbackCulture); // RU-Localization + _loc.AddFunction(culture, "MANY", FormatMany); // RU-Localization: To prevent problems in auto-generated locale files _loc.AddFunction(culture, "PRESSURE", FormatPressure); _loc.AddFunction(culture, "POWERWATTS", FormatPowerWatts); _loc.AddFunction(culture, "POWERJOULES", FormatPowerJoules); diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index f22669ddc7..e061cac3b8 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -25,7 +25,7 @@ namespace Content.Shared.Preferences [Serializable, NetSerializable] public sealed partial class HumanoidCharacterProfile : ICharacterProfile { - private static readonly Regex RestrictedNameRegex = new(@"[^A-Za-z0-9 '\-]"); + private static readonly Regex RestrictedNameRegex = new(@"[^A-Za-zА-Яа-яёЁ0-9 '\-]"); private static readonly Regex ICNameCaseRegex = new(@"^(?\w)|\b(?\w)(?=\w*$)"); /// -- 2.52.0