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

Localization: Fixing that LocalizationDateTimeFormatProvider should be less sensitive to the formatting of the translated strings (#7738)

Browse Source
This commit is contained in:
Lombiq
2018-09-28 18:03:11 +02:00
committed by Benedek Farkas
parent e527272013
commit 3644d868ec
2 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
+13 -35
View File
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Orchard.Environment.Extensions;
using Orchard.Localization.Services;
using Orchard.Utility.Extensions;
namespace Orchard.Localization.Providers {
@@ -22,47 +23,24 @@ namespace Orchard.Localization.Providers {
public Localizer T { get; set; }
public string[] MonthNames {
get {
return T("January, February, March, April, May, June, July, August, September, October, November, December").Text.Split(new string[] {", "}, StringSplitOptions.RemoveEmptyEntries);
}
}
public string[] MonthNames =>
T("January, February, March, April, May, June, July, August, September, October, November, December").Text.StrictlySplit();
public virtual string[] MonthNamesGenitive {
get {
return MonthNames;
}
}
public virtual string[] MonthNamesGenitive => MonthNames;
public string[] MonthNamesShort {
get {
return T("Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec").Text.Split(new string[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
}
}
public string[] MonthNamesShort =>
T("Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec").Text.StrictlySplit();
public virtual string[] MonthNamesShortGenitive {
get {
return MonthNamesShort;
}
}
public virtual string[] MonthNamesShortGenitive => MonthNamesShort;
public string[] DayNames {
get {
return T("Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday").Text.Split(new string[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
}
}
public string[] DayNames =>
T("Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday").Text.StrictlySplit();
public string[] DayNamesShort {
get {
return T("Sun, Mon, Tue, Wed, Thu, Fri, Sat").Text.Split(new string[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
}
}
public string[] DayNamesShort =>
T("Sun, Mon, Tue, Wed, Thu, Fri, Sat").Text.StrictlySplit();
public string[] DayNamesMin {
get {
return T("Su, Mo, Tu, We, Th, Fr, Sa").Text.Split(new string[] { ", " }, StringSplitOptions.RemoveEmptyEntries);
}
}
public string[] DayNamesMin =>
T("Su, Mo, Tu, We, Th, Fr, Sa").Text.StrictlySplit();
public string ShortDateFormat {
get {
src/Orchard/Utility/Extensions/StringExtensions.cs
+9
View File
@@ -367,5 +367,14 @@ namespace Orchard.Utility.Extensions {
public static string FromBase64(this string value) {
return Encoding.UTF8.GetString(Convert.FromBase64String(value));
}
/// <summary>
/// A strict string split operation that removes empty entries and trims the remaining values.
/// </summary>
public static string[] StrictlySplit(this string text, params char[] separators) {
if (!separators.Any()) separators = new char[] { ',' };
return text.Split(separators, StringSplitOptions.RemoveEmptyEntries).Select(value => value.Trim()).ToArray();
}
}
}