Skip to content
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

Jump to bottom

ApplyStudioProjectTemplate: Merge -> Prepend/Append #955

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

ApplyStudioProjectTemplate: Merge -> Prepend/Append #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c295381
ApplyStudioProjectTemplate: ApplyTemplateOptions.Merge -> Prepend/App…
murxh May 5, 2022
f8add68
small edit in ApplyTemplateForm.SelectedTemplate_SelectedIndexChanged
murxh May 5, 2022
177631c
resolving conflicts
murxh May 6, 2022
1f0704a
Merge branch 'master' into M&A
murxh May 6, 2022
f71bd19
make non-breaking spaces (nbsp) changes visible
murxh Jun 17, 2022
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
24 changes: 13 additions & 11 deletions ...jectTemplate/Sdl.Community.ApplyStudioProjectTemplate/ApplyStudioProjectTemplateAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ protected override void Execute()
{
// Update the "all languages" node
TranslationProviderConfiguration sourceProviderConfig = sourceProject.GetTranslationProviderConfiguration();
if (selectedTemplate.TranslationProvidersAllLanguages == ApplyTemplateOptions.Merge)
if (selectedTemplate.TranslationProvidersAllLanguages != ApplyTemplateOptions.Overwrite)
{
TranslationProviderConfiguration targetProviderConfig = targetProject.GetTranslationProviderConfiguration();
MergeTranslationProviders(sourceProviderConfig, targetProviderConfig);
MergeTranslationProviders(sourceProviderConfig, targetProviderConfig, selectedTemplate.TranslationProvidersAllLanguages);
ValidateTranslationProviderConfiguration(targetProviderConfig);
targetProject.UpdateTranslationProviderConfiguration(targetProviderConfig);
}
Expand Down Expand Up @@ -198,10 +198,10 @@ protected override void Execute()
{
// Copy translation providers
TranslationProviderConfiguration sourceProviderConfig = sourceProject.GetTranslationProviderConfiguration(sourceTargetLanguage);
if (selectedTemplate.TranslationProvidersSpecificLanguages == ApplyTemplateOptions.Merge)
if (selectedTemplate.TranslationProvidersSpecificLanguages != ApplyTemplateOptions.Overwrite)
{
TranslationProviderConfiguration targetProviderConfig = targetProject.GetTranslationProviderConfiguration(targetTargetLanguage);
MergeTranslationProviders(sourceProviderConfig, targetProviderConfig);
MergeTranslationProviders(sourceProviderConfig, targetProviderConfig, selectedTemplate.TranslationProvidersSpecificLanguages);
ValidateTranslationProviderConfiguration(targetProviderConfig);
targetProject.UpdateTranslationProviderConfiguration(targetTargetLanguage, targetProviderConfig);
}
Expand Down Expand Up @@ -269,7 +269,7 @@ protected override void Execute()
var sourceTermbaseConfig = sourceProject.GetTermbaseConfiguration();
var targetTermbaseConfig = targetProject.GetTermbaseConfiguration();

if (selectedTemplate.TerminologyTermbases == ApplyTemplateOptions.Merge)
if (selectedTemplate.TerminologyTermbases != ApplyTemplateOptions.Overwrite)
{
if (targetTermbaseConfig.TermbaseServerUri is null)
{
Expand All @@ -279,14 +279,14 @@ protected override void Execute()
{
targetTermbaseConfig.Termbases?.AddRange(sourceTermbaseConfig.Termbases);
}
MergeTermbases(sourceTermbaseConfig, targetTermbaseConfig);
MergeTermbases(sourceTermbaseConfig, targetTermbaseConfig, selectedTemplate.TerminologyTermbases);
}
else
{
targetTermbaseConfig.TermbaseServerUri = sourceTermbaseConfig.TermbaseServerUri;
targetTermbaseConfig.Termbases.Clear();
targetTermbaseConfig.LanguageIndexes.Clear();
MergeTermbases(sourceTermbaseConfig, targetTermbaseConfig);
MergeTermbases(sourceTermbaseConfig, targetTermbaseConfig, ApplyTemplateOptions.Merge);
}

// Updating with zero termbases throws an exception
Expand Down Expand Up @@ -677,10 +677,10 @@ private bool CopySettingsGroup(ISettingsBundle sourceSettings, ISettingsBundle t
/// </summary>
/// <param name="sourceProviderConfig">The source provider configuration.</param>
/// <param name="targetProviderConfig">The target provider configuration.</param>
private void MergeTranslationProviders(TranslationProviderConfiguration sourceProviderConfig, TranslationProviderConfiguration targetProviderConfig)
private void MergeTranslationProviders(TranslationProviderConfiguration sourceProviderConfig, TranslationProviderConfiguration targetProviderConfig, ApplyTemplateOptions mergeType)
{
// Remember where we're going to insert the translation providers
var indexToInsert = 0;
var indexToInsert = mergeType == ApplyTemplateOptions.Merge ? 0 : targetProviderConfig.Entries.Count;

// Look at each translation provider in the source project
foreach (var sourceCascadeEntry in sourceProviderConfig.Entries)
Expand All @@ -701,8 +701,10 @@ private void MergeTranslationProviders(TranslationProviderConfiguration sourcePr
/// </summary>
/// <param name="sourceTermbaseConfig">The source terminology database configuration.</param>
/// <param name="targetTermbaseConfig">The target terminology database configuration.</param>
private void MergeTermbases(TermbaseConfiguration sourceTermbaseConfig, TermbaseConfiguration targetTermbaseConfig)
private void MergeTermbases(TermbaseConfiguration sourceTermbaseConfig, TermbaseConfiguration targetTermbaseConfig, ApplyTemplateOptions mergeType)
{
var indexToInsert = mergeType == ApplyTemplateOptions.Merge ? targetTermbaseConfig.Termbases.Count : 0;

// Look at each termbase in the source project
foreach (var sourceTermbase in sourceTermbaseConfig.Termbases)
{
Expand Down Expand Up @@ -759,7 +761,7 @@ private void MergeTermbases(TermbaseConfiguration sourceTermbaseConfig, Termbase
// If we didn't find the current termbase then add it to the target project
if (!foundEntry)
{
targetTermbaseConfig.Termbases.Add(sourceTermbase);
targetTermbaseConfig.Termbases.Insert(indexToInsert, sourceTermbase);
}
}

Expand Down
35 changes: 21 additions & 14 deletions ...dioProjectTemplate/Sdl.Community.ApplyStudioProjectTemplate/ApplyTemplateForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions ApplyStudioProjectTemplate/Sdl.Community.ApplyStudioProjectTemplate/ApplyTemplateForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,14 @@ private void SelectedTemplate_SelectedIndexChanged(object sender, EventArgs e)

if (selectedTemplate != null)
{
TranslationProvidersAllLanguages.SelectedItem = selectedTemplate.TranslationProvidersAllLanguages.ToString();
TranslationProvidersSpecificLanguages.SelectedItem = selectedTemplate.TranslationProvidersSpecificLanguages.ToString();
TranslationProvidersAllLanguages.SelectedIndex = (int)selectedTemplate.TranslationProvidersAllLanguages;
TranslationProvidersSpecificLanguages.SelectedIndex = (int)selectedTemplate.TranslationProvidersSpecificLanguages;
//TranslationProvidersAllLanguages.SelectedItem = selectedTemplate.TranslationProvidersAllLanguages.ToString();
//TranslationProvidersSpecificLanguages.SelectedItem = selectedTemplate.TranslationProvidersSpecificLanguages.ToString();
TranslationMemoriesAllLanguages.SelectedItem = selectedTemplate.TranslationMemoriesAllLanguages.ToString();
TranslationMemoriesSpecificLanguages.SelectedItem = selectedTemplate.TranslationMemoriesSpecificLanguages.ToString();
TerminologyTermbases.SelectedItem = selectedTemplate.TerminologyTermbases.ToString();
TerminologyTermbases.SelectedIndex = (int)selectedTemplate.TerminologyTermbases;
//TerminologyTermbases.SelectedItem = selectedTemplate.TerminologyTermbases.ToString();
TerminologySearchSettings.SelectedItem = selectedTemplate.TerminologySearchSettings.ToString();
TranslationQualityAssessment.SelectedItem = selectedTemplate.TranslationQualityAssessment.ToString();
BatchTasksAllLanguages.SelectedItem = selectedTemplate.BatchTasksAllLanguages.ToString();
Expand Down Expand Up @@ -289,8 +292,9 @@ private void TranslationProvidersAllLanguages_SelectedIndexChanged(object sender
if (SelectedTemplate.SelectedItem is ApplyTemplate applyTemplate)
{
applyTemplate.TranslationProvidersAllLanguages =
(ApplyTemplateOptions)Enum.Parse(typeof(ApplyTemplateOptions),
TranslationProvidersAllLanguages.SelectedItem.ToString());
(ApplyTemplateOptions)TranslationProvidersAllLanguages.SelectedIndex;
//Enum.Parse(typeof(ApplyTemplateOptions),
//TranslationProvidersAllLanguages.SelectedItem.ToString());
}
CheckChanged();
}
Expand All @@ -305,8 +309,9 @@ private void TranslationProvidersSpecificLanguages_SelectedIndexChanged(object s
if (SelectedTemplate.SelectedItem is ApplyTemplate applyTemplate)
{
applyTemplate.TranslationProvidersSpecificLanguages =
(ApplyTemplateOptions)Enum.Parse(typeof(ApplyTemplateOptions),
TranslationProvidersSpecificLanguages.SelectedItem.ToString());
(ApplyTemplateOptions)TranslationProvidersSpecificLanguages.SelectedIndex;
//Enum.Parse(typeof(ApplyTemplateOptions),
// TranslationProvidersSpecificLanguages.SelectedItem.ToString());
}

CheckChanged();
Expand All @@ -323,7 +328,7 @@ private void TranslationMemoriesAllLanguages_SelectedIndexChanged(object sender,
{
applyTemplate.TranslationMemoriesAllLanguages =
(ApplyTemplateOptions)Enum.Parse(typeof(ApplyTemplateOptions),
TranslationMemoriesAllLanguages.SelectedItem.ToString());
TranslationMemoriesAllLanguages.SelectedItem.ToString());
}
CheckChanged();
}
Expand Down Expand Up @@ -354,8 +359,9 @@ private void TerminologyTermbases_SelectedIndexChanged(object sender, EventArgs
if (SelectedTemplate.SelectedItem is ApplyTemplate applyTemplate)
{
applyTemplate.TerminologyTermbases =
(ApplyTemplateOptions)Enum.Parse(typeof(ApplyTemplateOptions),
TerminologyTermbases.SelectedItem.ToString());
(ApplyTemplateOptions)TerminologyTermbases.SelectedIndex;
//Enum.Parse(typeof(ApplyTemplateOptions),
//TerminologyTermbases.SelectedItem.ToString());
}
CheckChanged();
}
Expand Down
11 changes: 11 additions & 0 deletions ApplyStudioProjectTemplate/Sdl.Community.ApplyStudioProjectTemplate/ApplyTemplateOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,16 @@ public enum ApplyTemplateOptions
/// Overwrite the current settings with the settings from the template
/// </summary>
Overwrite = 2,

/// <summary>
/// Alternative Merge of settings from the template with the existing settings
/// </summary>
/// <remarks>
/// This is to not to break older versions of settings file ASPT.xml.
/// ApplyTemplateForm actually uses Append and Prepend for Merge/AltMerge.
/// For translation providers the old Merge matches Prepend,
/// for Termbases the old Merge matches Append.
/// </remarks>
AltMerge = 3
}
}
23 changes: 15 additions & 8 deletions SdlXliff Compare/Sdl.Community.XliffCompare.Core/Comparer/TextComparer/TextComparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,19 @@ internal static WordsCollection Parse(List<SDLXLIFF.SegmentSection> xSegmentSect
while (curPos < xSegmentSection.Content.Length)
{
var prevPos = curPos;
while (curPos < xSegmentSection.Content.Length &&
(char.IsControl(xSegmentSection.Content[curPos])
|| char.IsWhiteSpace(xSegmentSection.Content[curPos])))
{
curPos++;
}
prefix += xSegmentSection.Content.Substring(prevPos, curPos - prevPos);
if (xSegmentSection.Content[curPos] == '\xa0') // make nbsp a word
{
words.Add(new Word("\xa0", string.Empty, string.Empty));
curPos++;
continue;
}
while (curPos < xSegmentSection.Content.Length &&
(char.IsControl(xSegmentSection.Content[curPos])
|| char.IsWhiteSpace(xSegmentSection.Content[curPos])))
{
curPos++;
}
prefix += xSegmentSection.Content.Substring(prevPos, curPos - prevPos);

if (curPos == xSegmentSection.Content.Length)
{
Expand All @@ -362,7 +368,8 @@ internal static WordsCollection Parse(List<SDLXLIFF.SegmentSection> xSegmentSect

prevPos = curPos;
while (curPos < xSegmentSection.Content.Length &&
(char.IsControl(xSegmentSection.Content[curPos]) ||
xSegmentSection.Content[curPos] != '\xa0' && // stop at nbsp
(char.IsControl(xSegmentSection.Content[curPos]) ||
char.IsWhiteSpace(xSegmentSection.Content[curPos])))
{
curPos++;
Expand Down