From 6fc7a1d2d053b0c2eb4e98eb8be6247ff0dd2b55 Mon Sep 17 00:00:00 2001 From: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Date: Sat, 19 Jul 2025 11:24:03 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=20=D0=B2=D0=B7=D0=B0=D0=B8=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D0=B9=20(#2587)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomInteractionEditor.xaml.cs | 17 +++++++++-------- .../InteractionsUIWindow.xaml.cs | 13 +++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs b/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs index fbe17b3a32..b1676105de 100644 --- a/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs +++ b/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs @@ -31,6 +31,7 @@ public sealed partial class CustomInteractionEditor : DefaultWindow #region Dependencies [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] protected readonly ILocalizationManager Loc = default!; [Dependency] private readonly CustomInteractionService _customInteractionService = default!; private readonly SharedAudioSystem _audio = default!; @@ -147,10 +148,10 @@ public sealed partial class CustomInteractionEditor : DefaultWindow _categoryIds[categoryId] = string.Empty; categoryId++; - foreach (var category in _prototypeManager.EnumeratePrototypes().OrderBy(c => c.Name)) + foreach (var category in _prototypeManager.EnumeratePrototypes().OrderBy(c => Loc.GetString(c.Name))) { _categoryIds[categoryId] = category.ID; - CategoryOption.AddItem(category.Name, categoryId); + CategoryOption.AddItem(Loc.GetString(category.Name), categoryId); if (category.ID == _interaction.CategoryId) { @@ -166,10 +167,10 @@ public sealed partial class CustomInteractionEditor : DefaultWindow _iconIds[iconId] = string.Empty; iconId++; - foreach (var icon in _prototypeManager.EnumeratePrototypes().OrderBy(i => i.Name)) + foreach (var icon in _prototypeManager.EnumeratePrototypes().OrderBy(i => Loc.GetString(i.Name))) { _iconIds[iconId] = icon.ID; - IconOption.AddItem(icon.Name, iconId); + IconOption.AddItem(Loc.GetString(icon.Name), iconId); if (icon.ID == _interaction.IconId) { @@ -185,10 +186,10 @@ public sealed partial class CustomInteractionEditor : DefaultWindow _effectIds[effectId] = string.Empty; effectId++; - foreach (var effect in _prototypeManager.EnumeratePrototypes().OrderBy(e => e.Name)) + foreach (var effect in _prototypeManager.EnumeratePrototypes().OrderBy(e => Loc.GetString(e.Name))) { _effectIds[effectId] = effect.ID; - EffectOption.AddItem(effect.Name, effectId); + EffectOption.AddItem(Loc.GetString(effect.Name), effectId); if (effect.ID == _interaction.EntityEffectId) { @@ -204,10 +205,10 @@ public sealed partial class CustomInteractionEditor : DefaultWindow _soundIds[soundId] = string.Empty; soundId++; - foreach (var sound in _prototypeManager.EnumeratePrototypes().OrderBy(s => s.Name)) + foreach (var sound in _prototypeManager.EnumeratePrototypes().OrderBy(s => Loc.GetString(s.Name))) { _soundIds[soundId] = sound.ID; - SoundOption.AddItem(sound.Name, soundId); + SoundOption.AddItem(Loc.GetString(sound.Name), soundId); soundId++; } diff --git a/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs b/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs index bf5864543b..ccc193f143 100644 --- a/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs +++ b/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs @@ -30,6 +30,7 @@ public sealed partial class InteractionsUIWindow : DefaultWindow [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly CustomInteractionService _customInteractionService = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] protected readonly ILocalizationManager Loc = default!; private readonly SpriteSystem _spriteSystem; @@ -159,13 +160,9 @@ public sealed partial class InteractionsUIWindow : DefaultWindow if (!isCustom) { if (_prototypeManager.TryIndex(interactionId, out var prototype)) - { - interactionName = prototype.Name; - } + interactionName = Loc.GetString(prototype.Name); else - { continue; - } } else { @@ -281,7 +278,7 @@ public sealed partial class InteractionsUIWindow : DefaultWindow if (!categorizedInteractions.TryGetValue(categoryId, out _)) { - var categoryName = category.Name; + var categoryName = Loc.GetString(category.Name); categorizedInteractions[categoryId] = (categoryName, new List()); } @@ -306,7 +303,7 @@ public sealed partial class InteractionsUIWindow : DefaultWindow if (!categorizedInteractions.TryGetValue(categoryId, out _)) { var category = _prototypeManager.Index(categoryId); - categorizedInteractions[categoryId] = (category.Name, new List()); + categorizedInteractions[categoryId] = (Loc.GetString(category.Name), new List()); } if (!_favoriteInteractions.Contains(customInteraction.Id)) @@ -1030,7 +1027,7 @@ public sealed partial class InteractionsUIWindow : DefaultWindow return "Не указана"; if (_prototypeManager.TryIndex(categoryId, out var category)) - return category.Name; + return Loc.GetString(category.Name); return categoryId; }