Merge pull request #1669 from ivandrofly/patch-2

Update Cavena890
This commit is contained in:
Nikolaj Olsson 2016-03-31 22:25:12 +02:00
commit 74dbef5d54
2 changed files with 8 additions and 5 deletions

View File

@ -195,15 +195,17 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
using (var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write))
{
int russianCount = 0;
char[] logoGrams = { '的', '是', '啊', '吧', '好', '吧', '亲', '爱', '的', '早', '上' };
char[] russianChars = { 'я', 'д', 'й', 'л', 'щ', 'ж', 'ц', 'ф', 'ы' };
foreach (Paragraph p in subtitle.Paragraphs)
{
if (p.Text.Contains(new[] { '的', '是', '啊', '吧', '好', '吧', '亲', '爱', '的', '早', '上' }))
if (p.Text.Contains(logoGrams))
{
_languageIdLine1 = LanguageIdChineseSimplified;
_languageIdLine2 = LanguageIdChineseSimplified;
break;
}
if (p.Text.Contains(new[] { 'я', 'д', 'й', 'л', 'щ', 'ж', 'ц', 'ф', 'ы' }))
if (p.Text.Contains(russianChars))
{
russianCount++;
if (russianCount > 10)

View File

@ -1215,6 +1215,8 @@ namespace Nikse.SubtitleEdit.Core
{
var lines = s.SplitToLines();
var newLines = new StringBuilder();
var pre = new StringBuilder();
var post = new StringBuilder();
foreach (var line in lines)
{
string s2 = line;
@ -1232,9 +1234,8 @@ namespace Nikse.SubtitleEdit.Core
s2 = s2.Remove(s2.Length - 4, 4);
}
var pre = new StringBuilder();
var post = new StringBuilder();
pre.Clear();
post.Clear();
int i = 0;
while (i < s2.Length && PrePostStringsToReverse.Contains(s2[i]))
{