|
|
@ -165,13 +165,15 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
{ |
|
|
{ |
|
|
return RedirectToDefaultDocument(); |
|
|
return RedirectToDefaultDocument(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var usingSingleLanguageMode = !_uiOptions.MultiLanguageMode && LanguageCode.IsNullOrWhiteSpace(); |
|
|
|
|
|
|
|
|
if (!CheckLanguage()) |
|
|
if (!usingSingleLanguageMode && !CheckLanguage()) |
|
|
{ |
|
|
{ |
|
|
return RedirectToDefaultLanguage(); |
|
|
return RedirectToDefaultLanguage(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (IsDocumentCultureDifferentThanCurrent()) |
|
|
if (!usingSingleLanguageMode && IsDocumentCultureDifferentThanCurrent()) |
|
|
{ |
|
|
{ |
|
|
return ReloadPageWithCulture(); |
|
|
return ReloadPageWithCulture(); |
|
|
} |
|
|
} |
|
|
@ -445,7 +447,7 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
new GetNavigationDocumentInput |
|
|
new GetNavigationDocumentInput |
|
|
{ |
|
|
{ |
|
|
ProjectId = Project.Id, |
|
|
ProjectId = Project.Id, |
|
|
LanguageCode = LanguageCode, |
|
|
LanguageCode = DocumentLanguageCode, |
|
|
Version = Version |
|
|
Version = Version |
|
|
} |
|
|
} |
|
|
); |
|
|
); |
|
|
@ -488,7 +490,7 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var documentNames = new[] { DocumentName, documentPath.EnsureEndsWith('/') + "Index", documentPath.EnsureEndsWith('/') + "index" }.Distinct().ToArray(); |
|
|
var documentNames = new[] { DocumentName, documentPath.EnsureEndsWith('/') + "Index", documentPath.EnsureEndsWith('/') + "index" }.Distinct().ToArray(); |
|
|
var languages = new[] { LanguageCode, DefaultLanguageCode }.Distinct().ToArray(); |
|
|
var languages = new[] { LanguageCode, DefaultLanguageCode }.Where(x => !x.IsNullOrWhiteSpace()).Distinct().ToArray(); |
|
|
var sb = new StringBuilder(); |
|
|
var sb = new StringBuilder(); |
|
|
foreach (var documentName in documentNames) |
|
|
foreach (var documentName in documentNames) |
|
|
{ |
|
|
{ |
|
|
@ -517,6 +519,11 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
{ |
|
|
{ |
|
|
LanguageSelectListItems = new List<SelectListItem>(); |
|
|
LanguageSelectListItems = new List<SelectListItem>(); |
|
|
|
|
|
|
|
|
|
|
|
if (!_uiOptions.MultiLanguageMode) |
|
|
|
|
|
{ |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
foreach (var language in LanguageConfig.Languages) |
|
|
foreach (var language in LanguageConfig.Languages) |
|
|
{ |
|
|
{ |
|
|
LanguageSelectListItems.Add( |
|
|
LanguageSelectListItems.Add( |
|
|
|