warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds cliloc replacement support (#1014)

Browse source
This commit is contained in:
Kamron Batman 2022-05-09 21:10:58 -07:00 • committed by GitHub
parent be7da3a3dc
commit 47d427ed6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Projects/Server/Localization/LocalizationInterpolationHandler.cs
View file

@ -32,6 +32,7 @@ public ref struct LocalizationInterpolationHandler
private int _index;
private string?[] _slices;
private string? _current;
private string _lang;
public LocalizationInterpolationHandler(int literalLength, int formattedCount, LocalizationEntry entry, out bool isValid)
{
@ -42,6 +43,7 @@ public ref struct LocalizationInterpolationHandler
_pos = 0;
_index = 0;
_current = null;
_lang = entry.Language;
}
public LocalizationInterpolationHandler(int literalLength, int formattedCount, int number, out bool isValid)
@ -67,6 +69,7 @@ public ref struct LocalizationInterpolationHandler
_pos = 0;
_index = 0;
_current = null;
_lang = lang;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -218,7 +221,7 @@ public ref struct LocalizationInterpolationHandler
public void AppendFormatted(ReadOnlySpan<char> value)
{
if (!ReadyToAppend())
if (!ReadyToAppend() || TryAppendClilocNumber(value))
{
return;
}
@ -279,22 +282,49 @@ public ref struct LocalizationInterpolationHandler
public void AppendFormatted(string? value)
{
if (ReadyToAppend())
if (!ReadyToAppend() || TryAppendClilocNumber(value))
{
if (value?.TryCopyTo(_chars[_pos..]) == true)
{
_pos += value.Length;
}
else
{
AppendFormattedSlow(value);
}
return;
}
if (value?.TryCopyTo(_chars[_pos..]) == true)
{
_pos += value.Length;
}
else
{
AppendFormattedSlow(value);
}
}
public void AppendFormatted(string? value, int alignment, string? format = null) =>
AppendFormatted<string?>(value, alignment, format);
private bool TryAppendClilocNumber(ReadOnlySpan<char> value)
{
if (
value[0] != '#' ||
!int.TryParse(value[1..], out var number) ||
!Localization.TryGetLocalization(_lang, number, out var entry)
)
{
return false;
}
var text = entry.Text;
if (text.TryCopyTo(_chars[_pos..]))
{
_pos += text.Length;
}
else
{
AppendFormattedSlow(text);
}
return true;
}
private void AppendOrInsertAlignmentIfNeeded(int startingPos, int alignment)
{
var charsWritten = _pos - startingPos;