search

sillsdev / l10nsharp

A .NET localization library for Windows Forms applications.
3 stars 10 forks source link

Combine `master` and `xliff` branches #61

Closed ermshiperete closed 5 years ago

ermshiperete commented 5 years ago

This PR combines the master and the xliff branches and enhances the API so that it's possible to select whether to use TMX or XLIFF files at compile/runtime.

This is a breaking change, so will end up with version number 4.0. To create a LocalizationManager you now pass a TranslationMemory parameter:

LocalizationManager.Create(TranslationMemory.XLiff, lang, "SampleApp", "SampleApp",
    Application.ProductVersion, directoryOfInstalledXliffFiles, "MyCompany/L10NSharpSample",
    icon, "sample@example.com", "SampleApp");

This PR should be merge of master and xliff, but this lists all the changes that are on xliff but not on master and vice versa, so it makes the PR really confusing. I decided to do the merge in a separate step - while being on the xliff branch this can be achieved by running: git merge -s ours master.

This change is Reviewable