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.

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

[Various languages] Fix AM/PM for times with hour of 12 #2798

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

Conversation

robtpaton
Copy link

@robtpaton robtpaton commented Dec 29, 2024

What
Change condition for when to use AM vs PM

Why
Currently a time of 12:xx is given suffix of AM which is incorrect. 00:xx is AM, 12:xx is PM.

Copy link

@home-assistant home-assistant bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @robtpaton,

When attempting to inspect the commits of your pull request for CLA signature status among all authors we encountered commit(s) which were not linked to a GitHub account, thus not allowing us to determine their status(es).

The commits that are missing a linked GitHub account are the following:

Unfortunately, we are unable to accept this pull request until this situation is corrected.

Here are your options:

  1. If you had an email address set for the commit that simply wasn't linked to your GitHub account you can link that email now and it will retroactively apply to your commits. The simplest way to do this is to click the link to one of the above commits and look for a blue question mark in a blue circle in the top left. Hovering over that bubble will show you what email address you used. Clicking on that button will take you to your email address settings on GitHub. Just add the email address on that page and you're all set. GitHub has more information about this option in their help center.

  2. If you didn't use an email address at all, it was an invalid email, or it's one you can't link to your GitHub, you will need to change the authorship information of the commit and your global Git settings so this doesn't happen again going forward. GitHub provides some great instructions on how to change your authorship information in their help center.

    • If you only made a single commit you should be able to run
      git commit --amend --author="Author Name <[email protected]>"
      
      (substituting "Author Name" and "[email protected]" for your actual information) to set the authorship information.
    • If you made more than one commit and the commit with the missing authorship information is not the most recent one you have two options:
      1. You can re-create all commits missing authorship information. This is going to be the easiest solution for developers that aren't extremely confident in their Git and command line skills.
      2. You can use this script that GitHub provides to rewrite history. Please note: this should be used only if you are very confident in your abilities and understand its impacts.
    • Whichever method you choose, I will come by to re-check the pull request once you push the fixes to this branch.

We apologize for this inconvenience, especially since it usually bites new contributors to Home Assistant. We hope you understand the need for us to protect ourselves and the great community we all have built legally. The best thing to come out of this is that you only need to fix this once and it benefits the entire Home Assistant and GitHub community.

Thanks, I look forward to checking this PR again soon! ❤️

@home-assistant
Copy link

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft December 29, 2024 13:27
@robtpaton robtpaton marked this pull request as ready for review December 29, 2024 13:31
@robtpaton robtpaton changed the title fix: am/pm for 12 Fix AM/PM for times with hour of 12 Dec 29, 2024
@tetele
Copy link
Contributor

tetele commented Dec 29, 2024

Are you really familiar with all those languages you modified, @robtpaton ? Are you sure they all use the same logic?

Also, your modification would output "00:15 AM", "06:15 AM" and "00:15 PM". If we're gonna fix it, I think we should fix it properly.

@robtpaton
Copy link
Author

Are you really familiar with all those languages you modified, @robtpaton ? Are you sure they all use the same logic?

No, only English! Seems like a good thing to fix this in as many languages as possible at the same time. I see labels have automatically been added to the PR for the other languages, I'll look at how to tag language leaders of each of those for reviewing.

Also, your modification would output "00:15 AM", "06:15 AM" and "00:15 PM". If we're gonna fix it, I think we should fix it properly.

Good point 🤦

@robtpaton robtpaton marked this pull request as draft December 29, 2024 13:49
@tetele
Copy link
Contributor

tetele commented Dec 29, 2024

I'll look at how to tag language leaders of each of those for reviewing.

They've already been tagged. My point was that it's not a good idea to have a multi-language PR.

@robtpaton robtpaton marked this pull request as ready for review December 29, 2024 14:14
@robtpaton
Copy link
Author

I'll look at how to tag language leaders of each of those for reviewing.

They've already been tagged. My point was that it's not a good idea to have a multi-language PR.

OK, I took an educated guess that the setup is similar for these languages, since the existing logic was similar, but I see your point and accept the contributing guide does say to prefer single language PRs.

My follow-up question would be: what is the best mechanism for raising "I think this might be wrong across multiple languages?" type issues? Maybe we could add some more nuance/details in the contributing guidelines.

Have taken another look at the logic also 👍

Copy link
Contributor

@tetele tetele left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for English

@tetele
Copy link
Contributor

tetele commented Dec 29, 2024

what is the best mechanism for raising "I think this might be wrong across multiple languages?"

Usually language leaders keep an eye out for English changes. To be sure, you could add an issue and tag it with other language tags. The language leaders will then be assigned. I can't remember if automatically or not.

@synesthesiam
Copy link
Contributor

Related issue: home-assistant/core#134224

@synesthesiam
Copy link
Contributor

Looks good to mean. I'd like to hear from the other language leaders, so let's give it a little time. This fix needs to be in the intents bump for the next release though.

@ViViDboarder
Copy link
Contributor

Also here to chime in that English looks good. Something worth flagging (but I don’t think we can address yet) is that the way localization of times work is not necessarily directly tied to language, though I think it’s often enough.

It seems to me like it would be better for Home Assistant, which knows the localization format of the user, to pass a localized string back to the assistant rather than unlocalized numbers.

@robtpaton robtpaton changed the title Fix AM/PM for times with hour of 12 [Various languages] Fix AM/PM for times with hour of 12 Dec 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants