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

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-21 14:42:53 -07:00
parent 3e0b8731f6 48c6ddcc3f
commit 1fffa221b8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Packaging/DefaultPackagingUpdater.cs
View File

@@ -20,7 +20,7 @@ namespace Orchard.Packaging {
public Localizer T { get; set; } public Localizer T { get; set; }
public void Install(Feature feature) { 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) { public void Enable(Feature feature) {

3
src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
View File

@@ -183,7 +183,8 @@ namespace Orchard.Localization.Services {
if (poLine.StartsWith("msgstr")) { if (poLine.StartsWith("msgstr")) {
string translation = ParseTranslation(poLine); 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(); string scopedKey = (scope + "|" + id).ToLowerInvariant();
if (!translations.ContainsKey(scopedKey)) { if (!translations.ContainsKey(scopedKey)) {
translations.Add(scopedKey, translation); translations.Add(scopedKey, translation);