Skip to content

Fixed issues with escaped strings inside the phrase #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LinusCenterstrom merged 5 commits into from
Mar 24, 2025
Merged

Fixed issues with escaped strings inside the phrase #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f50657
Fixed issues with escaped strings inside the phrase
LinusCenterstrom Mar 21, 2025
18860eb
bump versions
LinusCenterstrom Mar 21, 2025
eba8f47
Actually bump the version
LinusCenterstrom Mar 21, 2025
dda5791
I screwed up the publish of the build task package. Need to bump agai…
LinusCenterstrom Mar 21, 2025
dc15771
Postprocess the string instead.
LinusCenterstrom Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MN.L10n.BuildTasks/MN.L10n.BuildTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<OutputType>Exe</OutputType>
<StartupObject>MN.L10n.BuildTasks.Program</StartupObject>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.0.1</Version>
<Version>4.0.4</Version>
<Authors>Chris Gårdenberg</Authors>
<Company>MultiNet Interactive AB</Company>
</PropertyGroup>
Expand Down
51 changes: 51 additions & 0 deletions MN.L10n.Tests/ParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,56 @@ public void LineBreakCharInCall()

Assert.Collection(result, x => Assert.Equal("Hello\nBrother", x.Phrase));
}

[Fact]
public void TestEscapedStringContainerCharacter()
{
var parser = new L10nParser();
var result = parser.Parse(@"_s(""Hello \""friend\"". How it do?"")");

Assert.Collection(result, x => Assert.Equal(@"Hello ""friend"". How it do?", x.Phrase));
}

[Fact]
public void TestEscapedStringContainerCharacter2()
{
var parser = new L10nParser();
var result = parser.Parse(@"_s('Hello \""friend\"". How it do?')");

Assert.Collection(result, x => Assert.Equal(@"Hello \""friend\"". How it do?", x.Phrase));
}

[Fact]
public void TestEscapedStringContainerCharacter3()
{
var parser = new L10nParser();
var result = parser.Parse(@"_s('Hello \'friend\'. How it do?')");

Assert.Collection(result, x => Assert.Equal(@"Hello 'friend'. How it do?", x.Phrase));
}

[Fact]
public void TestEscapedStringContainerCharacterFirstChar()
{
var parser = new L10nParser();
var result = parser.Parse(@"_s(""\""friend\""!"")");

Assert.Collection(result, x => Assert.Equal(@"""friend""!", x.Phrase));
}

[Fact]
public void TestEscapedStringContainerCharacterVerbatim()
{
var src = @"<a href=javascript:void(0)>
_s(
@""Hej """"bror""""
Nej""
)
</a>";
var parser = new L10nParser();
var result = parser.Parse(src).ToList();
Assert.Single(result);
Assert.Equal(@"Hej ""bror""\nNej", result[0].Phrase.Trim());
}
}
}
75 changes: 59 additions & 16 deletions MN.L10n/L10nParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ bool TryPeek(int forward)
{
break;
}

isVerbatim = true;
}
else
Expand Down Expand Up @@ -115,6 +116,7 @@ bool TryPeek(int forward)
continue;
}
}

if (inToken)
{
_tokenContent.Append(source[_pos]);
Expand Down Expand Up @@ -143,57 +145,98 @@ bool TryPeek(int forward)
phrase = phrase.Substring(0, phrase.Length - 1);
}

yield return new PhraseInvocation
yield return Unescape(new PhraseInvocation
{
Phrase = phrase,
Row = row,
StartChar = startChar,
EndChar = _pos,
IsEscaped = isEscaped,
StringContainer = _stringContainer
};
}, isVerbatim);
inToken = false;
}
}
else
{
var _tail = source[_pos - 1];
var _peek = source[_pos + 1];
if (source[_pos] == _stringContainer && _peek != _stringContainer && _tail != _stringContainer)
if (source[_pos] == _stringContainer && _peek != _stringContainer &&
_tail != _stringContainer)
{
var phrase = _tokenContent.ToString().Replace("\n", "\\n").Replace("\r", "").Replace("\"\"", "\\\"");
var phrase = _tokenContent.ToString().Replace("\n", "\\n").Replace("\r", "")
.Replace("\"\"", "\\\"");

// Hoppa över sista \ om den är escape:ad
if (isEscaped)
{
phrase = phrase.Substring(0, phrase.Length - 1);
}

yield return new PhraseInvocation
yield return Unescape(new PhraseInvocation
{
Phrase = phrase,
Row = row,
StartChar = startChar,
EndChar = _pos,
StringContainer = _stringContainer
};
}, isVerbatim);
inToken = false;
}
}

if (inToken && !isVerbatim && source[_pos] == '\\' && TryPeek(1) && source[_pos + 1] == 'n')
{
_pos++;
_tokenContent.Append('\n');
}
else
{
_tokenContent.Append(source[_pos]);
}
_tokenContent.Append(source[_pos]);
}

break;
}
}
}

private PhraseInvocation Unescape(PhraseInvocation phraseInvocation, bool isVerbatim)
{
if (isVerbatim)
{
for (var i = 0; i < phraseInvocation.Phrase.Length; i++)
{
if (phraseInvocation.Phrase[i] == '\\' && i + 1 < phraseInvocation.Phrase.Length)
{
if (phraseInvocation.Phrase[i + 1] == phraseInvocation.StringContainer)
{
phraseInvocation.Phrase = phraseInvocation.Phrase.Remove(i, 1);
}
}
}
}
else
{
for (var i = 0; i < phraseInvocation.Phrase.Length; i++)
{
if (phraseInvocation.Phrase[i] == '\\' && i + 1 < phraseInvocation.Phrase.Length)
{
switch (phraseInvocation.Phrase[i + 1])
{
case 'n':
phraseInvocation.Phrase = phraseInvocation.Phrase.Remove(i, 2).Insert(i, "\n");
break;
case 't':
phraseInvocation.Phrase = phraseInvocation.Phrase.Remove(i, 2).Insert(i, "\t");
break;
case '\\':
phraseInvocation.Phrase = phraseInvocation.Phrase.Remove(i, 2).Insert(i, "\\");
break;
default:
if (phraseInvocation.Phrase[i + 1] == phraseInvocation.StringContainer)
{
phraseInvocation.Phrase = phraseInvocation.Phrase.Remove(i, 1);
}

break;
}
}
}
}

return phraseInvocation;
}
}
}
4 changes: 2 additions & 2 deletions MN.L10n/MN.L10n.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Translation package</Description>
<PackageProjectUrl>https://github.com/MultinetInteractive/MN.L10n</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<Copyright>© 20XX MultiNet Interactive AB</Copyright>
<Version>4.1.1</Version>
<Version>4.1.3</Version>
<LangVersion>latest</LangVersion>
<AutoIncrementPackageRevision>True</AutoIncrementPackageRevision>
<PackageReleaseNotes>Now includes analyzer</PackageReleaseNotes>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject></StartupObject>
<AssemblyVersion>4.1.1</AssemblyVersion>
<AssemblyVersion>4.1.3</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
Loading