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

Update Russian Translate #385

Merged
merged 13 commits into from
Nov 24, 2021
Merged

Update Russian Translate #385

merged 13 commits into from
Nov 24, 2021

Conversation

gostsdmitry
Copy link
Contributor

No description provided.

@shlyakpavel
Copy link

So... We have discussed that we change track selection to be "Композиций выбрано: {}" for plural so we don't have to fight Russian grammar. You can either land it her or I can make a separate pull request after this one is merged

@shlyakpavel
Copy link

Also, we have agreed that "ничего не воспроизводится" takes place of "ничего не играет". Did you revert that intentionally?

@shlyakpavel
Copy link

shlyakpavel commented Nov 24, 2021

Nevermind. Just merge this one and let me fix things :(

@shlyakpavel
Copy link

I don't really understand the last commit :)
I don't know how {} works

@gostsdmitry
Copy link
Contributor Author

gostsdmitry commented Nov 24, 2021

I don't really understand the last commit :)
I don't really understand the last commit :) I don't know how {} works

Встречал такое в другой локали, которую переводил. Плеер Sonata.

Вот часть кода:
#: ../sonata/about.py:160
#, python-brace-format
msgid "{count} song."
msgid_plural "{count} songs."
msgstr[0] "{count} песня."
msgstr[1] "{count} песни."
msgstr[2] "{count} песен."

@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Just a quick heads up about {}: you have to keep it empty and leave the msgid/msgid_plural untouched

What you can do however is have msgstr[2] "Songs selected: {}" for instance

@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Also if you're sonewhat unfamiliar with git/potfiles you can just use POEditor and give me a heads up when changes are ready to be pulled into the repository!

@gostsdmitry
Copy link
Contributor Author

@xou816 Take a look at the translation file.

po/ru.po Outdated
msgstr[0] "{} песня выбрана"
msgstr[1] "{} песни выбраны"
msgstr[2] "{} песни были выбраны"
msgstr[0] "композиция выбрана {}"

Choose a reason for hiding this comment

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

Are you serious? 😭😭😭😭😭😭😭😭😭😭

@shlyakpavel
Copy link

shlyakpavel commented Nov 24, 2021

Вот часть кода: #: ../sonata/about.py:160 #, python-brace-format msgid "{count} song." msgid_plural "{count} songs." msgstr[0] "{count} песня." msgstr[1] "{count} песни." msgstr[2] "{count} песен."

Подстановка строк в питоне работает совсем иначе, нежели здесь. Более того, там тоже нельзя значение внутри фигурных скобок менять, тк они не позиционные, а именные

@gostsdmitry
Copy link
Contributor Author

Вот часть кода: #: ../sonata/about.py:160 #, python-brace-format msgid "{count} song." msgid_plural "{count} songs." msgstr[0] "{count} песня." msgstr[1] "{count} песни." msgstr[2] "{count} песен."

Подстановка строк в питоне работает совсем иначе, нежели здесь. Более того, там тоже нельзя значение внутри фигурных скобок менять, тк они не позиционные, а именные

Так скобки вначале должны быть? Если так, то что мы здесь всё переставляем?

@shlyakpavel
Copy link

😭😭😭

@gostsdmitry
Copy link
Contributor Author

Более того, там тоже нельзя значение внутри фигурных скобок менять, тк они не позиционные, а именные

Получается я этим сломал их назначение?

@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Just to be clear about how {} works (specific to this project btw):

  • you can't change the msgid in any way
  • {} will be replaced by the number of selected tracks for this key, it can be moved wherever you need it inside the msgstr

Again I strongly advise using a GUI editor if you're unfamiliar with this, it will prevent you from editing stuff you shouldn't and will warn you about plurals, etc

@gostsdmitry
Copy link
Contributor Author

gostsdmitry commented Nov 24, 2021

@xou816 As far as I understood, nothing else needs to be changed.

po/ru.po Outdated
msgid "Tracks:"
msgstr "Топ треков"
msgstr "Треки"
Copy link
Owner

Choose a reason for hiding this comment

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

missing a colon here!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have corrected.

@gostsdmitry
Copy link
Contributor Author

So... We have discussed that we change track selection to be "Композиций выбрано: {}" for plural so we don't have to fight Russian grammar. You can either land it her or I can make a separate pull request after this one is merged

If you do as you suggest, then there should be two translation options: one is a singular number and another is a plural. Not three, as it is now.

@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Have you figured out what to do with the extra msgstr? Was it added by mistake or is one plural form still missing?

@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Looks to me like a mistake, the file mentions 3 plurals, but we have 4 msgstr entries here

@gostsdmitry
Copy link
Contributor Author

Have you figured out what to do with the extra msgstr? Was it added by mistake or is one plural form still missing?

In this case (in Russian language) - no. Does not exist.

@gostsdmitry
Copy link
Contributor Author

Looks to me like a mistake, the file mentions 3 plurals, but we have 4 msgstr entries here

I removed msgstr [3] from translation.

@gostsdmitry
Copy link
Contributor Author

Looks to me like a mistake, the file mentions 3 plurals, but we have 4 msgstr entries here

No. There is no mistake. There are really three of them.

@gostsdmitry
Copy link
Contributor Author

Specifically here, when listing, there are only three pronunciations: two plural pronunciations and one singular pronunciation. This is the Russian language. :)

@xou816 xou816 merged commit 7f83a5e into xou816:development Nov 24, 2021
@xou816
Copy link
Owner

xou816 commented Nov 24, 2021

Thank you both, merged! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants