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

refactor(esx_society/client/main.lua) : Fixed stuff in boss menu and added translations #575

Merged
merged 3 commits into from
Nov 27, 2022
Merged

refactor(esx_society/client/main.lua) : Fixed stuff in boss menu and added translations #575

merged 3 commits into from
Nov 27, 2022

Conversation

lexinor
Copy link
Contributor

@lexinor lexinor commented Oct 17, 2022

  • Added a possibility to return from almost every part in the boss menu, that's why we are now passing "options" through the whole menu to be able to come back at the initial state.

  • Added a null check when changing a job grade's name by "nil" and did the same for job ranks.

  • Added some new translations. I only translated FR and EN, others are just plain english values

@lexinor
Copy link
Contributor Author

lexinor commented Nov 1, 2022

No one to review that PR ?

@Benzo00 Benzo00 self-assigned this Nov 1, 2022
bitpredator
bitpredator suggested changes Nov 7, 2022
View reviewed changes
Copy link
Contributor

@bitpredator bitpredator left a comment

Choose a reason for hiding this comment

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

I have corrected the new translations inserted regarding the Italian language

bitpredator
bitpredator suggested changes Nov 7, 2022
View reviewed changes
[esx_addons]/esx_society/locales/it.lua Outdated Show resolved Hide resolved
[esx_addons]/esx_society/locales/it.lua Outdated Show resolved Hide resolved
lexinor
lexinor commented Nov 7, 2022
View reviewed changes
Copy link
Contributor Author

@lexinor lexinor left a comment

Choose a reason for hiding this comment

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

Include that translation

@lexinor @bitpredator
Apply suggestions from code review
2f1d069 
Co-authored-by: bitpredator <67551273+bitpredator@users.noreply.github.com>
@lexinor
Copy link
Contributor Author

lexinor commented Nov 14, 2022

@Benzo00 Any news ?

@lexinor
Copy link
Contributor Author

lexinor commented Nov 16, 2022 •
edited

@JackDUpModZ @Benzo00 Could you review it please ? I need it merged, it's been a month

@Gellipapa
Copy link
Member

@lexinor Thank you for pull request. Sorry for the long wait, there will soon be changes in the acceptance of PRs. I tested it and there are no bugs in it but I rewrote two things on the server side. Soon to be merged.

Gellipapa
Gellipapa approved these changes Nov 27, 2022
View reviewed changes
Copy link
Member

@Gellipapa Gellipapa left a comment

Choose a reason for hiding this comment

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

Tested, works.

@Gellipapa Gellipapa merged commit f8da905 into esx-framework:main Nov 27, 2022
Gellipapa added a commit that referenced this pull request Nov 27, 2022
@Gellipapa
Merge pull request #702 from fivemland/identity-refactor
6d76f38 
refactor(esx_identity)
refactor and fix #575
@lexinor
Copy link
Contributor Author

lexinor commented Nov 27, 2022

@lexinor Thank you for pull request. Sorry for the long wait, there will soon be changes in the acceptance of PRs. I tested it and there are no bugs in it but I rewrote two things on the server side. Soon to be merged.

Thanks for your response, I hope it will be faster next time 😅😅.
There are still some work to do on the menu anyway so glad to see that

@Gellipapa
Copy link
Member

Gellipapa commented Nov 27, 2022 •
edited

Yes, for exampl outsource all burned-in menu text to a locales file.

@lexinor lexinor deleted the branch_for_prs branch December 3, 2022 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gellipapa Gellipapa Gellipapa approved these changes

@TrymTube TrymTube TrymTube approved these changes

@bitpredator bitpredator bitpredator approved these changes

@Benzo00 Benzo00 Awaiting requested review from Benzo00

@JackDUpModZ JackDUpModZ Awaiting requested review from JackDUpModZ

Assignees

@Benzo00 Benzo00

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@lexinor @Gellipapa @TrymTube @bitpredator @Benzo00