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

Expand the Russian name list with translated name snippets before #70279 (Help wanted with reviewing) #73083

Merged
merged 6 commits into from
Aug 29, 2024

Conversation

Qrox
Copy link
Contributor

@Qrox Qrox commented Apr 17, 2024

Summary

I18N "Expand the Russian name list with translated English names"

Purpose of change

Similar to #73077, add Russian translation of the name snippets from before #70279 to the Russian name file.

Describe the solution

Family and given names from names/en.json are converted to translated names from the Russian mo file before #70279, and added to names/ru.json, using the script in #73083 (comment).

Still a draft because I don't understand Russian and need help reviewing the changes.

Describe alternatives you've considered

Testing

Just regular JSON changes, should be fine if the CI tests pass.

Additional context

I know very little Russian so I'd appreciate some help with reviewing the generated lists. If you would like to help, please go through the lists and mark strings that are not names for removal.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Translation I18n astyled astyled PR, label is assigned by github actions labels Apr 17, 2024
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
@Vane79
Copy link

Vane79 commented Apr 18, 2024

This file would really benefit from in-line comments of the original names.

@Qrox
Copy link
Contributor Author

Qrox commented Apr 18, 2024

@Hyperseeker @Vane79 thanks a lot for the reviews. I'll look into them.

This file would really benefit from in-line comments of the original names.

I suppose so. I'll see if I can make that happen, but JSON does not support inline comments so it might take some tinkering with the JSON format. It may also require changes to the C++ code if we wish to keep the comments.

@Uwuewsky
Copy link
Contributor

Uwuewsky commented Apr 18, 2024

This file would really benefit from not being sorted alphabetically so that it can be opened side-by-side with the original file. And from separating snippet categories into separate files.

I'm not sure it's worth adding translations from a .mo file. File are still significantly different from en.json (fewer names, literal translations).

I planned to work on this file someday. I recently finished what I wanted, so I can take it right now. I can create a separate PR or I can send PR to Qrox:names-ru branch so that my changes appear in this PR. The amount of work is too much to make these changes through suggestions on Github. But it will take some time. Sooo you don't have to worry about this file.

@Qrox
Copy link
Contributor Author

Qrox commented Apr 19, 2024

This file would really benefit from not being sorted alphabetically so that it can be opened side-by-side with the original file

It would if it only contains translated names from en.json, but some of the names from en.json have not been translated, and the current ru.json contains existing names from the previous ru.json and translated names from en.json, so there isn't a strict one-to-one correspondence. I'm not sure where the existing names come from and I'm not planning to dig into the git history to find out 🤷‍♂️.

I might be able to generate a file that contains the source English name in the same order as the current ru.json though.

And from separating snippet categories into separate files.

That should be doable, but is outside the scope of this PR.

I'm not sure it's worth adding translations from a .mo file. File are still significantly different from en.json (fewer names, literal translations).

In some previous version of the game, the names in en.json were copy-pasted into a snippet file, and became translatable on Transifex. Before I noticed and reverted the change in #70279, a significant portion of these strings were already translated into Simplified Chinese, Russian, and Japanese, so that's why I'm salvaging those translations in this PR and #73077.

There is indeed the problem of literal translations for a few of the strings, but from my experience with doing this for the Simplified Chinese file in #73077, only a small part of the strings are affected, so the translations are actually worth salvaging.

Eventually these files should be made translatable on Transifex but I'll have to find out if it supports this kind of files that does not have a one-to-one correspondence between strings. (This is needed because many different names in English might have the same transliteration due to the target langauge having a different set of syllables; the translators might also want to add in names from their own languages.)

I can send PR to Qrox:names-ru branch so that my changes appear in this PR.

Please do, and thanks in advance!

@Hyperseeker
Copy link
Contributor

I wanted to continue the review today, but since @Uwuewsky is working to make a few changes, I'll hold off until they push theirs.

data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
data/names/ru.json Outdated Show resolved Hide resolved
@Qrox
Copy link
Contributor Author

Qrox commented May 2, 2024

@Hyperseeker I merged the modification by @Uwuewsky, so the format of the file has changed. There's still a line-to-line correspondence between the name lists so the file can be reviewed by opening the English and Russian files side-by-side.

@Hyperseeker
Copy link
Contributor

So, I've just looked at the latest changes, and... frankly, I'm lost. There's so much to look through, even my browser is struggling.

May I suggest these changes be broken up by category, and split between multiple PRs? City names, first names, nicknames etc. – it would make reviewing them much-easier.

@Qrox
Copy link
Contributor Author

Qrox commented May 7, 2024

Sure, I'll break this PR up (and probably merge the English and Russian files for easier review).

Copy link
Contributor

github-actions bot commented Jun 9, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jun 9, 2024
@github-actions github-actions bot closed this Jul 10, 2024
@Maleclypse Maleclypse reopened this Aug 13, 2024
@Maleclypse Maleclypse marked this pull request as ready for review August 13, 2024 12:09
@Maleclypse Maleclypse merged commit 1fcf496 into CleverRaven:master Aug 29, 2024
44 of 56 checks passed
Knut-Aage-Hofseth pushed a commit to Knut-Aage-Hofseth/Cataclysm-DDA that referenced this pull request Aug 29, 2024
…verRaven#70279 (Help wanted with reviewing) (CleverRaven#73083)

* Add Russian names from translated name snippets before CleverRaven#70279

Family and given names from names/en.json are converted to translated names from the Russian mo file before CleverRaven#70279 and added to names/ru.json using a script.

* Fix some incorrectly translated Russian names, thanks Hyperseeker, Zireael07, and Vane79!

Co-authored-by: Steve Brand <[email protected]>

* Fix more incorrectly translated Russian names

* Fix more incorrectly translated Russian names, thanks Hyperseeker and Vane79!

Co-authored-by: Steve Brand <[email protected]>

* Update ru.json

* Fix more incorrectly translated Russian names

Co-authored-by: Steve Brand <[email protected]>

---------

Co-authored-by: Steve Brand <[email protected]>
Co-authored-by: Uwuewsky <[email protected]>
@Hyperseeker
Copy link
Contributor

Hey, just FYI, this wasn't finished. I was waiting for @Qrox to break down the names for easier reviewing and merging. There's still a lot of names to review in this PR.

@Maleclypse
Copy link
Member

Hey, just FYI, this wasn't finished. I was waiting for @Qrox to break down the names for easier reviewing and merging. There's still a lot of names to review in this PR.

@Uwuewsky had said in discord that they had fully reviewed this and it was ready for merge once it was reopened. Let me know if you want me to link to that comment in the devcord.

@Hyperseeker
Copy link
Contributor

I disagree, but if the author of the PR can't or doesn't want to split the PR for further review, who am I to argue? My goal was to help, and to the best of my ability, I've helped.

@Qrox
Copy link
Contributor Author

Qrox commented Aug 30, 2024

Sorry, I have been occupied with other IRL things so I wasn't able to finish breaking up this PR. Your help so far is much appreciated. In any case, the updated Russian names should have a one-to-one correspondence with the English names, so the file can still be reviewed piece by piece if anyone's interested.

@Hyperseeker
Copy link
Contributor

That's okay, I'm not blaming you for anything. It's just that you seem to be the only one so far to take up the effort, which too is much appreciated. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions stale Closed for lack of activity, but still valid. Translation I18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants