From 104cf7d5f4c36ef9b42fffbd847479e3b02b26d2 Mon Sep 17 00:00:00 2001 From: Marek Dzikiewicz Date: Sat, 20 Jun 2015 22:42:33 +0200 Subject: [PATCH] Fix handling localized strings with quotes --- .../Services/DefaultLocalizedStringManager.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs index c27b3ee08..bb452daaf 100644 --- a/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs +++ b/src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs @@ -254,20 +254,28 @@ namespace Orchard.Localization.Services { } } + private static string TrimQuote(string str) { + if (str.StartsWith("\"") && str.EndsWith("\"")) { + return str.Substring(1, str.Length - 2); + } + + return str; + } + private static string ParseTranslation(string poLine) { - return Unescape(poLine.Substring(6).Trim().Trim('"')); + return Unescape(TrimQuote(poLine.Substring(6).Trim())); } private static string ParseId(string poLine) { - return Unescape(poLine.Substring(5).Trim().Trim('"')); + return Unescape(TrimQuote(poLine.Substring(5).Trim())); } private static string ParseScope(string poLine) { - return Unescape(poLine.Substring(2).Trim().Trim('"')); + return Unescape(TrimQuote(poLine.Substring(2).Trim())); } private static string ParseContext(string poLine) { - return Unescape(poLine.Substring(7).Trim().Trim('"')); + return Unescape(TrimQuote(poLine.Substring(7).Trim())); } class CultureDictionary {