Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue w "remove text for hi" and colon/dashes - thx Сергей :)

Browse Source
This commit is contained in:
niksedk 2021-11-09 06:39:03 +01:00
parent e135a7c77a
commit 39557cd00f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Test/Logic/Forms/RemoveTextForHearImpairedTest.cs
View File

@ -1707,6 +1707,16 @@ namespace Test.Logic.Forms
Assert.AreEqual("- Step out of here... Not world." + Environment.NewLine + "- It's a British record.", actual); Assert.AreEqual("- Step out of here... Not world." + Environment.NewLine + "- It's a British record.", actual);
} }
public void RemoveColonNameStartFirstLineNonDialog()
{
var target = GetRemoveTextForHiLib();
target.Settings.RemoveTextBeforeColon = true;
target.Settings.RemoveTextBeforeColonOnlyUppercase = false;
target.Settings.NameList.Add("JEREMY");
string actual = target.RemoveColon("- JOE: All right." + Environment.NewLine + "Sorry about that.");
Assert.AreEqual("All right." + Environment.NewLine + "Sorry about that.", actual);
}
[TestMethod] [TestMethod]
public void RemoveNameAndCustom() public void RemoveNameAndCustom()
{ {

11
src/libse/Forms/RemoveTextForHI.cs
View File

@ -105,6 +105,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
int count = 0; int count = 0;
bool removedInFirstLine = false; bool removedInFirstLine = false;
bool removedInSecondLine = false; bool removedInSecondLine = false;
bool removedFirstLineNotStart = false;
foreach (string line in lines) foreach (string line in lines)
{ {
int indexOfColon = line.IndexOf(':'); int indexOfColon = line.IndexOf(':');
@ -262,6 +263,10 @@ namespace Nikse.SubtitleEdit.Core.Forms
if (remove) if (remove)
{ {
newText = RemovePartialBeforeColon(line, indexOfColon, newText, count, ref removedInFirstLine, ref removedInSecondLine, ref remove); newText = RemovePartialBeforeColon(line, indexOfColon, newText, count, ref removedInFirstLine, ref removedInSecondLine, ref remove);
if (count == 0 && removedInFirstLine && indexOfColon > 10)
{
removedFirstLineNotStart = true;
}
if (remove) if (remove)
{ {
@ -520,6 +525,12 @@ namespace Nikse.SubtitleEdit.Core.Forms
insertDash = false; insertDash = false;
} }
} }
if (insertDash && removedInFirstLine && !removedInSecondLine && !removedFirstLineNotStart &&
!HtmlUtil.RemoveHtmlTags(arr[1], true).StartsWith("-"))
{
insertDash = false;
}
} }
if (insertDash) if (insertDash)