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 2 Packages Projects Releases Wiki Activity

#19010: Removing Html encoding when translating arguments

Browse Source 
Work Item: 19010

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-19 12:57:23 -07:00
parent 62023ea6aa
commit caab31f881
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard/Localization/Text.cs
+1 -9
View File
@@ -11,7 +11,6 @@ namespace Orchard.Localization {
private readonly IWorkContextAccessor _workContextAccessor; private readonly IWorkContextAccessor _workContextAccessor;
private readonly ILocalizedStringManager _localizedStringManager; private readonly ILocalizedStringManager _localizedStringManager;
public Text(string scope, IWorkContextAccessor workContextAccessor, ILocalizedStringManager localizedStringManager) { public Text(string scope, IWorkContextAccessor workContextAccessor, ILocalizedStringManager localizedStringManager) {
_scope = scope; _scope = scope;
_workContextAccessor = workContextAccessor; _workContextAccessor = workContextAccessor;
@@ -30,7 +29,7 @@ namespace Orchard.Localization {
return args.Length == 0 return args.Length == 0
? new LocalizedString(localizedFormat, _scope, textHint, args) ? new LocalizedString(localizedFormat, _scope, textHint, args)
: new LocalizedString(string.Format(GetFormatProvider(currentCulture), localizedFormat, args.Select(Encode).ToArray()), _scope, textHint, args); : new LocalizedString(string.Format(GetFormatProvider(currentCulture), localizedFormat, args), _scope, textHint, args);
} }
private static IFormatProvider GetFormatProvider(string currentCulture) { private static IFormatProvider GetFormatProvider(string currentCulture) {
@@ -41,12 +40,5 @@ namespace Orchard.Localization {
return null; return null;
} }
} }
static object Encode(object arg) {
if (arg is IFormattable || arg is IHtmlString) {
return arg;
}
return HttpUtility.HtmlEncode(arg);
}
} }
} }