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

Fix issue with virtual paths

Browse Source 
~/Foo is the same as /Foo only if the application virtual
path is "/". Otherwise, "~/Foo" is equal to "/AppPath/Foo".

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-16 22:04:07 -07:00
parent 4924728321
commit 4988dbff06
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Orchard/Localization/Services/DefaultResourceManager.cs
View File

@@ -15,10 +15,10 @@ namespace Orchard.Localization.Services {
private readonly ICacheManager _cacheManager;
private readonly ShellSettings _shellSettings;
private readonly ISignals _signals;
const string CoreLocalizationFilePathFormat = "/Core/App_Data/Localization/{0}/orchard.core.po";
const string ModulesLocalizationFilePathFormat = "/Modules/{0}/App_Data/Localization/{1}/orchard.module.po";
const string RootLocalizationFilePathFormat = "/App_Data/Localization/{0}/orchard.root.po";
const string TenantLocalizationFilePathFormat = "/App_Data/Sites/{0}/Localization/{1}/orchard.po";
const string CoreLocalizationFilePathFormat = "~/Core/App_Data/Localization/{0}/orchard.core.po";
const string ModulesLocalizationFilePathFormat = "~/Modules/{0}/App_Data/Localization/{1}/orchard.module.po";
const string RootLocalizationFilePathFormat = "~/App_Data/Localization/{0}/orchard.root.po";
const string TenantLocalizationFilePathFormat = "~/App_Data/Sites/{0}/Localization/{1}/orchard.po";
public DefaultResourceManager(
ICultureManager cultureManager,
@@ -107,10 +107,10 @@ namespace Orchard.Localization.Services {
// Merging occurs from multiple locations:
// In reverse priority order:
// "/Core/App_Data/Localization/<culture_name>/orchard.core.po";
// "/Modules/<module_name>/App_Data/Localization/<culture_name>/orchard.module.po";
// "/App_Data/Localization/<culture_name>/orchard.root.po";
// "/App_Data/Sites/<tenant_name>/Localization/<culture_name>/orchard.po";
// "~/Core/App_Data/Localization/<culture_name>/orchard.core.po";
// "~/Modules/<module_name>/App_Data/Localization/<culture_name>/orchard.module.po";
// "~/App_Data/Localization/<culture_name>/orchard.root.po";
// "~/App_Data/Sites/<tenant_name>/Localization/<culture_name>/orchard.po";
// The dictionary entries from po files that live in higher priority locations will
// override the ones from lower priority locations during loading of dictionaries.