mirror of
https://github.com/nushell/nushell.git
synced 2024-11-29 03:44:19 +01:00
123bf2d736
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description Hi, Fixes #10838, where before the `date` would be formatted incorrectly, and was not picking `LC_TIME` for time formatting, but it picked the first locale returned by the `sys-locale` crate instead. Now it will format time based on `LC_TIME`. For example, ``` // my locale `nl_NL.UTF-8` ❯ date now | format date '%x %X' 20-02-24 17:17:12 $env.LC_TIME = "en_US.UTF-8" ❯ date now | format date '%x %X' 02/20/2024 05:16:28 PM ``` Note that I also changed the `default_env.nu` as otherwise the Time will show AM/PM twice. Also reason for the `chrono` update is because this relies on a fix to upstream repo, which i initially submitted an [issue](https://github.com/chronotope/chrono/issues/1349#event-11765363286) <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - [X] `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - [X] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - [X] `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - [X] `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
106 lines
2.3 KiB
Rust
106 lines
2.3 KiB
Rust
use nu_test_support::{nu, pipeline};
|
|
|
|
#[test]
|
|
fn formatter_not_valid() {
|
|
let actual = nu!(r#"
|
|
date now | format date '%N'
|
|
"#);
|
|
|
|
assert!(actual.err.contains("invalid format"));
|
|
}
|
|
|
|
#[test]
|
|
fn fails_without_input() {
|
|
let actual = nu!(r#"
|
|
format date "%c"
|
|
"#);
|
|
|
|
assert!(actual.err.contains("Pipeline empty"));
|
|
}
|
|
|
|
#[test]
|
|
fn locale_format_respect_different_locale() {
|
|
let actual = nu!(
|
|
locale: "en_US",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("Fri 22 Oct 2021 08:00:12 PM +01:00"));
|
|
|
|
let actual = nu!(
|
|
locale: "en_GB",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("Fri 22 Oct 2021 20:00:12 +01:00"));
|
|
|
|
let actual = nu!(
|
|
locale: "de_DE",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("Fr 22 Okt 2021 20:00:12 +01:00"));
|
|
|
|
let actual = nu!(
|
|
locale: "zh_CN",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("2021年10月22日 星期五 20时00分12秒"));
|
|
|
|
let actual = nu!(
|
|
locale: "ja_JP",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("2021年10月22日 20時00分12秒"));
|
|
|
|
let actual = nu!(
|
|
locale: "fr_FR",
|
|
pipeline(
|
|
r#"
|
|
"2021-10-22 20:00:12 +01:00" | format date "%c"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("ven. 22 oct. 2021 20:00:12 +01:00"));
|
|
}
|
|
|
|
#[test]
|
|
fn locale_with_different_format_specifiers() {
|
|
let actual = nu!(
|
|
locale: "en_US",
|
|
pipeline(
|
|
r#"
|
|
"Thu, 26 Oct 2023 22:52:14 +0200" | format date "%x %X"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("10/26/2023 10:52:14 PM"));
|
|
|
|
let actual = nu!(
|
|
locale: "nl_NL",
|
|
pipeline(
|
|
r#"
|
|
"Thu, 26 Oct 2023 22:52:14 +0200" | format date "%x %X"
|
|
"#
|
|
)
|
|
);
|
|
assert!(actual.out.contains("26-10-23 22:52:14"));
|
|
}
|