Merge pull request #1135 from ivandrofly/patch-b3

Refactor [Sami.cs]
This commit is contained in:
Nikolaj Olsson 2015-08-11 21:39:46 +02:00
commit e4a35fd607

View File

@ -170,7 +170,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
var startMs = (long)(Math.Round(p.StartTime.TotalMilliseconds));
var endMs = (long)(Math.Round(p.EndTime.TotalMilliseconds));
if (next != null && Math.Abs( ((long) Math.Round(next.StartTime.TotalMilliseconds)) - endMs) < 1)
if (next != null && Math.Abs(((long)Math.Round(next.StartTime.TotalMilliseconds)) - endMs) < 1)
sb.AppendLine(string.Format(paragraphWriteFormatOpen, startMs, text, currentClass));
else
sb.AppendLine(string.Format(paragraphWriteFormat, startMs, endMs, text, currentClass));
@ -183,12 +183,15 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
private static string EncodeText(string text)
{
if (Configuration.Settings.SubtitleSettings.SamiHtmlEncodeMode == 1)
return WebUtility.HtmlEncode(text);
if (Configuration.Settings.SubtitleSettings.SamiHtmlEncodeMode == 2)
return HtmlUtil.EncodeNamed(text);
if (Configuration.Settings.SubtitleSettings.SamiHtmlEncodeMode == 3)
return HtmlUtil.EncodeNumeric(text);
switch (Configuration.Settings.SubtitleSettings.SamiHtmlEncodeMode)
{
case 1:
return WebUtility.HtmlEncode(text);
case 2:
return HtmlUtil.EncodeNamed(text);
case 3:
return HtmlUtil.EncodeNumeric(text);
}
return text;
}