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

fix(ext/cfx-ui): South Korea system locale #2755

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

poco8537
Copy link
Contributor

Goal of this PR

Clarify the South Korea server

How is this PR achieving the goal

Currently, the South Korea server is not displayed on the home screen. If the country is ko-KO, please set it to ko-KR to resolve this issue.

This PR applies to the following area(s)

FiveM, RedM

Successfully tested on

Game builds: ALL

Platforms: Windows

Checklist

  • Code compiles and has been tested successfully.
  • Code explains itself well and/or is documented.
  • My commit message explains what the changes do and what they are for.
  • No extra compilation warnings are added by these changes.

@github-actions github-actions bot added RedM Issues/PRs related to RedM triage Needs a preliminary assessment to determine the urgency and required action labels Aug 28, 2024
@nihonium-cfx nihonium-cfx added enhancement Feature or other request that adds functionality or improved usability and removed triage Needs a preliminary assessment to determine the urgency and required action RedM Issues/PRs related to RedM labels Aug 28, 2024
@poco8537
Copy link
Contributor Author

poco8537 commented Sep 3, 2024

When can I get my review?

@Nobelium-cfx
Copy link
Contributor

When can I get my review?

Hi. I've reviewed your PR yesterday. Please see the comment above. After you resolve it - we can do the merge. The PR overall looks good.

@Nobelium-cfx
Copy link
Contributor

Nobelium-cfx commented Sep 3, 2024

When can I get my review?

Hi. I've reviewed your PR yesterday. Please see the comment above. After you resolve it - we can do the merge. The PR overall looks good.

Oh, sorry, my bad, I forgot to send it :). Thank you for the ping! Sent now.

@github-actions github-actions bot added RedM Issues/PRs related to RedM triage Needs a preliminary assessment to determine the urgency and required action labels Sep 3, 2024
@poco8537 poco8537 force-pushed the master branch 5 times, most recently from 895d112 to 7bdecd7 Compare September 3, 2024 12:32
@github-actions github-actions bot added invalid Requires changes before it's considered valid and can be (re)triaged triage Needs a preliminary assessment to determine the urgency and required action and removed triage Needs a preliminary assessment to determine the urgency and required action invalid Requires changes before it's considered valid and can be (re)triaged labels Sep 3, 2024
@Nobelium-cfx
Copy link
Contributor

The change looks good, but now there are two "fix(ext/cfx-ui): South Korea system locale" commits. One for the original change and one for the comment fix. Please squash them with as suggested by #2745 (comment) . But you need to squash two commits instead of one this time:

git reset --soft HEAD~2 
git commit -m "fix(ext/cfx-ui): South Korea system locale"
git push --force

@Nobelium-cfx
Copy link
Contributor

Looks good now. Thank you for the change. And sorry again for a bit of a messy review :). Its my bad.

@Nobelium-cfx Nobelium-cfx changed the title fix(ext/cfx-ui): South Korea server country setting fix(ext/cfx-ui): South Korea system locale Sep 3, 2024
@Nobelium-cfx Nobelium-cfx removed triage Needs a preliminary assessment to determine the urgency and required action RedM Issues/PRs related to RedM labels Sep 3, 2024
@Nobelium-cfx Nobelium-cfx added the ready-to-merge This PR is enqueued for merging label Sep 3, 2024
@prikolium-cfx prikolium-cfx merged commit 18cfcce into citizenfx:master Sep 9, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature or other request that adds functionality or improved usability ready-to-merge This PR is enqueued for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants