From 9305b933b7ee0751b335dc13eb0615562b832de9 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 30 May 2019 09:20:54 +0300 Subject: [PATCH] refactor --- .../Volo/Docs/Documents/DocumentAppService.cs | 4 ++-- .../Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfig.cs | 2 +- .../Documents/{LanguageInfo.cs => LanguageConfigElement.cs} | 2 +- .../Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) rename modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/{LanguageInfo.cs => LanguageConfigElement.cs} (82%) diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs index 95a869f296..013bcefe84 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs @@ -135,7 +135,7 @@ namespace Volo.Docs.Documents ); } - protected virtual LanguageInfo GetLanguageByCode(LanguageConfig languageCodes, string languageCode) + protected virtual LanguageConfigElement GetLanguageByCode(LanguageConfig languageCodes, string languageCode) { var language = languageCodes.Languages.FirstOrDefault(l => l.Code == languageCode); @@ -168,7 +168,7 @@ namespace Volo.Docs.Documents documentDto.Project.Languages = new Dictionary(); foreach (var language in languages.Languages) { - documentDto.Project.Languages.Add(language.Code,language.DisplayName); + documentDto.Project.Languages.Add(language.Code, language.DisplayName); } documentDto.CurrentLanguageCode = languageCode; diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfig.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfig.cs index d98444386f..038ec00cee 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfig.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfig.cs @@ -4,6 +4,6 @@ namespace Volo.Docs.Documents { public class LanguageConfig { - public List Languages { get; set; } + public List Languages { get; set; } } } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageInfo.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfigElement.cs similarity index 82% rename from modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageInfo.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfigElement.cs index f384dcaa76..25525394ca 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageInfo.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/LanguageConfigElement.cs @@ -1,6 +1,6 @@ namespace Volo.Docs.Documents { - public class LanguageInfo + public class LanguageConfigElement { public string DisplayName { get; set; } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs index ff06abdd27..74e2e8469e 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentStore.cs @@ -50,7 +50,8 @@ namespace Volo.Docs.FileSystem.Documents public async Task GetLanguageListAsync(Project project, string version) { - var configAsJson = project.GetFileSystemPath() + "languageConfig.json"; + var path = Path.Combine(project.GetFileSystemPath(), "languageConfig.json"); + var configAsJson = await FileHelper.ReadAllTextAsync(path); return JsonConvert.DeserializeObject(configAsJson); }