diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
index 45c7304658..06d6572dad 100644
--- a/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
+++ b/modules/docs/app/VoloDocs.Migrator/VoloDocs.Migrator.csproj
@@ -20,7 +20,6 @@
-
diff --git a/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/en.json b/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/en.json
new file mode 100644
index 0000000000..cd8eb98149
--- /dev/null
+++ b/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/en.json
@@ -0,0 +1,9 @@
+{
+ "culture": "en",
+ "texts": {
+ "WelcomeVoloDocs": "Welcome to the VoloDocs!",
+ "NoProjectWarning": "There`s no defined project yet!",
+ "CreateYourFirstProject": "Click here to start your first project",
+ "NoProject": "No project!"
+ }
+}
\ No newline at end of file
diff --git a/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/tr.json b/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/tr.json
new file mode 100644
index 0000000000..a9b3911d20
--- /dev/null
+++ b/modules/docs/app/VoloDocs/Localization/Resources/VoloDocs/Web/tr.json
@@ -0,0 +1,7 @@
+{
+ "culture": "tr",
+ "texts": {
+ "WelcomeVoloDocs": "VoloDocs Hoşgeldiniz!"
+
+ }
+}
\ No newline at end of file
diff --git a/modules/docs/app/VoloDocs/Pages/Index.cshtml b/modules/docs/app/VoloDocs/Pages/Index.cshtml
index e2b7252679..c7a637ef90 100644
--- a/modules/docs/app/VoloDocs/Pages/Index.cshtml
+++ b/modules/docs/app/VoloDocs/Pages/Index.cshtml
@@ -1,6 +1,5 @@
@page
-@using Castle.Core.Internal
@using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Docs
@using Volo.Docs.Localization
@@ -18,24 +17,24 @@
-
- Welcome to the VoloDocs!
-
+
+ @L["WelcomeVoloDocs"]
+
@if (!Model.Projects.Any())
{
-
No project!
-
There`s no defined project yet!
+
@L["NoProject"]
+
@L["NoProjectWarning"]
-
Click here to start your first project
+
@L["CreateYourFirstProject"]
}
else if (Model.Projects.Count > 1)
{
-
@L["Projects"]
+
@L["Projects"]
@foreach (var project in Model.Projects)
diff --git a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
index 522e992d08..7f3277c237 100644
--- a/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
+++ b/modules/docs/app/VoloDocs/Pages/Index.cshtml.cs
@@ -2,8 +2,6 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Options;
-using Volo.Abp.Data;
using Volo.Abp.Users;
using Volo.Docs;
using Volo.Docs.Projects;
@@ -16,15 +14,12 @@ namespace VoloDocs.Pages
public string CreateProjectLink { get; set; }
private readonly IProjectAppService _projectAppService;
- private readonly DbConnectionOptions _dbConnectionOptions;
private readonly ICurrentUser _currentUser;
- public IndexModel(IProjectAppService projectAppService,
- IOptionsSnapshot dbConnectionOptions, ICurrentUser currentUser)
+ public IndexModel(IProjectAppService projectAppService, ICurrentUser currentUser)
{
_projectAppService = projectAppService;
_currentUser = currentUser;
- _dbConnectionOptions = dbConnectionOptions.Value;
}
public async Task OnGet()
diff --git a/modules/docs/app/VoloDocs/VoloDocs.csproj b/modules/docs/app/VoloDocs/VoloDocs.csproj
index d063c1bdbb..dcb284f466 100644
--- a/modules/docs/app/VoloDocs/VoloDocs.csproj
+++ b/modules/docs/app/VoloDocs/VoloDocs.csproj
@@ -10,6 +10,11 @@
+
+
+
+
+
diff --git a/modules/docs/app/VoloDocs/VoloDocsModule.cs b/modules/docs/app/VoloDocs/VoloDocsModule.cs
index 3a25b9c740..7bb7fb9a7c 100644
--- a/modules/docs/app/VoloDocs/VoloDocsModule.cs
+++ b/modules/docs/app/VoloDocs/VoloDocsModule.cs
@@ -10,6 +10,7 @@ using Microsoft.Extensions.Options;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account.Web;
+using Volo.Abp.AspNetCore.Mvc.Localization;
using Volo.Abp.AspNetCore.Mvc.UI;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
@@ -20,6 +21,8 @@ using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Identity;
using Volo.Abp.Identity.Web;
+using Volo.Abp.Localization;
+using Volo.Abp.Localization.Resources.AbpValidation;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement;
using Volo.Abp.PermissionManagement.Identity;
@@ -28,12 +31,12 @@ using Volo.Abp.UI;
using Volo.Abp.VirtualFileSystem;
using Volo.Docs;
using Volo.Docs.Admin;
-using VoloDocs.Branding;
+using Volo.Docs.Localization;
using VoloDocs.EntityFrameworkCore;
using VoloDocs.Utils;
namespace VoloDocs
-{
+{
[DependsOn(
typeof(DocsWebModule),
typeof(DocsAdminWebModule),
@@ -50,11 +53,19 @@ namespace VoloDocs
)]
public class VoloDocsModule : AbpModule
{
+ public override void PreConfigureServices(ServiceConfigurationContext context)
+ {
+ PreConfigure(options =>
+ {
+ options.AddAssemblyResource(typeof(DocsResource), typeof(VoloDocsModule).Assembly);
+ });
+ }
+
public override void ConfigureServices(ServiceConfigurationContext context)
{
var hostingEnvironment = context.Services.GetHostingEnvironment();
var configuration = context.Services.GetConfiguration();
-
+
Configure(options =>
{
options.ConnectionStrings.Default = configuration["ConnectionString"];
@@ -83,7 +94,11 @@ namespace VoloDocs
context.Services.AddSwaggerGen(
options =>
{
- options.SwaggerDoc("v1", new Info { Title = "Docs API", Version = "v1" });
+ options.SwaggerDoc("v1", new Info
+ {
+ Title = "Docs API",
+ Version = "v1"
+ });
options.DocInclusionPredicate((docName, description) => true);
options.CustomSchemaIds(type => type.FullName);
});
@@ -96,6 +111,20 @@ namespace VoloDocs
options.SupportedUICultures = cultures;
});
+ Configure(options =>
+ {
+ options.FileSets.AddEmbedded();
+ });
+
+ Configure(options =>
+ {
+ options.Resources
+ .Get()
+ .AddBaseTypes(typeof(AbpValidationResource))
+ .AddBaseTypes(typeof(AbpUiModule))
+ .AddVirtualJson("/Localization/Resources/VoloDocs/Web");
+ });
+
Configure(options =>
{
options.DefaultThemeName = BasicTheme.Name;
diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json
index 75510dc78d..b2dc82e3ce 100644
--- a/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json
+++ b/modules/docs/src/Volo.Docs.Admin.Web/Localization/Resources/Docs/Web/tr.json
@@ -19,9 +19,9 @@
"DisplayName:DefaultDocumentName": "Varsayılan döküman adı",
"DisplayName:NavigationDocumentName": "Navigasyon dökümanı adı",
"DisplayName:MinimumVersion": "Minimum versiyon",
- "DisplayName:MainWebsiteUrl": "Ana web site url'i",
+ "DisplayName:MainWebsiteUrl": "Ana web site URL",
"DisplayName:LatestVersionBranchName": "Son versiyon Branch adı",
- "DisplayName:GitHubRootUrl": "GitHub kök url'i",
- "DisplayName:GitHubAccessToken": "GitHub erişim jetonu"
+ "DisplayName:GitHubRootUrl": "GitHub kök adresi",
+ "DisplayName:GitHubAccessToken": "GitHub erişim token"
}
}
\ No newline at end of file