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

Updates in IT translations #1078

Closed
wants to merge 15 commits into from
Closed

Updates in IT translations #1078

wants to merge 15 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Sep 16, 2022 •
edited by ghost

Added few other translations to which replace all previous Italian PRs

Mergeable after #1049

@ghost ghost marked this pull request as ready for review September 16, 2022 22:37
@serhii73
Copy link
Collaborator

serhii73 commented Oct 7, 2022

Thank you for your PR @federicodilo
Could you please add some tests to this PR that cover these changes? Thanks in advance.

@ghost
Copy link
Author

ghost commented Oct 7, 2022

It should be enough, please feel free to tell me if it's not :)

@ghost
Copy link
Author

ghost commented Oct 8, 2022 •
edited by ghost

I have run the tests and it seems to work, it is possible to merge at will.

@Gallaecio
Copy link
Member

Could you keep the extra comma at the end of lists in Python files? Unlike in JSON, in Python it is allow and even encouraged. And you seem to have edited an unrelated (Ukranian) file making that change (maybe it was your IDE making that change automatically?).

federicodilo added 2 commits October 24, 2022 23:35
@ghost
Copy link
Author

ghost commented Oct 24, 2022 •
edited by ghost

Well the edits on Ukrainian file were added from IDE to do not overwrite the changes not done by me.
I've reinserted the commas to uniform the files; still it fails to compile though.

Any idea? :)

@Gallaecio
Copy link
Member

The JSON file cannot have the extra comma, that is a JSON syntax error. Only Python allows the extra comma.

@serhii73
Copy link
Collaborator

Hi @federicodilo
Could you please resolve the conflicts? Thanks in advance.

@Gallaecio
Copy link
Member

If you are not familiar with merge conflicts, I recommend reading the GitHub docs about them.

@ghost ghost closed this by deleting the head repository Dec 2, 2023
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@serhii73 @Gallaecio