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

fix DateOnly has current date return 'today' #1278

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

fix DateOnly has current date return 'today' #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
39a6c07
fixes #1186 replacing 'now' with 'today' for all day or longer time p…
AJacksonCT Apr 25, 2023
0cf55b1
fixes for #1186 for other languages
AJacksonCT Apr 25, 2023
60b0494
Humanizr#1186 fixed failing unit tests
AJacksonCT Jun 7, 2023
996fb53
Merge branch 'main' of https://github.com/Humanizr/Humanizer
AJacksonCT Jun 7, 2023
a7e3e99
fixes #1186 replacing 'now' with 'today' for all day or longer time p…
AJacksonCT Apr 25, 2023
2e50589
fixes for #1186 for other languages
AJacksonCT Apr 25, 2023
b38ca6a
Humanizr#1186 fixed failing unit tests
AJacksonCT Jun 7, 2023
bca847d
Merge pull request #1 from AJacksonCT/Temp
AJacksonCT Jun 7, 2023
7f7ee89
@AJacksonCT
AJacksonCT Jun 7, 2023
1cf9f76
Merge branch 'main' of https://github.com/AJacksonCT/Humanizer
AJacksonCT Jun 7, 2023
5ba390e
Correction of failing tests
AJacksonCT Jun 14, 2023
f6d3469
failing test correction
AJacksonCT Jun 14, 2023
f3a5e82
extra dari in expected text
AJacksonCT Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand Down
22 changes: 11 additions & 11 deletions src/Humanizer.Tests.Shared/DateHumanizeDefaultStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/Humanizer.Tests.Shared/DateOnlyHumanizeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
38 changes: 19 additions & 19 deletions src/Humanizer.Tests.Shared/DateTimeHumanizePrecisionStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/Humanizer.Tests.Shared/Localisation/ar/DateHumanizeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public void DaysAgo(int days, string expected)
[Theory]
[InlineData(1, "في غضون يوم واحد من الآن")]
[InlineData(2, "في غضون يومين من الآن")]
[InlineData(10, "في غضون 10 أيام من الآن")]
[InlineData(17, "في غضون 17 يوم من الآن")]
[InlineData(10, "في غضون 10 يوم من اليوم")]
[InlineData(17, "في غضون 17 يوم من اليوم")]
public void DaysFromNow(int days, string expected)
{
DateHumanize.Verify(expected, days, TimeUnit.Day, Tense.Future);
Expand Down
12 changes: 6 additions & 6 deletions src/Humanizer.Tests.Shared/Localisation/id/DateHumanizeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -81,9 +81,9 @@ public void MonthsAgo(int months, string expected)
}

[Theory]
[InlineData(1, "sebulan dari sekarang")]
[InlineData(10, "10 bulan dari sekarang")]
public void MonthsFromNow(int months, string expected)
[InlineData(1, "sebulan dari hari ini")]
[InlineData(10, "10 bulan dari hari ini")]
public void MonthsFromNow(int months, string expected)
{
DateHumanize.Verify(expected, months, TimeUnit.Month, Tense.Future);
}
Expand All @@ -97,8 +97,8 @@ public void YearsAgo(int years, string expected)
}

[Theory]
[InlineData(1, "setahun dari sekarang")]
[InlineData(2, "2 tahun dari sekarang")]
[InlineData(1, "setahun dari hari ini")]
[InlineData(2, "2 tahun dari hari ini")]
public void YearsFromNow(int years, string expected)
{
DateHumanize.Verify(expected, years, TimeUnit.Year, Tense.Future);
Expand Down