Skip to content

Conversation

@rebeccaalpert
Copy link
Contributor

@rebeccaalpert rebeccaalpert commented Feb 24, 2021

Thanks @kyoto for pointing out an issue with the format of the Japanese dates/times.

I refactored our dates/times to rely on Moment "LLL" locale defaults so we don't need to worry about syntax. I overrode the "LLL" default in Moment for English so we could retain our existing date/time format (no year). This should also fix any other issues with our existing languages and prevent issues with any additional languages we add.

English example (with override):
Screen Shot 2021-02-24 at 2 07 29 PM

Japanese example (with defaults):
Screen Shot 2021-02-24 at 2 08 06 PM

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1932453.

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. labels Feb 24, 2021
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: This pull request references Bugzilla bug 1932453, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1932453: Update format for Japanese date/times

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality labels Feb 24, 2021
@openshift-ci-robot openshift-ci-robot added the kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated label Feb 24, 2021
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 24, 2021
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: This pull request references Bugzilla bug 1932453, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1932453: Update format for Japanese date/times

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

1 similar comment
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: This pull request references Bugzilla bug 1932453, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1932453: Update format for Japanese date/times

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rebeccaalpert rebeccaalpert added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2021
@rebeccaalpert rebeccaalpert changed the title Bug 1932453: Update format for Japanese date/times [WIP] Bug 1932453: Update format for Japanese date/times Feb 24, 2021
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2021
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: This pull request references Bugzilla bug 1932453, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

[WIP] Bug 1932453: Update format for Japanese date/times

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rebeccaalpert rebeccaalpert changed the title [WIP] Bug 1932453: Update format for Japanese date/times Bug 1932453: Update format for Japanese date/times Feb 24, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2021
@rebeccaalpert rebeccaalpert removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2021
@rebeccaalpert
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. and removed bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. labels Feb 24, 2021
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: This pull request references Bugzilla bug 1932453, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.0) matches configured target release for branch (4.8.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rebeccaalpert rebeccaalpert changed the title Bug 1932453: Update format for Japanese date/times [WIP] Bug 1932453: Update format for Japanese date/times Feb 24, 2021
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2021
@rebeccaalpert
Copy link
Contributor Author

Have to fix some tests; moving this into WIP status for now. I'll finish it tomorrow.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

13 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@spadgett
Copy link
Member

spadgett commented Mar 3, 2021

Holding until #8289 merges to unblock CI.

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 3, 2021
@spadgett spadgett added this to the v4.8 milestone Mar 5, 2021
@spadgett
Copy link
Member

spadgett commented Mar 5, 2021

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 5, 2021
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 2107eac into openshift:master Mar 6, 2021
@openshift-ci-robot
Copy link
Contributor

@rebeccaalpert: All pull requests linked via external trackers have merged:

Bugzilla bug 1932453 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1932453: Update format for Japanese date/times

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rebeccaalpert
Copy link
Contributor Author

/cherry-pick release-4.7

@openshift-cherrypick-robot

@rebeccaalpert: cannot checkout 4.7: error checking out 4.7: exit status 1. output: error: pathspec '4.7' did not match any file(s) known to git

Details

In response to this:

/cherry-pick 4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@rebeccaalpert: #8242 failed to apply on top of branch "release-4.7":

Applying: Bug 1932453: Update format for Japanese date/times
Using index info to reconstruct a base tree...
M	frontend/public/components/utils/timestamp.tsx
M	frontend/public/i18n.js
M	frontend/public/locales/en-gb/public.json
M	frontend/public/locales/en/public.json
M	frontend/public/locales/ja/public.json
M	frontend/public/locales/ko/public.json
M	frontend/public/locales/zh/public.json
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/locales/zh/public.json
CONFLICT (content): Merge conflict in frontend/public/locales/zh/public.json
CONFLICT (modify/delete): frontend/public/locales/ko/public.json deleted in Bug 1932453: Update format for Japanese date/times and modified in HEAD. Version HEAD of frontend/public/locales/ko/public.json left in tree.
Auto-merging frontend/public/locales/ja/public.json
CONFLICT (content): Merge conflict in frontend/public/locales/ja/public.json
Auto-merging frontend/public/locales/en/public.json
CONFLICT (content): Merge conflict in frontend/public/locales/en/public.json
CONFLICT (modify/delete): frontend/public/locales/en-gb/public.json deleted in Bug 1932453: Update format for Japanese date/times and modified in HEAD. Version HEAD of frontend/public/locales/en-gb/public.json left in tree.
Auto-merging frontend/public/i18n.js
Auto-merging frontend/public/components/utils/timestamp.tsx
CONFLICT (content): Merge conflict in frontend/public/components/utils/timestamp.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 1932453: Update format for Japanese date/times
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants