From 56b34d79e8e6cb6c7bba45b4f53c8643902dc04c Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Mon, 12 Jul 2021 11:56:59 +0300 Subject: [PATCH 1/2] fix: the URL for language switching is incorrect --- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 1 + .../Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs | 2 +- .../src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 020ff807bf..07556b9b1a 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -123,6 +123,7 @@ namespace VoloDocs.Web { options.Languages.Add(new LanguageInfo("cs", "cs", "Čeština")); 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("fr", "fr", "Français")); options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); diff --git a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs index 547fce39a7..d7d095bd70 100644 --- a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs +++ b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs @@ -137,7 +137,7 @@ namespace Volo.Docs.Areas.Documents.TagHelpers } else if (node.LastSignificantUpdateTime != null && node.LastSignificantUpdateTime + TimeSpan.FromDays(14) > DateTime.Now) { - var updBadge = sb.Append("").Append(_localizer["Upd"]).Append(""); + var updBadge = sb.Append("").Append(_localizer["Upd"]).Append("").ToString(); badgeStringBuilder.Append(updBadge); } } diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index d50d1b307b..99c323bf89 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -212,7 +212,7 @@ namespace Volo.Docs.Pages.Documents.Project var sb = new StringBuilder(); 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(); @@ -454,6 +454,8 @@ namespace Volo.Docs.Pages.Documents.Project language.Code == LanguageCode ) ); + + sb.Clear(); } } From c941625b1054194b0c79316fba4adfea524fa4c8 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Mon, 12 Jul 2021 12:02:42 +0300 Subject: [PATCH 2/2] Update TreeTagHelper.cs --- .../Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs index d7d095bd70..d866faa730 100644 --- a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs +++ b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs @@ -147,7 +147,7 @@ namespace Volo.Docs.Areas.Documents.TagHelpers listInnerItem = string.Format(ListItemAnchor, NormalizePath(node.Path), textCss, node.Text.IsNullOrEmpty() ? "?" - : sb.Append(node.Text).Append(badgeStringBuilder).ToString()); + : sb.Append(node.Text).Append(badgeStringBuilder.ToString()).ToString()); } sb.Clear();