From a7e3e99be09bab9f921043ce3992f7de4e0db1a6 Mon Sep 17 00:00:00 2001 From: Anthony Jackson Date: Tue, 25 Apr 2023 14:48:48 -0400 Subject: [PATCH 1/3] fixes #1186 replacing 'now' with 'today' for all day or longer time periods --- readme.md | 2 +- .../DateHumanizeDefaultStrategyTests.cs | 22 ++--- .../DateOnlyHumanizeTests.cs | 2 +- .../DateTimeHumanizePrecisionStrategyTests.cs | 38 ++++----- src/Humanizer/FluentDate/In.SomeTimeFrom.cs | 80 +++++++++---------- src/Humanizer/FluentDate/In.SomeTimeFrom.tt | 8 +- .../FluentDate/InDate.SomeTimeFrom.cs | 80 +++++++++---------- .../FluentDate/InDate.SomeTimeFrom.tt | 8 +- src/Humanizer/Properties/Resources.resx | 38 ++++----- 9 files changed, 139 insertions(+), 139 deletions(-) diff --git a/readme.md b/readme.md index a2921e440..c6d0ddcc6 100644 --- a/readme.md +++ b/readme.md @@ -355,7 +355,7 @@ The default precision is set to .75 but you can pass your desired precision too. 104 seconds => one minute ago/from now 105 seconds => two minutes ago/from now -25 days => a month ago/from now +25 days => a month ago/from today ``` **No dehumanization for dates as `Humanize` is a lossy transformation and the human friendly date is not reversible** diff --git a/src/Humanizer.Tests.Shared/DateHumanizeDefaultStrategyTests.cs b/src/Humanizer.Tests.Shared/DateHumanizeDefaultStrategyTests.cs index 9e850640e..c95ea521b 100644 --- a/src/Humanizer.Tests.Shared/DateHumanizeDefaultStrategyTests.cs +++ b/src/Humanizer.Tests.Shared/DateHumanizeDefaultStrategyTests.cs @@ -76,7 +76,7 @@ public void HoursFromNow(int hours, string expected) [Theory] [InlineData(38, "tomorrow")] - [InlineData(40, "2 days from now")] + [InlineData(40, "2 days from today")] public void HoursFromNowNotTomorrow(int hours, string expected) { //Only test with injected date, as results are dependent on time of day @@ -98,9 +98,9 @@ public void DaysAgo(int days, string expected) [Theory] [InlineData(1, "tomorrow")] - [InlineData(10, "10 days from now")] - [InlineData(27, "27 days from now")] - [InlineData(32, "one month from now")] + [InlineData(10, "10 days from today")] + [InlineData(27, "27 days from today")] + [InlineData(32, "one month from today")] public void DaysFromNow(int days, string expected) { DateHumanize.Verify(expected, days, TimeUnit.Day, Tense.Future); @@ -117,10 +117,10 @@ public void MonthsAgo(int months, string expected) } [Theory] - [InlineData(1, "one month from now")] - [InlineData(10, "10 months from now")] - [InlineData(11, "11 months from now")] - [InlineData(12, "one year from now")] + [InlineData(1, "one month from today")] + [InlineData(10, "10 months from today")] + [InlineData(11, "11 months from today")] + [InlineData(12, "one year from today")] public void MonthsFromNow(int months, string expected) { DateHumanize.Verify(expected, months, TimeUnit.Month, Tense.Future); @@ -135,8 +135,8 @@ public void YearsAgo(int years, string expected) } [Theory] - [InlineData(1, "one year from now")] - [InlineData(2, "2 years from now")] + [InlineData(1, "one year from today")] + [InlineData(2, "2 years from today")] public void YearsFromNow(int years, string expected) { DateHumanize.Verify(expected, years, TimeUnit.Year, Tense.Future); @@ -164,7 +164,7 @@ public void Nullable_ExpectSame() } [Theory] - [InlineData(1, TimeUnit.Year, Tense.Future, "en-US", "one year from now")] + [InlineData(1, TimeUnit.Year, Tense.Future, "en-US", "one year from today")] [InlineData(40, TimeUnit.Second, Tense.Past, "ru-RU", "40 секунд назад")] [InlineData(2, TimeUnit.Day, Tense.Past, "sv-SE", "för 2 dagar sedan")] public void CanSpecifyCultureExplicitly(int unit, TimeUnit timeUnit, Tense tense, string culture, string expected) diff --git a/src/Humanizer.Tests.Shared/DateOnlyHumanizeTests.cs b/src/Humanizer.Tests.Shared/DateOnlyHumanizeTests.cs index bb9c0771f..111bb23ee 100644 --- a/src/Humanizer.Tests.Shared/DateOnlyHumanizeTests.cs +++ b/src/Humanizer.Tests.Shared/DateOnlyHumanizeTests.cs @@ -33,7 +33,7 @@ public void DefaultStrategy_MonthApart() var inputTime = new DateOnly(2015, 08, 05); var baseTime = new DateOnly(2015, 07, 05); - const string expectedResult = "one month from now"; + const string expectedResult = "one month from today"; var actualResult = inputTime.Humanize(baseTime); Assert.Equal(expectedResult, actualResult); diff --git a/src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs b/src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs index c0e4ea1b7..d6f5dda83 100644 --- a/src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs +++ b/src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs @@ -110,9 +110,9 @@ public void HoursAgo(int hours, string expected) [InlineData(18, "tomorrow")] [InlineData(24, "tomorrow")] [InlineData(41, "tomorrow")] - [InlineData(42, "2 days from now")] - [InlineData(48, "2 days from now")] - [InlineData(60, "2 days from now")] + [InlineData(42, "2 days from today")] + [InlineData(48, "2 days from today")] + [InlineData(60, "2 days from today")] public void HoursFromNow(int hours, string expected) { DateHumanize.Verify(expected, hours, TimeUnit.Hour, Tense.Future, DefaultPrecision); @@ -134,13 +134,13 @@ public void DaysAgo(int days, string expected) [Theory] [InlineData(1, "tomorrow")] - [InlineData(10, "10 days from now")] - [InlineData(20, "20 days from now")] - [InlineData(22, "22 days from now")] - [InlineData(23, "one month from now")] - [InlineData(31, "one month from now")] - [InlineData(43, "one month from now")] - [InlineData(53, "2 months from now")] + [InlineData(10, "10 days from today")] + [InlineData(20, "20 days from today")] + [InlineData(22, "22 days from today")] + [InlineData(23, "one month from today")] + [InlineData(31, "one month from today")] + [InlineData(43, "one month from today")] + [InlineData(53, "2 months from today")] public void DaysFromNow(int days, string expected) { DateHumanize.Verify(expected, days, TimeUnit.Day, Tense.Future, DefaultPrecision); @@ -160,13 +160,13 @@ public void MonthsAgo(int months, string expected) } [Theory] - [InlineData(1, "one month from now")] - [InlineData(8, "8 months from now")] - [InlineData(9, "one year from now")] - [InlineData(12, "one year from now")] - [InlineData(19, "one year from now")] - [InlineData(21, "2 years from now")] - [InlineData(24, "2 years from now")] + [InlineData(1, "one month from today")] + [InlineData(8, "8 months from today")] + [InlineData(9, "one year from today")] + [InlineData(12, "one year from today")] + [InlineData(19, "one year from today")] + [InlineData(21, "2 years from today")] + [InlineData(24, "2 years from today")] public void MonthsFromNow(int months, string expected) { DateHumanize.Verify(expected, months, TimeUnit.Month, Tense.Future, DefaultPrecision); @@ -181,8 +181,8 @@ public void YearsAgo(int years, string expected) } [Theory] - [InlineData(1, "one year from now")] - [InlineData(2, "2 years from now")] + [InlineData(1, "one year from today")] + [InlineData(2, "2 years from today")] public void YearsFromNow(int years, string expected) { DateHumanize.Verify(expected, years, TimeUnit.Year, Tense.Future, DefaultPrecision); diff --git a/src/Humanizer/FluentDate/In.SomeTimeFrom.cs b/src/Humanizer/FluentDate/In.SomeTimeFrom.cs index cac1da132..778ae4803 100644 --- a/src/Humanizer/FluentDate/In.SomeTimeFrom.cs +++ b/src/Humanizer/FluentDate/In.SomeTimeFrom.cs @@ -61,7 +61,7 @@ public static DateTime HourFrom(DateTime date) } /// - /// 1 days from now + /// 1 days from today /// public static DateTime Day { @@ -77,7 +77,7 @@ public static DateTime DayFrom(DateTime date) } /// - /// 1 weeks from now + /// 1 weeks from today /// public static DateTime Week { @@ -93,7 +93,7 @@ public static DateTime WeekFrom(DateTime date) } /// - /// 1 months from now + /// 1 months from today /// public static DateTime Month { @@ -109,7 +109,7 @@ public static DateTime MonthFrom(DateTime date) } /// - /// 1 years from now + /// 1 years from today /// public static DateTime Year { @@ -178,7 +178,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 2 days from now + /// 2 days from today /// public static DateTime Days { @@ -194,7 +194,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 2 weeks from now + /// 2 weeks from today /// public static DateTime Weeks { @@ -210,7 +210,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 2 months from now + /// 2 months from today /// public static DateTime Months { @@ -226,7 +226,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 2 years from now + /// 2 years from today /// public static DateTime Years { @@ -295,7 +295,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 3 days from now + /// 3 days from today /// public static DateTime Days { @@ -311,7 +311,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 3 weeks from now + /// 3 weeks from today /// public static DateTime Weeks { @@ -327,7 +327,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 3 months from now + /// 3 months from today /// public static DateTime Months { @@ -343,7 +343,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 3 years from now + /// 3 years from today /// public static DateTime Years { @@ -412,7 +412,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 4 days from now + /// 4 days from today /// public static DateTime Days { @@ -428,7 +428,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 4 weeks from now + /// 4 weeks from today /// public static DateTime Weeks { @@ -444,7 +444,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 4 months from now + /// 4 months from today /// public static DateTime Months { @@ -460,7 +460,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 4 years from now + /// 4 years from today /// public static DateTime Years { @@ -529,7 +529,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 5 days from now + /// 5 days from today /// public static DateTime Days { @@ -545,7 +545,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 5 weeks from now + /// 5 weeks from today /// public static DateTime Weeks { @@ -561,7 +561,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 5 months from now + /// 5 months from today /// public static DateTime Months { @@ -577,7 +577,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 5 years from now + /// 5 years from today /// public static DateTime Years { @@ -646,7 +646,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 6 days from now + /// 6 days from today /// public static DateTime Days { @@ -662,7 +662,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 6 weeks from now + /// 6 weeks from today /// public static DateTime Weeks { @@ -678,7 +678,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 6 months from now + /// 6 months from today /// public static DateTime Months { @@ -694,7 +694,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 6 years from now + /// 6 years from today /// public static DateTime Years { @@ -763,7 +763,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 7 days from now + /// 7 days from today /// public static DateTime Days { @@ -779,7 +779,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 7 weeks from now + /// 7 weeks from today /// public static DateTime Weeks { @@ -795,7 +795,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 7 months from now + /// 7 months from today /// public static DateTime Months { @@ -811,7 +811,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 7 years from now + /// 7 years from today /// public static DateTime Years { @@ -880,7 +880,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 8 days from now + /// 8 days from today /// public static DateTime Days { @@ -896,7 +896,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 8 weeks from now + /// 8 weeks from today /// public static DateTime Weeks { @@ -912,7 +912,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 8 months from now + /// 8 months from today /// public static DateTime Months { @@ -928,7 +928,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 8 years from now + /// 8 years from today /// public static DateTime Years { @@ -997,7 +997,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 9 days from now + /// 9 days from today /// public static DateTime Days { @@ -1013,7 +1013,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 9 weeks from now + /// 9 weeks from today /// public static DateTime Weeks { @@ -1029,7 +1029,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 9 months from now + /// 9 months from today /// public static DateTime Months { @@ -1045,7 +1045,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 9 years from now + /// 9 years from today /// public static DateTime Years { @@ -1114,7 +1114,7 @@ public static DateTime HoursFrom(DateTime date) } /// - /// 10 days from now + /// 10 days from today /// public static DateTime Days { @@ -1130,7 +1130,7 @@ public static DateTime DaysFrom(DateTime date) } /// - /// 10 weeks from now + /// 10 weeks from today /// public static DateTime Weeks { @@ -1146,7 +1146,7 @@ public static DateTime WeeksFrom(DateTime date) } /// - /// 10 months from now + /// 10 months from today /// public static DateTime Months { @@ -1162,7 +1162,7 @@ public static DateTime MonthsFrom(DateTime date) } /// - /// 10 years from now + /// 10 years from today /// public static DateTime Years { diff --git a/src/Humanizer/FluentDate/In.SomeTimeFrom.tt b/src/Humanizer/FluentDate/In.SomeTimeFrom.tt index dcc7305eb..3e7ae71dc 100644 --- a/src/Humanizer/FluentDate/In.SomeTimeFrom.tt +++ b/src/Humanizer/FluentDate/In.SomeTimeFrom.tt @@ -82,7 +82,7 @@ namespace Humanizer } /// - /// <#= i #> days from now + /// <#= i #> days from today /// public static DateTime <#= day #> { @@ -98,7 +98,7 @@ namespace Humanizer } /// - /// <#= i #> weeks from now + /// <#= i #> weeks from today /// public static DateTime <#= week #> { @@ -114,7 +114,7 @@ namespace Humanizer } /// - /// <#= i #> months from now + /// <#= i #> months from today /// public static DateTime <#= month #> { @@ -130,7 +130,7 @@ namespace Humanizer } /// - /// <#= i #> years from now + /// <#= i #> years from today /// public static DateTime <#= year #> { diff --git a/src/Humanizer/FluentDate/InDate.SomeTimeFrom.cs b/src/Humanizer/FluentDate/InDate.SomeTimeFrom.cs index 9a7a0fce3..f46303670 100644 --- a/src/Humanizer/FluentDate/InDate.SomeTimeFrom.cs +++ b/src/Humanizer/FluentDate/InDate.SomeTimeFrom.cs @@ -15,7 +15,7 @@ public partial class InDate public static class One { /// - /// 1 days from now + /// 1 days from today /// public static DateOnly Day { @@ -39,7 +39,7 @@ public static DateOnly DayFrom(DateTime date) } /// - /// 1 weeks from now + /// 1 weeks from today /// public static DateOnly Week { @@ -63,7 +63,7 @@ public static DateOnly WeekFrom(DateTime date) } /// - /// 1 months from now + /// 1 months from today /// public static DateOnly Month { @@ -87,7 +87,7 @@ public static DateOnly MonthFrom(DateTime date) } /// - /// 1 years from now + /// 1 years from today /// public static DateOnly Year { @@ -116,7 +116,7 @@ public static DateOnly YearFrom(DateTime date) public static class Two { /// - /// 2 days from now + /// 2 days from today /// public static DateOnly Days { @@ -140,7 +140,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 2 weeks from now + /// 2 weeks from today /// public static DateOnly Weeks { @@ -164,7 +164,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 2 months from now + /// 2 months from today /// public static DateOnly Months { @@ -188,7 +188,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 2 years from now + /// 2 years from today /// public static DateOnly Years { @@ -217,7 +217,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Three { /// - /// 3 days from now + /// 3 days from today /// public static DateOnly Days { @@ -241,7 +241,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 3 weeks from now + /// 3 weeks from today /// public static DateOnly Weeks { @@ -265,7 +265,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 3 months from now + /// 3 months from today /// public static DateOnly Months { @@ -289,7 +289,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 3 years from now + /// 3 years from today /// public static DateOnly Years { @@ -318,7 +318,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Four { /// - /// 4 days from now + /// 4 days from today /// public static DateOnly Days { @@ -342,7 +342,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 4 weeks from now + /// 4 weeks from today /// public static DateOnly Weeks { @@ -366,7 +366,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 4 months from now + /// 4 months from today /// public static DateOnly Months { @@ -390,7 +390,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 4 years from now + /// 4 years from today /// public static DateOnly Years { @@ -419,7 +419,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Five { /// - /// 5 days from now + /// 5 days from today /// public static DateOnly Days { @@ -443,7 +443,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 5 weeks from now + /// 5 weeks from today /// public static DateOnly Weeks { @@ -467,7 +467,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 5 months from now + /// 5 months from today /// public static DateOnly Months { @@ -491,7 +491,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 5 years from now + /// 5 years from today /// public static DateOnly Years { @@ -520,7 +520,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Six { /// - /// 6 days from now + /// 6 days from today /// public static DateOnly Days { @@ -544,7 +544,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 6 weeks from now + /// 6 weeks from today /// public static DateOnly Weeks { @@ -568,7 +568,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 6 months from now + /// 6 months from today /// public static DateOnly Months { @@ -592,7 +592,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 6 years from now + /// 6 years from today /// public static DateOnly Years { @@ -621,7 +621,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Seven { /// - /// 7 days from now + /// 7 days from today /// public static DateOnly Days { @@ -645,7 +645,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 7 weeks from now + /// 7 weeks from today /// public static DateOnly Weeks { @@ -669,7 +669,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 7 months from now + /// 7 months from today /// public static DateOnly Months { @@ -693,7 +693,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 7 years from now + /// 7 years from today /// public static DateOnly Years { @@ -722,7 +722,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Eight { /// - /// 8 days from now + /// 8 days from today /// public static DateOnly Days { @@ -746,7 +746,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 8 weeks from now + /// 8 weeks from today /// public static DateOnly Weeks { @@ -770,7 +770,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 8 months from now + /// 8 months from today /// public static DateOnly Months { @@ -794,7 +794,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 8 years from now + /// 8 years from today /// public static DateOnly Years { @@ -823,7 +823,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Nine { /// - /// 9 days from now + /// 9 days from today /// public static DateOnly Days { @@ -847,7 +847,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 9 weeks from now + /// 9 weeks from today /// public static DateOnly Weeks { @@ -871,7 +871,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 9 months from now + /// 9 months from today /// public static DateOnly Months { @@ -895,7 +895,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 9 years from now + /// 9 years from today /// public static DateOnly Years { @@ -924,7 +924,7 @@ public static DateOnly YearsFrom(DateTime date) public static class Ten { /// - /// 10 days from now + /// 10 days from today /// public static DateOnly Days { @@ -948,7 +948,7 @@ public static DateOnly DaysFrom(DateTime date) } /// - /// 10 weeks from now + /// 10 weeks from today /// public static DateOnly Weeks { @@ -972,7 +972,7 @@ public static DateOnly WeeksFrom(DateTime date) } /// - /// 10 months from now + /// 10 months from today /// public static DateOnly Months { @@ -996,7 +996,7 @@ public static DateOnly MonthsFrom(DateTime date) } /// - /// 10 years from now + /// 10 years from today /// public static DateOnly Years { diff --git a/src/Humanizer/FluentDate/InDate.SomeTimeFrom.tt b/src/Humanizer/FluentDate/InDate.SomeTimeFrom.tt index 0c8096ff3..bcde2ab50 100644 --- a/src/Humanizer/FluentDate/InDate.SomeTimeFrom.tt +++ b/src/Humanizer/FluentDate/InDate.SomeTimeFrom.tt @@ -34,7 +34,7 @@ namespace Humanizer public static class <#= i.ToWords().Dehumanize() #> { /// - /// <#= i #> days from now + /// <#= i #> days from today /// public static DateOnly <#= day #> { @@ -58,7 +58,7 @@ namespace Humanizer } /// - /// <#= i #> weeks from now + /// <#= i #> weeks from today /// public static DateOnly <#= week #> { @@ -82,7 +82,7 @@ namespace Humanizer } /// - /// <#= i #> months from now + /// <#= i #> months from today /// public static DateOnly <#= month #> { @@ -106,7 +106,7 @@ namespace Humanizer } /// - /// <#= i #> years from now + /// <#= i #> years from today /// public static DateOnly <#= year #> { diff --git a/src/Humanizer/Properties/Resources.resx b/src/Humanizer/Properties/Resources.resx index d1c7050c4..98546814a 100644 --- a/src/Humanizer/Properties/Resources.resx +++ b/src/Humanizer/Properties/Resources.resx @@ -193,7 +193,7 @@ 1 week - {0} days from now + {0} days from today {0} hours from now @@ -202,13 +202,13 @@ {0} minutes from now - {0} months from now + {0} months from today {0} seconds from now - {0} years from now + {0} years from today now @@ -223,13 +223,13 @@ a minute from now - one month from now + one month from today one second from now - one year from now + one year from today {0} hours from now @@ -244,7 +244,7 @@ {0} seconds from now - {0} years from now + {0} years from today {0} days @@ -286,16 +286,16 @@ {0} days ago - {0} days from now + {0} days from today - {0} days from now + {0} days from today - {0} day from now + {0} day from today - {0} days from now + {0} days from today {0} hours ago @@ -358,16 +358,16 @@ {0} months ago - {0} months from now + {0} months from today - {0} months from now + {0} months from today - {0} month from now + {0} month from today - {0} months from now + {0} months from today {0} seconds ago @@ -406,13 +406,13 @@ {0} years ago - {0} years from now + {0} years from today - {0} year from now + {0} year from today - {0} years from now + {0} years from today {0} day @@ -490,7 +490,7 @@ {0} months ago - {0} months from now + {0} months from today {0} seconds ago @@ -502,7 +502,7 @@ {0} years from ago - {0} years from now + {0} years from today {0} hours From 2e50589daaa2e947ecb3a07e1d835bc46cefcacb Mon Sep 17 00:00:00 2001 From: Anthony Jackson Date: Tue, 25 Apr 2023 15:17:57 -0400 Subject: [PATCH 2/3] fixes for #1186 for other languages --- src/Humanizer/Properties/Resources.ar.resx | 7 ++++--- src/Humanizer/Properties/Resources.he.resx | 4 ++-- src/Humanizer/Properties/Resources.id.resx | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/Humanizer/Properties/Resources.ar.resx b/src/Humanizer/Properties/Resources.ar.resx index ce2935ba0..5e0e4c989 100644 --- a/src/Humanizer/Properties/Resources.ar.resx +++ b/src/Humanizer/Properties/Resources.ar.resx @@ -314,15 +314,16 @@ {0} years ago - في غضون {0} يوم من الآن + في غضون {0} يوم من اليوم + Within {0} days from today في غضون يومين من الآن in 2 days - في غضون {0} أيام من الآن - {0} days from now + في غضون {0} يوم من اليوم + Within {0} days from today في غضون {0} ساعة من الآن diff --git a/src/Humanizer/Properties/Resources.he.resx b/src/Humanizer/Properties/Resources.he.resx index 1c9720fb7..d9fcd5acf 100644 --- a/src/Humanizer/Properties/Resources.he.resx +++ b/src/Humanizer/Properties/Resources.he.resx @@ -315,7 +315,7 @@ בעוד {0} יום - {0} days from now + in {0} days בעוד יומיים @@ -323,7 +323,7 @@ בעוד {0} ימים - {0} days from now + in {0} days בעוד {0} שעות diff --git a/src/Humanizer/Properties/Resources.id.resx b/src/Humanizer/Properties/Resources.id.resx index 88711e17c..ad9b6c459 100644 --- a/src/Humanizer/Properties/Resources.id.resx +++ b/src/Humanizer/Properties/Resources.id.resx @@ -218,8 +218,8 @@ 1 week - {0} hari dari sekarang - {0} days from now + {0} hari dari hari ini + {0} days from today {0} jam dari sekarang @@ -230,16 +230,16 @@ {0} minutes from now - {0} bulan dari sekarang - {0} months from now + {0} bulan dari hari ini + {0} months from today {0} detik dari sekarang {0} seconds from now - {0} tahun dari sekarang - {0} years from now + {0} tahun dari hari ini + {0} years from today sekarang @@ -258,16 +258,16 @@ a minute from now - sebulan dari sekarang - one month from now + sebulan dari hari ini + one month from today sedetik dari sekarang one second from now - setahun dari sekarang - one year from now + setahun dari hari ini + one year from today {0} bulan From b38ca6addd616d6bd66084b377dd7c1d91d1eb55 Mon Sep 17 00:00:00 2001 From: Anthony Jackson Date: Wed, 7 Jun 2023 13:51:18 -0400 Subject: [PATCH 3/3] Humanizr#1186 fixed failing unit tests --- .../Localisation/ar/DateHumanizeTests.cs | 2 +- .../Localisation/id/DateHumanizeTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Humanizer.Tests.Shared/Localisation/ar/DateHumanizeTests.cs b/src/Humanizer.Tests.Shared/Localisation/ar/DateHumanizeTests.cs index d38398cc5..4a939aacd 100644 --- a/src/Humanizer.Tests.Shared/Localisation/ar/DateHumanizeTests.cs +++ b/src/Humanizer.Tests.Shared/Localisation/ar/DateHumanizeTests.cs @@ -19,7 +19,7 @@ public void DaysAgo(int days, string expected) [Theory] [InlineData(1, "في غضون يوم واحد من الآن")] [InlineData(2, "في غضون يومين من الآن")] - [InlineData(10, "في غضون 10 أيام من الآن")] + [InlineData(10,"في غضون 10 يوم من اليوم")] [InlineData(17, "في غضون 17 يوم من الآن")] public void DaysFromNow(int days, string expected) { diff --git a/src/Humanizer.Tests.Shared/Localisation/id/DateHumanizeTests.cs b/src/Humanizer.Tests.Shared/Localisation/id/DateHumanizeTests.cs index 07c04e6e0..c6131c7c3 100644 --- a/src/Humanizer.Tests.Shared/Localisation/id/DateHumanizeTests.cs +++ b/src/Humanizer.Tests.Shared/Localisation/id/DateHumanizeTests.cs @@ -66,7 +66,7 @@ public void DaysAgo(int days, string expected) [Theory] [InlineData(1, "besok")] - [InlineData(10, "10 hari dari sekarang")] + [InlineData(10, "10 hari dari hari ini")] public void DaysFromNow(int days, string expected) { DateHumanize.Verify(expected, days, TimeUnit.Day, Tense.Future); @@ -82,7 +82,7 @@ public void MonthsAgo(int months, string expected) [Theory] [InlineData(1, "sebulan dari sekarang")] - [InlineData(10, "10 bulan dari sekarang")] + [InlineData(10, "10 bulan dari hari ini")] public void MonthsFromNow(int months, string expected) { DateHumanize.Verify(expected, months, TimeUnit.Month, Tense.Future);