Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Time format less resources #1184

Closed
wants to merge 3 commits into from
Closed

Time format less resources #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df2f866
follow naming rules
neilboyd Feb 24, 2022
3d00cf2
WIP separate the tense part out of the resource
neilboyd Feb 25, 2022
9464f47
spanish resources
neilboyd Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Humanizer.Tests/ApiApprover/PublicApiApprovalTest.approve_public_api.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,9 @@ namespace Humanizer.Localisation
{
public const string Never = "DateHumanize_Never";
public const string Now = "DateHumanize_Now";
public const string SingleDay = "DateHumanize_SingleDay";
public const string SingleDayAgo = "DateHumanize_SingleDayAgo";
public const string SingleDayFromNow = "DateHumanize_SingleDayFromNow";
public static string GetResourceKey(Humanizer.Localisation.TimeUnit timeUnit, Humanizer.Localisation.Tense timeUnitTense, int count = 1) { }
}
public class static TimeSpanHumanize
Expand Down
14 changes: 7 additions & 7 deletions src/Humanizer/HeadingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public enum HeadingStyle
/// </summary>
public static class HeadingExtensions
{
internal static readonly string[] headings = { "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW" };
internal static readonly char[] headingArrows = { '↑', '↗', '→', '↘', '↓', '↙', '←', '↖' };
internal static readonly string[] Headings = { "N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW" };
internal static readonly char[] HeadingArrows = { '↑', '↗', '→', '↘', '↓', '↙', '←', '↖' };

// https://stackoverflow.com/a/7490772/1720761
/// <summary>
Expand All @@ -44,7 +44,7 @@ public static string ToHeading(this double heading, HeadingStyle style = Heading
{
var val = (int)((heading / 22.5) + .5);

var result = headings[val % 16];
var result = Headings[val % 16];

if (style == HeadingStyle.Abbreviated)
{
Expand All @@ -65,7 +65,7 @@ public static char ToHeadingArrow(this double heading)
{
var val = (int)((heading / 45) + .5);

return headingArrows[val % 8];
return HeadingArrows[val % 8];
}

/// <summary>
Expand Down Expand Up @@ -94,9 +94,9 @@ public static double FromAbbreviatedHeading(this string heading, CultureInfo cul
culture ??= CultureInfo.CurrentCulture;

var upperCaseHeading = culture.TextInfo.ToUpper(heading);
for (var index = 0; index < headings.Length; ++index)
for (var index = 0; index < Headings.Length; ++index)
{
var localizedShortHeading = Resources.GetResource($"{headings[index]}_Short", culture);
var localizedShortHeading = Resources.GetResource($"{Headings[index]}_Short", culture);
if (culture.CompareInfo.Compare(upperCaseHeading, localizedShortHeading) == 0)
{
return (index * 22.5);
Expand All @@ -111,7 +111,7 @@ public static double FromAbbreviatedHeading(this string heading, CultureInfo cul
/// </summary>
public static double FromHeadingArrow(this char heading)
{
var index = Array.IndexOf(headingArrows, heading);
var index = Array.IndexOf(HeadingArrows, heading);

if (index == -1)
{
Expand Down
13 changes: 12 additions & 1 deletion src/Humanizer/Localisation/Formatters/DefaultFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,18 @@ public virtual string TimeUnitHumanize(TimeUnit timeUnit)
private string GetResourceForDate(TimeUnit unit, Tense timeUnitTense, int count)
{
var resourceKey = ResourceKeys.DateHumanize.GetResourceKey(unit, timeUnitTense: timeUnitTense, count: count);
return count == 1 ? Format(resourceKey) : Format(resourceKey, count);
if (resourceKey == ResourceKeys.DateHumanize.SingleDay)
{
return Format(timeUnitTense == Tense.Future ? ResourceKeys.DateHumanize.SingleDayFromNow : ResourceKeys.DateHumanize.SingleDayAgo);
}
var unitValue = count == 1 ? Format(resourceKey) : Format(resourceKey, count);
if (resourceKey == ResourceKeys.DateHumanize.Now)
{
return unitValue;
}
var tenseKey = timeUnitTense == Tense.Future ? "DateHumanize_FromNow" : "DateHumanize_Ago";
var tenseValue = Format(tenseKey);
return tenseValue.FormatWith(unitValue);
}

private string GetResourceForTimeSpan(TimeUnit unit, int count, bool toWords = false)
Expand Down
29 changes: 21 additions & 8 deletions src/Humanizer/Localisation/ResourceKeys.DateHumanize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,43 @@ public static class DateHumanize
/// </summary>
public const string Now = "DateHumanize_Now";

/// <summary>
/// Resource key for SingleDay.
/// </summary>
public const string SingleDay = "DateHumanize_SingleDay";

/// <summary>
/// Resource key for SingleDayAgo.
/// </summary>
public const string SingleDayAgo = "DateHumanize_SingleDayAgo";

/// <summary>
/// Resource key for SingleDayFromNow.
/// </summary>
public const string SingleDayFromNow = "DateHumanize_SingleDayFromNow";

/// <summary>
/// Resource key for Never.
/// </summary>
public const string Never = "DateHumanize_Never";

/// <summary>
/// Examples: DateHumanize_SingleMinuteAgo, DateHumanize_MultipleHoursAgo
/// Examples: DateHumanize_SingleMinute, DateHumanize_MultipleHours
/// Note: "s" for plural served separately by third part.
/// </summary>
private const string DateTimeFormat = "DateHumanize_{0}{1}{2}";

private const string Ago = "Ago";
private const string FromNow = "FromNow";
private const string DateTimeFormat = "DateHumanize_{0}{1}";

/// <summary>
/// Generates Resource Keys accordning to convention.
/// Generates Resource Keys according to convention.
/// </summary>
/// <param name="timeUnit">Time unit</param>
/// <param name="timeUnitTense">Is time unit in future or past</param>
/// <param name="count">Number of units, default is One.</param>
/// <returns>Resource key, like DateHumanize_SingleMinuteAgo</returns>
public static string GetResourceKey(TimeUnit timeUnit, Tense timeUnitTense, int count = 1)
{
// TODO remove timeUnitTense parameter

ValidateRange(count);

if (count == 0)
Expand All @@ -43,9 +57,8 @@ public static string GetResourceKey(TimeUnit timeUnit, Tense timeUnitTense, int
}

var singularity = count == 1 ? Single : Multiple;
var tense = timeUnitTense == Tense.Future ? FromNow : Ago;
var unit = timeUnit.ToString().ToQuantity(count, ShowQuantityAs.None);
return DateTimeFormat.FormatWith(singularity, unit, tense);
return DateTimeFormat.FormatWith(singularity, unit);
}
}
}
Expand Down
81 changes: 27 additions & 54 deletions src/Humanizer/Properties/Resources.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,41 +117,44 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
<value>hace un segundo</value>
<data name="DateHumanize_Ago" xml:space="preserve">
<value>hace {0}</value>
</data>
<data name="DateHumanize_MultipleSecondsAgo" xml:space="preserve">
<value>hace {0} segundos</value>
<data name="DateHumanize_SingleSecond" xml:space="preserve">
<value>un segundo</value>
</data>
<data name="DateHumanize_SingleMinuteAgo" xml:space="preserve">
<value>hace un minuto</value>
<data name="DateHumanize_MultipleSeconds" xml:space="preserve">
<value>{0} segundos</value>
</data>
<data name="DateHumanize_MultipleMinutesAgo" xml:space="preserve">
<value>hace {0} minutos</value>
<data name="DateHumanize_SingleMinute" xml:space="preserve">
<value>un minuto</value>
</data>
<data name="DateHumanize_SingleHourAgo" xml:space="preserve">
<value>hace una hora</value>
<data name="DateHumanize_MultipleMinutes" xml:space="preserve">
<value>{0} minutos</value>
</data>
<data name="DateHumanize_MultipleHoursAgo" xml:space="preserve">
<value>hace {0} horas</value>
<data name="DateHumanize_SingleHour" xml:space="preserve">
<value>una hora</value>
</data>
<data name="DateHumanize_MultipleHours" xml:space="preserve">
<value>{0} horas</value>
</data>
<data name="DateHumanize_SingleDayAgo" xml:space="preserve">
<value>ayer</value>
</data>
<data name="DateHumanize_MultipleDaysAgo" xml:space="preserve">
<value>hace {0} días</value>
<data name="DateHumanize_MultipleDays" xml:space="preserve">
<value>{0} días</value>
</data>
<data name="DateHumanize_SingleMonthAgo" xml:space="preserve">
<value>hace un mes</value>
<data name="DateHumanize_SingleMonth" xml:space="preserve">
<value>un mes</value>
</data>
<data name="DateHumanize_MultipleMonthsAgo" xml:space="preserve">
<value>hace {0} meses</value>
<data name="DateHumanize_MultipleMonths" xml:space="preserve">
<value>{0} meses</value>
</data>
<data name="DateHumanize_SingleYearAgo" xml:space="preserve">
<value>hace un año</value>
<data name="DateHumanize_SingleYear" xml:space="preserve">
<value>un año</value>
</data>
<data name="DateHumanize_MultipleYearsAgo" xml:space="preserve">
<value>hace {0} años</value>
<data name="DateHumanize_MultipleYears" xml:space="preserve">
<value>{0} años</value>
</data>
<data name="TimeSpanHumanize_MultipleDays" xml:space="preserve">
<value>{0} días</value>
Expand Down Expand Up @@ -192,42 +195,12 @@
<data name="TimeSpanHumanize_Zero" xml:space="preserve">
<value>nada</value>
</data>
<data name="DateHumanize_MultipleDaysFromNow" xml:space="preserve">
<value>en {0} días</value>
</data>
<data name="DateHumanize_MultipleHoursFromNow" xml:space="preserve">
<value>en {0} horas</value>
</data>
<data name="DateHumanize_MultipleMinutesFromNow" xml:space="preserve">
<value>en {0} minutos</value>
</data>
<data name="DateHumanize_MultipleMonthsFromNow" xml:space="preserve">
<value>en {0} meses</value>
</data>
<data name="DateHumanize_MultipleSecondsFromNow" xml:space="preserve">
<value>en {0} segundos</value>
</data>
<data name="DateHumanize_MultipleYearsFromNow" xml:space="preserve">
<value>en {0} años</value>
<data name="DateHumanize_FromNow" xml:space="preserve">
<value>en {0}</value>
</data>
<data name="DateHumanize_SingleDayFromNow" xml:space="preserve">
<value>mañana</value>
</data>
<data name="DateHumanize_SingleHourFromNow" xml:space="preserve">
<value>en una hora</value>
</data>
<data name="DateHumanize_SingleMinuteFromNow" xml:space="preserve">
<value>en un minuto</value>
</data>
<data name="DateHumanize_SingleMonthFromNow" xml:space="preserve">
<value>en un mes</value>
</data>
<data name="DateHumanize_SingleSecondFromNow" xml:space="preserve">
<value>en un segundo</value>
</data>
<data name="DateHumanize_SingleYearFromNow" xml:space="preserve">
<value>en un año</value>
</data>
<data name="DateHumanize_Now" xml:space="preserve">
<value>ahora</value>
</data>
Expand Down
79 changes: 26 additions & 53 deletions src/Humanizer/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,41 +117,38 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="DateHumanize_SingleSecondAgo" xml:space="preserve">
<value>one second ago</value>
<data name="DateHumanize_Ago" xml:space="preserve">
<value>{0} ago</value>
</data>
<data name="DateHumanize_MultipleSecondsAgo" xml:space="preserve">
<value>{0} seconds ago</value>
</data>
<data name="DateHumanize_SingleMinuteAgo" xml:space="preserve">
<value>a minute ago</value>
<data name="DateHumanize_SingleSecond" xml:space="preserve">
<value>one second</value>
</data>
<data name="DateHumanize_MultipleMinutesAgo" xml:space="preserve">
<value>{0} minutes ago</value>
<data name="DateHumanize_MultipleSeconds" xml:space="preserve">
<value>{0} seconds</value>
</data>
<data name="DateHumanize_SingleHourAgo" xml:space="preserve">
<value>an hour ago</value>
<data name="DateHumanize_SingleHour" xml:space="preserve">
<value>an hour</value>
</data>
<data name="DateHumanize_MultipleHoursAgo" xml:space="preserve">
<value>{0} hours ago</value>
<data name="DateHumanize_MultipleHours" xml:space="preserve">
<value>{0} hours</value>
</data>
<data name="DateHumanize_SingleDayAgo" xml:space="preserve">
<value>yesterday</value>
</data>
<data name="DateHumanize_MultipleDaysAgo" xml:space="preserve">
<value>{0} days ago</value>
<data name="DateHumanize_MultipleDays" xml:space="preserve">
<value>{0} days</value>
</data>
<data name="DateHumanize_SingleMonthAgo" xml:space="preserve">
<value>one month ago</value>
<data name="DateHumanize_SingleMonth" xml:space="preserve">
<value>one month</value>
</data>
<data name="DateHumanize_MultipleMonthsAgo" xml:space="preserve">
<value>{0} months ago</value>
<data name="DateHumanize_MultipleMonths" xml:space="preserve">
<value>{0} months</value>
</data>
<data name="DateHumanize_SingleYearAgo" xml:space="preserve">
<value>one year ago</value>
<data name="DateHumanize_SingleYear" xml:space="preserve">
<value>one year</value>
</data>
<data name="DateHumanize_MultipleYearsAgo" xml:space="preserve">
<value>{0} years ago</value>
<data name="DateHumanize_MultipleYears" xml:space="preserve">
<value>{0} years</value>
</data>
<data name="TimeSpanHumanize_MultipleDays" xml:space="preserve">
<value>{0} days</value>
Expand Down Expand Up @@ -192,44 +189,20 @@
<data name="TimeSpanHumanize_SingleWeek" xml:space="preserve">
<value>1 week</value>
</data>
<data name="DateHumanize_MultipleDaysFromNow" xml:space="preserve">
<value>{0} days from now</value>
</data>
<data name="DateHumanize_MultipleHoursFromNow" xml:space="preserve">
<value>{0} hours from now</value>
</data>
<data name="DateHumanize_MultipleMinutesFromNow" xml:space="preserve">
<value>{0} minutes from now</value>
</data>
<data name="DateHumanize_MultipleMonthsFromNow" xml:space="preserve">
<value>{0} months from now</value>
<data name="DateHumanize_FromNow" xml:space="preserve">
<value>{0} from now</value>
</data>
<data name="DateHumanize_MultipleSecondsFromNow" xml:space="preserve">
<value>{0} seconds from now</value>
</data>
<data name="DateHumanize_MultipleYearsFromNow" xml:space="preserve">
<value>{0} years from now</value>
<data name="DateHumanize_MultipleMinutes" xml:space="preserve">
<value>{0} minutes</value>
</data>
<data name="DateHumanize_Now" xml:space="preserve">
<value>now</value>
</data>
<data name="DateHumanize_SingleDayFromNow" xml:space="preserve">
<value>tomorrow</value>
</data>
<data name="DateHumanize_SingleHourFromNow" xml:space="preserve">
<value>an hour from now</value>
</data>
<data name="DateHumanize_SingleMinuteFromNow" xml:space="preserve">
<value>a minute from now</value>
</data>
<data name="DateHumanize_SingleMonthFromNow" xml:space="preserve">
<value>one month from now</value>
</data>
<data name="DateHumanize_SingleSecondFromNow" xml:space="preserve">
<value>one second from now</value>
</data>
<data name="DateHumanize_SingleYearFromNow" xml:space="preserve">
<value>one year from now</value>
<data name="DateHumanize_SingleMinute" xml:space="preserve">
<value>a minute</value>
</data>
<data name="DateHumanize_MultipleHoursFromNow_Dual" xml:space="preserve">
<value>{0} hours from now</value>
Expand Down
Loading