JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues Pull Requests Actions Releases 28 Activity

- Add missing auto translates for the symbols

Browse Source
This commit is contained in:
Infi
2026-01-20 11:27:37 +01:00
parent 4f9a6cd5be
commit 6744c6676c
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/ChatTwo.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Dalamud.NET.Sdk/14.0.1">
<PropertyGroup>
<Version>1.34.0</Version>
<Version>1.34.1</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
ChatTwo/Ui/ChatLogWindow.cs
+1 -1
View File
@@ -1486,7 +1486,7 @@ public sealed class ChatLogWindow : Window
var entry = AutoCompleteList[i];
var highlight = AutoCompleteSelection == i;
var clicked = ImGui.Selectable($"{entry.String}##{entry.Group}/{entry.Row}", highlight) || selected == i;
var clicked = ImGui.Selectable($"{entry.Text}##{entry.Group}/{entry.Row}", highlight) || selected == i;
if (i < 10)
{
var button = (i + 1) % 10;
ChatTwo/Ui/SeStringDebugger.cs
+1
View File
@@ -155,6 +155,7 @@ public class SeStringDebugger : Window
RenderMetadataDictionary("Link AutoTranslatePayload", new Dictionary<string, string?>
{
{ "Text", at.Text },
{ "Key/Group", $"{at.Key}/{at.Group}" },
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) },
});
break;
ChatTwo/Util/AutoTranslate.cs
+29 -17
View File
@@ -144,11 +144,9 @@ internal static class AutoTranslate
foreach (var col in columns)
{
var rawName = rowParser.ReadStringColumn(col);
var name = rawName.ToDalamudString();
var text = name.TextValue;
if (text.Length > 0)
if (!rawName.IsEmpty)
{
list.Add(new AutoTranslateEntry(row.Group, (uint)i, text, name));
list.Add(new AutoTranslateEntry(row.Group, (uint)i, rawName.ToString(), string.Empty));
if (shouldAdd)
ValidEntries.Add((row.Group, (uint)i));
@@ -159,8 +157,7 @@ internal static class AutoTranslate
}
else if (lookup is not "@")
{
var text = row.Text.ToDalamudString();
list.Add(new AutoTranslateEntry(row.Group, row.RowId, text.TextValue, text));
list.Add(new AutoTranslateEntry(row.Group, row.RowId, row.Text.ToString(), row.GroupTitle.ToString()));
if (shouldAdd)
ValidEntries.Add((row.Group, row.RowId));
@@ -183,19 +180,34 @@ internal static class AutoTranslate
var otherMatches = new List<AutoTranslateEntry>();
foreach (var entry in AllEntries())
{
if (entry.String.Equals(prefix, StringComparison.OrdinalIgnoreCase))
if (entry.Text.Equals(prefix, StringComparison.OrdinalIgnoreCase))
{
wholeMatches.Add(entry);
else if (entry.String.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
}
else if (entry.Text.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
{
prefixMatches.Add(entry);
else if (entry.String.Contains(prefix, StringComparison.OrdinalIgnoreCase))
}
else if (entry.Text.Contains(prefix, StringComparison.OrdinalIgnoreCase))
{
otherMatches.Add(entry);
}
else if (entry.Title.Length > 0)
{
if (entry.Title.Equals(prefix, StringComparison.OrdinalIgnoreCase))
wholeMatches.Add(entry);
else if (entry.Title.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
prefixMatches.Add(entry);
else if (entry.Title.Contains(prefix, StringComparison.OrdinalIgnoreCase))
otherMatches.Add(entry);
}
}
if (sort)
{
return wholeMatches.OrderBy(entry => entry.String, StringComparer.OrdinalIgnoreCase)
.Concat(prefixMatches.OrderBy(entry => entry.String, StringComparer.OrdinalIgnoreCase))
.Concat(otherMatches.OrderBy(entry => entry.String, StringComparer.OrdinalIgnoreCase))
return wholeMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase)
.Concat(prefixMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase))
.Concat(otherMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase))
.ToList();
}
@@ -293,14 +305,14 @@ internal class AutoTranslateEntry
{
internal uint Group { get; }
internal uint Row { get; }
internal string String { get; }
internal SeString SeString { get; }
internal string Text { get; }
internal string Title { get; }
public AutoTranslateEntry(uint group, uint row, string str, SeString seStr)
public AutoTranslateEntry(uint group, uint row, string str, string title)
{
Group = group;
Row = row;
String = str;
SeString = seStr;
Text = str;
Title = title;
}
}