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

Work on #8139

Browse Source
This commit is contained in:
Nikolaj Olsson 2024-04-05 22:59:45 +02:00
parent c39e736aed
commit ee519c597a
1 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/ui/Forms/Translate/MergeAndSplitHelper.cs
View File

@ -62,18 +62,69 @@ namespace Nikse.SubtitleEdit.Forms.Translate
} }
var linesTranslate = 0; var linesTranslate = 0;
if (mergeResult != null) var mergedTranslation = await autoTranslator.Translate(text, source.Code, target.Code, cancellationToken);
var splitResult = SplitMultipleLines(mergeResult, mergedTranslation, target.Code);
if (splitResult.Count == mergeCount && HasSameEmptyLines(splitResult, tempSubtitle, index))
{ {
var mergedTranslation = await autoTranslator.Translate(text, source.Code, target.Code, cancellationToken); // Split by line ending chars
var splitResult = SplitMultipleLines(mergeResult, mergedTranslation, target.Code);
if (splitResult.Count == mergeCount && HasSameEmptyLines(splitResult, tempSubtitle, index))
{
// Split by line ending chars
var idx = 0; var idx = 0;
foreach (var line in splitResult) foreach (var line in splitResult)
{
var reformattedText = formattingList[idx].ReAddFormatting(line);
targetSubtitle.Paragraphs[index].Text = reformattedText;
index++;
linesTranslate++;
idx++;
}
return linesTranslate;
}
//TODO: better split - comma converted to period.
//TODO: check both "split by line ending char" + "number of lines" and find best match (number of chars? complete?)
var translatedLines = mergedTranslation.SplitToLines();
if (translatedLines.Count == mergeResult.Text.SplitToLines().Count)
{
// Split per number of lines
var newSub = new Subtitle();
for (var i = 0; i < mergeResult.ParagraphCount; i++)
{
newSub.Paragraphs.Add(new Paragraph());
}
var translatedLinesIdx = 0;
var paragraphIdx = 0;
foreach (var mergeItem in mergeResult.MergeResultItems)
{
var numberOfParagraphs = mergeItem.EndIndex - mergeItem.StartIndex + 1;
var numberOfLines = mergeItem.Text.SplitToLines().Count;
var sb = new StringBuilder();
for (var j = 0; j < numberOfLines && translatedLinesIdx < translatedLines.Count; j++)
{ {
var reformattedText = formattingList[idx].ReAddFormatting(line); sb.AppendLine(translatedLines[translatedLinesIdx]);
translatedLinesIdx++;
}
var translatedText = sb.ToString().Trim();
var arr = TextSplit.SplitMulti(translatedText, numberOfParagraphs, target.TwoLetterIsoLanguageName);
for (var i = 0; i < arr.Count && paragraphIdx < newSub.Paragraphs.Count; i++)
{
newSub.Paragraphs[paragraphIdx].Text = Utilities.AutoBreakLine(arr[i], Configuration.Settings.General.SubtitleLineMaximumLength * 2, 0, target.TwoLetterIsoLanguageName);
paragraphIdx++;
}
}
if (paragraphIdx == mergeCount && HasSameEmptyLines(newSub, sourceSubtitle, index))
{
var idx = 0;
foreach (var p in newSub.Paragraphs)
{
var reformattedText = formattingList[idx].ReAddFormatting(p.Text);
targetSubtitle.Paragraphs[index].Text = reformattedText; targetSubtitle.Paragraphs[index].Text = reformattedText;
index++; index++;
linesTranslate++; linesTranslate++;
@ -82,56 +133,6 @@ namespace Nikse.SubtitleEdit.Forms.Translate
return linesTranslate; return linesTranslate;
} }
var translatedLines = mergedTranslation.SplitToLines();
if (translatedLines.Count == mergeResult.Text.SplitToLines().Count)
{
// Split per number of lines
var newSub = new Subtitle();
for (var i = 0; i < mergeResult.ParagraphCount; i++)
{
newSub.Paragraphs.Add(new Paragraph());
}
var translatedLinesIdx = 0;
var paragraphIdx = 0;
foreach (var mergeItem in mergeResult.MergeResultItems)
{
var numberOfParagraphs = mergeItem.EndIndex - mergeItem.StartIndex + 1;
var numberOfLines = mergeItem.Text.SplitToLines().Count;
var sb = new StringBuilder();
for (var j = 0; j < numberOfLines && translatedLinesIdx < translatedLines.Count; j++)
{
sb.AppendLine(translatedLines[translatedLinesIdx]);
translatedLinesIdx++;
}
var translatedText = sb.ToString().Trim();
var arr = TextSplit.SplitMulti(translatedText, numberOfParagraphs, target.TwoLetterIsoLanguageName);
for (var i = 0; i < arr.Count && paragraphIdx < newSub.Paragraphs.Count; i++)
{
newSub.Paragraphs[paragraphIdx].Text = Utilities.AutoBreakLine(arr[i], Configuration.Settings.General.SubtitleLineMaximumLength * 2, 0, target.TwoLetterIsoLanguageName);
paragraphIdx++;
}
}
if (paragraphIdx == mergeCount && HasSameEmptyLines(newSub, sourceSubtitle, index))
{
var idx = 0;
foreach (var p in newSub.Paragraphs)
{
var reformattedText = formattingList[idx].ReAddFormatting(p.Text);
targetSubtitle.Paragraphs[index].Text = reformattedText;
index++;
linesTranslate++;
idx++;
}
return linesTranslate;
}
}
} }
MergeSplitProblems = true; MergeSplitProblems = true;
@ -411,6 +412,11 @@ namespace Nikse.SubtitleEdit.Forms.Translate
} }
} }
if (!string.IsNullOrEmpty(text))
{
return new List<string>();
}
return lines; return lines;
} }
@ -432,7 +438,8 @@ namespace Nikse.SubtitleEdit.Forms.Translate
{ {
if (count == item.EndCharOccurrences) if (count == item.EndCharOccurrences)
{ {
return input.Substring(0, idx + 1); var s = input.Substring(0, idx + 1);
return s;
} }
idx = input.IndexOf(item.EndChar, idx + 1); idx = input.IndexOf(item.EndChar, idx + 1);