Skip to content

Fix newline in verbatim strings #186

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
cbengtsson merged 3 commits into from
Aug 18, 2026
Merged

Fix newline in verbatim strings #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0aee30
Fix tests for newline in verbatim strings
cbengtsson Aug 18, 2026
d3733d2
Fixed a bugg with newline in verbatim strings
cbengtsson Aug 18, 2026
e882364
Bump version numbers
cbengtsson Aug 18, 2026
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.6</Version>
<Version>4.0.7</Version>
<Authors>Chris Gårdenberg</Authors>
<Company>MultiNet Interactive AB</Company>
</PropertyGroup>
Expand Down
39 changes: 37 additions & 2 deletions MN.L10n.Tests/ParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void TestParserWithVerbatimLinebreak()
var parser = new L10nParser();
var result = parser.Parse(src).ToList();
Assert.Single(result);
Assert.Equal(@"Hej\nNej", result[0].Phrase.Trim());
Assert.Equal("Hej\nNej", result[0].Phrase.Trim());
}

[Fact]
Expand Down Expand Up @@ -164,7 +164,7 @@ public void TestEscapedStringContainerCharacterVerbatim()
var parser = new L10nParser();
var result = parser.Parse(src).ToList();
Assert.Single(result);
Assert.Equal(@"Hej ""bror""\nNej", result[0].Phrase.Trim());
Assert.Equal("Hej \"bror\"\nNej", result[0].Phrase.Trim());
}

[Fact]
Expand All @@ -176,5 +176,40 @@ public void TestNewlineInJsTemplateString()
Assert.Single(result);
Assert.Equal("Hello\nbrother!", result[0].Phrase.Trim());
}

[Fact]
public void TestNewLineInVerbatimString()
{
var src = @"
var body = _s(@""(Detta är ett automatiserat meddelande)<br/><br/>
<b>Användaruppgifter för $product$</b><br/><br/>
Dessa uppgifter har registrerats i $product$. Du har möjlighet att ändra på uppgifterna genom att logga in.<br/><br/>
Kontouppgifter<br/>
Företagskonto: $companyName$
<br/><br/>Namn: $fullname$
<br/>Användarnamn: $username$
<br/>E-post: $email$
<br/>Adress: $address$
<br/>Ort: $city$
<br/>Postnr: $zip$
<br/>Telefon: $phone$"",
new
{
companyName = user.CompanyName,
fullname = mailToUser.Fullname,
username = mailToUser.Username,
email = mailToUser.Email,
address = mailToUser.Address1,
city = mailToUser.City,
zip = mailToUser.Zipcode,
phone = mailToUser.Phone,
product = productName,
});
";
var parser = new L10nParser();
var result = parser.Parse(src).ToList();
Assert.Single(result);
Assert.Equal("(Detta är ett automatiserat meddelande)<br/><br/>\n<b>Användaruppgifter för $product$</b><br/><br/>\nDessa uppgifter har registrerats i $product$. Du har möjlighet att ändra på uppgifterna genom att logga in.<br/><br/>\nKontouppgifter<br/>\nFöretagskonto: $companyName$\n<br/><br/>Namn: $fullname$\n<br/>Användarnamn: $username$\n<br/>E-post: $email$\n<br/>Adress: $address$\n<br/>Ort: $city$\n<br/>Postnr: $zip$\n<br/>Telefon: $phone$", result[0].Phrase.Trim());
}
}
}
2 changes: 1 addition & 1 deletion MN.L10n/L10nParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ bool TryPeek(int forward)
if (source[_pos] == _stringContainer && _peek != _stringContainer &&
_tail != _stringContainer)
{
var phrase = _tokenContent.ToString().Replace("\n", "\\n").Replace("\r", "")
var phrase = _tokenContent.ToString().Replace("\r", "")
.Replace("\"\"", "\\\"");

Comment thread
cbengtsson marked this conversation as resolved.
// Hoppa över sista \ om den är escape:ad
Expand Down
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.4</Version>
<Version>4.1.5</Version>
<LangVersion>latest</LangVersion>
<AutoIncrementPackageRevision>True</AutoIncrementPackageRevision>
<PackageReleaseNotes>Now includes analyzer</PackageReleaseNotes>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject></StartupObject>
<AssemblyVersion>4.1.4</AssemblyVersion>
<AssemblyVersion>4.1.5</AssemblyVersion>
</PropertyGroup>

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