lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes to localizationservice to get with of silly select..

Browse Source
This commit is contained in:
Nicholas Mayne
2014-09-23 22:57:25 +01:00
parent ba16115128
commit a618ed7102
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Tests/Localization/CultureManagerTests.cs
View File

@@ -58,6 +58,7 @@ namespace Orchard.Tests.Localization {
builder.RegisterType<TestCultureSelector>().As<ICultureSelector>();
builder.RegisterType<DefaultCultureManager>().As<ICultureManager>();
builder.RegisterType<Signals>().As<ISignals>();
builder.RegisterType<StubCacheManager>().As<ICacheManager>();
builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
_session = _sessionFactory.OpenSession();
builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();

2
src/Orchard.Web/Modules/Orchard.Localization/Selectors/BrowserCultureSelector.cs
View File

@@ -16,6 +16,8 @@ namespace Orchard.Localization.Selectors {
}
public CultureSelectorResult GetCulture(HttpContextBase context) {
if (context == null) return null;
/* Fall back to Browser */
var userLanguages = context.Request.UserLanguages;

3
src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs
View File

@@ -23,8 +23,7 @@ namespace Orchard.Localization.Selectors {
}
public CultureSelectorResult GetCulture(HttpContextBase context) {
if (ContextHelpers.IsRequestAdmin(context))
return null;
if (context == null || ContextHelpers.IsRequestAdmin(context)) return null;
// Attempt to determine culture by previous route if by POST
string path;

2
src/Orchard.Web/Modules/Orchard.Localization/Selectors/CookieCultureSelector.cs
View File

@@ -48,6 +48,8 @@ namespace Orchard.Localization.Selectors {
}
public CultureSelectorResult GetCulture(HttpContextBase context) {
if (context == null) return null;
var cookie = context.Request.Cookies.Get(CookieName);
if (cookie != null)

3
src/Orchard.Web/Modules/Orchard.Localization/Selectors/RouteCultureSelector.cs
View File

@@ -7,8 +7,7 @@ namespace Orchard.Localization.Selectors {
[OrchardFeature("Orchard.Localization.CutlureSelector")]
public class RouteCultureSelector : ICultureSelector {
public CultureSelectorResult GetCulture(HttpContextBase context) {
if (ContextHelpers.IsRequestAdmin(context))
return null;
if (context == null || ContextHelpers.IsRequestAdmin(context)) return null;
// Attempt to determine culture by route.
// This normally happens when you are using non standard pages that are not content items

17
src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs
View File

@@ -30,15 +30,14 @@ namespace Orchard.Localization.Services {
return null;
var query = versionOptions == null
? _contentManager.Query(content.ContentItem.ContentType)
: _contentManager.Query(versionOptions, content.ContentItem.ContentType);
? _contentManager.Query<LocalizationPart>(content.ContentItem.ContentType)
: _contentManager.Query<LocalizationPart>(versionOptions, content.ContentItem.ContentType);
// Warning: Returns only the first of same culture localizations.
return query.Where<LocalizationPartRecord>(l =>
(l.Id == content.ContentItem.Id || l.MasterContentItemId == content.ContentItem.Id)
&& l.CultureId == cultureRecord.Id)
.List()
.Select(i => i.As<LocalizationPart>())
.FirstOrDefault();
}
@@ -54,9 +53,7 @@ namespace Orchard.Localization.Services {
if (localized == null)
return;
var cultureRecord = _cultureManager.GetCultureByName(culture);
localized.Culture = cultureRecord;
localized.Culture = _cultureManager.GetCultureByName(culture);
}
IEnumerable<LocalizationPart> ILocalizationService.GetLocalizations(IContent content) {
@@ -71,12 +68,12 @@ namespace Orchard.Localization.Services {
var localized = content.As<LocalizationPart>();
var query = versionOptions == null
? _contentManager.Query(localized.ContentItem.ContentType)
: _contentManager.Query(versionOptions, localized.ContentItem.ContentType);
? _contentManager.Query<LocalizationPart>(localized.ContentItem.ContentType)
: _contentManager.Query<LocalizationPart>(versionOptions, localized.ContentItem.ContentType);
int contentItemId = localized.ContentItem.Id;
if (localized.MasterContentItem != null) {
if (localized.HasTranslationGroup) {
int masterContentItemId = localized.MasterContentItem.ContentItem.Id;
query = query.Where<LocalizationPartRecord>(l =>
@@ -89,7 +86,7 @@ namespace Orchard.Localization.Services {
}
// Warning: May contain more than one localization of the same culture.
return query.List().Select(i => i.As<LocalizationPart>());
return query.List().ToList();
}
}
}