From 6d44cc958f3b5ba01c3cc903f2231978f1879be4 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 21 Oct 2010 13:49:02 -0700 Subject: [PATCH 1/2] Change the feed url to the new url for 0.8 --HG-- branch : dev --- .../Modules/Orchard.Packaging/DefaultPackagingUpdater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs b/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs index e2216b9b2..0af950039 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs @@ -20,7 +20,7 @@ namespace Orchard.Packaging { public Localizer T { get; set; } public void Install(Feature feature) { - _packagingSourceManager.AddSource(new PackagingSource { Id = Guid.NewGuid(), FeedTitle = "Orchard Module Gallery", FeedUrl = "http://orchardproject.net/gallery/feed" }); + _packagingSourceManager.AddSource(new PackagingSource { Id = Guid.NewGuid(), FeedTitle = "Orchard Module Gallery", FeedUrl = "http://orchardproject.net/gallery08/feed" }); } public void Enable(Feature feature) { From 73c815f67df972fd8412dd3a3093fd72eb900fae Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 21 Oct 2010 14:02:12 -0700 Subject: [PATCH 2/2] Ignoring incomplete localization entries - i.e. when the msgid or msgstr are empty --HG-- branch : dev --- .../Localization/Services/DefaultLocalizedStringManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs index e4f7a95f5..64dbe2bf3 100644 --- a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs +++ b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs @@ -183,7 +183,8 @@ namespace Orchard.Localization.Services { if (poLine.StartsWith("msgstr")) { string translation = ParseTranslation(poLine); - if (!String.IsNullOrEmpty(id)) { + // ignore incomplete localizations (empty msgid or msgstr) + if ( !String.IsNullOrWhiteSpace(id) && !String.IsNullOrWhiteSpace(translation) ) { string scopedKey = (scope + "|" + id).ToLowerInvariant(); if (!translations.ContainsKey(scopedKey)) { translations.Add(scopedKey, translation);