Skip to content

Commit e51f286

Browse files
committed
From v13: Fix #609 Default language importing. (#614)
1 parent 7315f61 commit e51f286

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

uSync.BackOffice/SyncHandlers/Handlers/LanguageHandler.cs

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,21 @@ protected override string GetPath(string folder, ILanguage item, bool GuidNames,
6565
protected override string GetItemPath(ILanguage item, bool useGuid, bool isFlat)
6666
=> item.IsoCode.ToSafeFileName(shortStringHelper);
6767

68-
69-
/// <summary>
70-
/// ensure we import the 'default' language first, so we don't get errors doing it.
71-
/// </summary>
72-
protected override IEnumerable<string> GetImportFiles(string folder)
68+
/// <summary>
69+
/// order the merged items, making sure the default language is first.
70+
/// </summary>
71+
protected override IReadOnlyList<OrderedNodeInfo> GetMergedItems(string[] folders)
72+
=> base.GetMergedItems(folders)
73+
.OrderBy(x => x.Node.Element("IsDefault").ValueOrDefault(false) ? 0 : 1)
74+
.ToList();
75+
76+
/// <summary>
77+
/// ensure we import the 'default' language first, so we don't get errors doing it.
78+
/// </summary>
79+
/// <remarks>
80+
/// prost v13.1 this method isn't used to determain the order for all options.
81+
/// </remarks>
82+
protected override IEnumerable<string> GetImportFiles(string folder)
7383
{
7484
var files = base.GetImportFiles(folder);
7585

0 commit comments

Comments
 (0)