From: DedokEzio <2901vova@gmail.com> Date: Sat, 6 Sep 2025 21:40:42 +0000 (+0300) Subject: Русские имена, фикс строк типа ent-blabla-eds X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2027fe0a0541130b36afe5eed6a6bd8e6a30f6dc;p=space-station-14.git Русские имена, фикс строк типа ent-blabla-eds просто QoL --- 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*$)"); ///