Browse Source
Merge pull request #9572 from abpframework/berkan/fix-not-change-language--bug-on-docs-module
fix: the URL for language switching is incorrect on docs module
pull/9573/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
3 deletions
-
modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs
-
modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs
-
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
|
|
@ -123,6 +123,7 @@ namespace VoloDocs.Web |
|
|
{ |
|
|
{ |
|
|
options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština")); |
|
|
options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština")); |
|
|
options.Languages.Add(new LanguageInfo("en", "en", "English")); |
|
|
options.Languages.Add(new LanguageInfo("en", "en", "English")); |
|
|
|
|
|
options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); |
|
|
options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); |
|
|
options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); |
|
|
options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); |
|
|
options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); |
|
|
options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); |
|
|
options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); |
|
|
|
|
|
@ -137,7 +137,7 @@ namespace Volo.Docs.Areas.Documents.TagHelpers |
|
|
} |
|
|
} |
|
|
else if (node.LastSignificantUpdateTime != null && node.LastSignificantUpdateTime + TimeSpan.FromDays(14) > DateTime.Now) |
|
|
else if (node.LastSignificantUpdateTime != null && node.LastSignificantUpdateTime + TimeSpan.FromDays(14) > DateTime.Now) |
|
|
{ |
|
|
{ |
|
|
var updBadge = sb.Append("<span class='badge badge-light ml-2' title=\"").Append(_localizer["UpdatedExplanation"]).Append("\">").Append(_localizer["Upd"]).Append("</span>"); |
|
|
var updBadge = sb.Append("<span class='badge badge-light ml-2' title=\"").Append(_localizer["UpdatedExplanation"]).Append("\">").Append(_localizer["Upd"]).Append("</span>").ToString(); |
|
|
badgeStringBuilder.Append(updBadge); |
|
|
badgeStringBuilder.Append(updBadge); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -147,7 +147,7 @@ namespace Volo.Docs.Areas.Documents.TagHelpers |
|
|
listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path), textCss, |
|
|
listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path), textCss, |
|
|
node.Text.IsNullOrEmpty() |
|
|
node.Text.IsNullOrEmpty() |
|
|
? "?" |
|
|
? "?" |
|
|
: sb.Append(node.Text).Append(badgeStringBuilder).ToString()); |
|
|
: sb.Append(node.Text).Append(badgeStringBuilder.ToString()).ToString()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
sb.Clear(); |
|
|
sb.Clear(); |
|
|
|
|
|
@ -212,7 +212,7 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
var sb = new StringBuilder(); |
|
|
var sb = new StringBuilder(); |
|
|
|
|
|
|
|
|
var returnUrl = sb.Append(DocumentsUrlPrefix).Append(LanguageCode).Append("/").Append(ProjectName) |
|
|
var returnUrl = sb.Append(DocumentsUrlPrefix).Append(LanguageCode).Append("/").Append(ProjectName) |
|
|
.Append("/").Append(LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version).Append("/").Append(DocumentName); |
|
|
.Append("/").Append(LatestVersionInfo.IsSelected ? DocsAppConsts.Latest : Version).Append("/").Append(DocumentName).ToString(); |
|
|
|
|
|
|
|
|
sb.Clear(); |
|
|
sb.Clear(); |
|
|
|
|
|
|
|
|
@ -454,6 +454,8 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
language.Code == LanguageCode |
|
|
language.Code == LanguageCode |
|
|
) |
|
|
) |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
sb.Clear(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|