lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into issue/homepage-alias

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/ImportExport/HomeAliasExportStep.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
	src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
	src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
	src/Orchard/Localization/Services/DefaultDateFormatter.cs
	src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
This commit is contained in:
Sipke Schoorstra
2015-07-24 14:11:00 +01:00
parent f575944df3 d6e96252e7
commit e8cc0cba6e
31 changed files with 578 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/npgsql/de/Npgsql.resources.dll Normal file
View File

Binary file not shown.

BIN
lib/npgsql/es/Npgsql.resources.dll Normal file
View File

Binary file not shown.

BIN
lib/npgsql/fi/Npgsql.resources.dll Normal file
View File

Binary file not shown.

BIN
lib/npgsql/fr/Npgsql.resources.dll Normal file
View File

Binary file not shown.

BIN
lib/npgsql/ja/Npgsql.resources.dll Normal file
View File

Binary file not shown.

BIN
lib/npgsql/zh-CN/Npgsql.resources.dll Normal file
View File

Binary file not shown.

6
src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
View File

@@ -15,6 +15,12 @@ using Orchard.Localization.Services;
using Orchard.Mvc; using Orchard.Mvc;
using Orchard.Security; using Orchard.Security;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using Orchard.Utility.Extensions;
using Orchard.Localization.Services;
using Orchard.Localization.Models;
using Orchard.Mvc;
using System.Web;
using Orchard.ContentManagement.Aspects;
namespace Orchard.Autoroute.Drivers { namespace Orchard.Autoroute.Drivers {
public class AutoroutePartDriver : ContentPartDriver<AutoroutePart> { public class AutoroutePartDriver : ContentPartDriver<AutoroutePart> {

47
src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
View File

@@ -88,6 +88,30 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" /> <Content Include="Module.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard.Framework</Name>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\Orchard.Alias\Orchard.Alias.csproj">
<Project>{475B6C45-B27C-438B-8966-908B9D6D1077}</Project>
<Name>Orchard.Alias</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.ContentTypes\Orchard.ContentTypes.csproj">
<Project>{0e7646e8-fe8f-43c1-8799-d97860925ec4}</Project>
<Name>Orchard.ContentTypes</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
<Project>{6F759635-13D7-4E94-BCC9-80445D63F117}</Project>
<Name>Orchard.Tokens</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Commands\AutorouteCommands.cs" /> <Compile Include="Commands\AutorouteCommands.cs" />
<Compile Include="Providers\ContentDefinition\ContentDefinitionEventHandler.cs" /> <Compile Include="Providers\ContentDefinition\ContentDefinitionEventHandler.cs" />
@@ -115,28 +139,7 @@
<Compile Include="Settings\AutorouteSettings.cs" /> <Compile Include="Settings\AutorouteSettings.cs" />
<Compile Include="ViewModels\AutoroutePartEditViewModel.cs" /> <Compile Include="ViewModels\AutoroutePartEditViewModel.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup />
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
<Project>{2d1d92bb-4555-4cbe-8d0e-63563d6ce4c6}</Project>
<Name>Orchard.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Alias\Orchard.Alias.csproj">
<Project>{475b6c45-b27c-438b-8966-908b9d6d1077}</Project>
<Name>Orchard.Alias</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.ContentTypes\Orchard.ContentTypes.csproj">
<Project>{0e7646e8-fe8f-43c1-8799-d97860925ec4}</Project>
<Name>Orchard.ContentTypes</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Tokens\Orchard.Tokens.csproj">
<Project>{6f759635-13d7-4e94-bcc9-80445d63f117}</Project>
<Name>Orchard.Tokens</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Placement.info"> <Content Include="Placement.info">
<SubType>Designer</SubType> <SubType>Designer</SubType>

6
src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
View File

@@ -148,8 +148,8 @@ namespace Orchard.Autoroute.Services {
} else { } else {
settings.DefaultPatterns.Add(new DefaultPattern { PatternIndex = "0", Culture = culture }); settings.DefaultPatterns.Add(new DefaultPattern { PatternIndex = "0", Culture = culture });
return new RoutePattern { Name = "Title", Description = "my-title", Pattern = "{Content.Slug}", Culture = culture }; return new RoutePattern { Name = "Title", Description = "my-title", Pattern = "{Content.Slug}", Culture = culture };
}
} }
}
// return a default pattern if set // return a default pattern if set
var patternCultureSearch = settings.Patterns.Any(x => String.Equals(x.Culture, culture, StringComparison.OrdinalIgnoreCase)) ? culture : null; var patternCultureSearch = settings.Patterns.Any(x => String.Equals(x.Culture, culture, StringComparison.OrdinalIgnoreCase)) ? culture : null;
@@ -159,11 +159,11 @@ namespace Orchard.Autoroute.Services {
if (settings.Patterns.Where(x => x.Culture == patternCultureSearch).ElementAt(Convert.ToInt32(settings.DefaultPatterns.Where(x => x.Culture == defaultPatternCultureSearch).FirstOrDefault().PatternIndex)) != null) { if (settings.Patterns.Where(x => x.Culture == patternCultureSearch).ElementAt(Convert.ToInt32(settings.DefaultPatterns.Where(x => x.Culture == defaultPatternCultureSearch).FirstOrDefault().PatternIndex)) != null) {
return settings.Patterns.Where(x => x.Culture == patternCultureSearch).ElementAt(Convert.ToInt32(settings.DefaultPatterns.Where(x => x.Culture == defaultPatternCultureSearch).FirstOrDefault().PatternIndex)); return settings.Patterns.Where(x => x.Culture == patternCultureSearch).ElementAt(Convert.ToInt32(settings.DefaultPatterns.Where(x => x.Culture == defaultPatternCultureSearch).FirstOrDefault().PatternIndex));
}; };
} }
// return a default pattern if none is defined // return a default pattern if none is defined
return new RoutePattern { Name = "Title", Description = "my-title", Pattern = "{Content.Slug}", Culture = culture }; return new RoutePattern { Name = "Title", Description = "my-title", Pattern = "{Content.Slug}", Culture = culture };
} }
public void RemoveAliases(AutoroutePart part) { public void RemoveAliases(AutoroutePart part) {
_aliasService.Delete(part.Path, AliasSource); _aliasService.Delete(part.Path, AliasSource);

10
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
View File

@@ -14,14 +14,14 @@ else {
} }
<h2>@T("Recipe steps")</h2> <h2>@T("Recipe steps")</h2>
<table class="items" style="width: auto;"> <table class="items" style="width: auto;">
<thead> <thead>
<tr> <tr>
<th>@T("Step")</th> <th>@T("Step")</th>
<th>@T("Executed")</th> <th>@T("Executed")</th>
<th>@T("Result")</th> <th>@T("Result")</th>
<th>@T("Message")</th> <th>@T("Message")</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var step in Model.Result.Steps) { @foreach (var step in Model.Result.Steps) {
<tr> <tr>
@@ -32,5 +32,5 @@ else {
</tr> </tr>
} }
</tbody> </tbody>
</table> </table>

1
src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
View File

@@ -81,6 +81,7 @@
<ProjectReference Include="..\Orchard.Autoroute\Orchard.Autoroute.csproj"> <ProjectReference Include="..\Orchard.Autoroute\Orchard.Autoroute.csproj">
<Project>{66fccd76-2761-47e3-8d11-b45d0001ddaa}</Project> <Project>{66fccd76-2761-47e3-8d11-b45d0001ddaa}</Project>
<Name>Orchard.Autoroute</Name> <Name>Orchard.Autoroute</Name>
<Private>false</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Orchard.ContentPicker\Orchard.ContentPicker.csproj"> <ProjectReference Include="..\Orchard.ContentPicker\Orchard.ContentPicker.csproj">
<Project>{f301ef7d-f19c-4d83-aa94-cb64f29c037d}</Project> <Project>{f301ef7d-f19c-4d83-aa94-cb64f29c037d}</Project>