Merge branch 'master' of https://github.com/volosoft/abp

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo.Blogging.Application.Contracts.csproj

@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Volo\Blogging\Localization\ApplicationContracts\en.json" />
-    <None Remove="Volo\Blogging\Localization\ApplicationContracts\tr.json" />
+    <None Remove="Volo\Blogging\Localization\Resources\Blogging\ApplicationContracts\en.json" />
+    <None Remove="Volo\Blogging\Localization\Resources\Blogging\ApplicationContracts\tr.json" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Volo\Blogging\Localization\ApplicationContracts\en.json" />
-    <EmbeddedResource Include="Volo\Blogging\Localization\ApplicationContracts\tr.json" />
+    <EmbeddedResource Include="Volo\Blogging\Localization\Resources\Blogging\ApplicationContracts\en.json" />
+    <EmbeddedResource Include="Volo\Blogging\Localization\Resources\Blogging\ApplicationContracts\tr.json" />
   </ItemGroup>
 
   <ItemGroup>

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs

@@ -25,7 +25,7 @@ namespace Volo.Blogging
             {
                 options.Resources
                     .Get<BloggingResource>()
-                    .AddVirtualJson("/Localization/Resources/Blogging/ApplicationContracts");
+                    .AddVirtualJson("Volo/Blogging/Localization/Resources/Blogging/ApplicationContracts");
             });
         }
     }

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -61,7 +61,7 @@ namespace Volo.Blogging
                 //TODO: Make configurable!
                 options.Conventions.AddPageRoute("/Blog/Posts/Index", "blog/{blogShortName}");
                 options.Conventions.AddPageRoute("/Blog/Posts/Detail", "blog/{blogShortName}/{postUrl}");
-                options.Conventions.AddPageRoute("/Blog/Posts/Edit", "blog/{blogShortName}/posts/edit/{postId}");
+                options.Conventions.AddPageRoute("/Blog/Posts/Edit", "blog/{blogShortName}/posts/{postId}/edit");
                 options.Conventions.AddPageRoute("/Blog/Posts/New", "blog/{blogShortName}/posts/new");
             });
         }