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

FIX: Incorrect default path to localization folder in Architect #2544

Merged
merged 1 commit into from Mar 19, 2024
Merged

FIX: Incorrect default path to localization folder in Architect #2544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion backend/Origam.Common/OrigamSettings.cs
View file
Open in desktop
Expand Up @@ -186,8 +186,13 @@ public override string ToString()
[Category("(Configuration)")]
public string Name { get; set; } = "New Configuration";

private string _localization = "";
[Category("Localization")]
public string LocalizationFolder { get; set; } = "";
public string LocalizationFolder
{
get { return _localization; }
set { _localization = value?.Trim(); }
}

[Category("Localization")]
[Description("Comma separated names of documentation categories to be include in the generated localization files e.g. USER_SHORT_HELP,USER_LONG_HELP")]
Expand Down
4 changes: 1 addition & 3 deletions backend/OrigamArchitect/Commands/Commands.cs
View file
Open in desktop
Expand Up @@ -51,10 +51,8 @@
using Origam.BI.CrystalReports;
using MoreLinq;
using Origam.Extensions;
using Origam.Git;
using Origam.Gui;
using Origam.Service.Core;
using Origam.Windows.Editor.GIT;

namespace OrigamArchitect.Commands
{
Expand Down Expand Up @@ -865,7 +863,7 @@ public override void Run()
foreach(string language in languages)
{
string fileName = packageName + "-" + language.Trim() + ".xml";
string outputPath = Path.Combine(Path.Combine(settings.ModelSourceControlLocation, "l10n"), fileName);
string outputPath = Path.Combine(Path.Combine(settings.ModelSourceControlLocation, @"..\l10n"), fileName);
if (!string.IsNullOrEmpty(settings.LocalizationFolder))
{
outputPath = Path.Combine(settings.LocalizationFolder, fileName);
Expand Down