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

feat: add Russian translations #494

Merged
merged 21 commits into from
Jul 16, 2020
Merged

Conversation

IZOBRETATEL777
Copy link
Contributor

@IZOBRETATEL777 IZOBRETATEL777 commented Jul 11, 2020

Full translation into Russian

Description

All posible words were translated. Also documetation was updated for Russian translate.
image
image

Related Issue

No translation

Motivation and Context

To increase the community of CP Editor

How Has This Been Tested?

Compiled from source code

Ubuntu 18.04 LTS (Mate)

Screenshots (if appropriate)

Type of changes

  • Bug fix (changes which fix an issue)
  • New feature (changes which add functionality)
  • Documentation (changes which modify the documentation only)
  • Style change (changes which do not affect the meaning of the code: code formatting, etc.)
  • Refactor (changes which affect the meaning of the code but neither fix a bug nor add a feature)
  • Performance improve (changes which improve performance)
  • Test (changes which add tests)
  • Build (Changes that affect the build system or external dependencies)
  • CI (changes to CI configuration files and scripts)
  • Chore (changes which do not belong to any type above)
  • Revert (revert previous changes)

Checklist

  • I have read the CONTRIBUTING document.
  • I have tested these changes locally, and this fixes the bug/the new feature behaves as the expectation.
  • The settings file in the old version can be used in the new version after this change.
  • These changes only fix a single bug/introduces a single feature. (Otherwise, open multiple Pull Requests instead, unless these bugs/features are closely related.)
  • The commit messages are clear and detailed. (Otherwise, use git reset and commit again, or use git rebase -i and git commit --amend to modify the commit messages.)
  • These changes don't remove an existing feature. (Otherwise, add an option to disable this feature instead, unless it's necessary to remove this feature.)
  • If there are changes of the text displayed in the UI, I have wrapped them in tr() or QCoreApplication::translate().
  • I have documented these changes in CHANGELOG.md, or these changes are not notable.

@ouuan
Copy link
Member

ouuan commented Jul 11, 2020

You don't need to use "bak" as we are using git for version control.

@ouuan
Copy link
Member

ouuan commented Jul 12, 2020

Can you add warnings saying the documents are translated from the English version and might be not up-to-date at the top of the documents?

@ouuan
Copy link
Member

ouuan commented Jul 12, 2020

I can't push to your branch, have you checked "allow edits from the maintainer"?

However, you can apply this patch:

diff --git a/src/Settings/settings.json b/src/Settings/settings.json
index e6ce769..0c45d89 100644
--- a/src/Settings/settings.json
+++ b/src/Settings/settings.json
@@ -818,7 +818,7 @@
         "type": "QString",
         "ui": "QComboBox",
         "default": "system",
-        "param": "QStringList { \"system\", \"English\", \"简体中文\" }",
+        "param": "QStringList { \"system\", \"English\", \"Русский\", \"简体中文\" }",
         "tip": "The language displayed in the UI."
     },
     {

translations/ru_RU.ts Outdated Show resolved Hide resolved
translations/ru_RU.ts Outdated Show resolved Hide resolved
translations/ru_RU.ts Outdated Show resolved Hide resolved
@ouuan
Copy link
Member

ouuan commented Jul 12, 2020

There are many warnings in Qt Linguist, you'd better resolve them.

@ouuan ouuan changed the title Translation into Russian feat: add Russian translations Jul 12, 2020
@coder3101
Copy link
Member

coder3101 commented Jul 12, 2020

You don't need to use "bak" as we are using git for version control.

@IZOBRETATEL777 Solution for this:
You should delete all *.bak files, We can switch to old translations using git checkout <old_hash>.

Or You can check "Allow edits by Maintainers" (found in the right side of this PR page). So we could solve all your warnings or issues.

IZOBRETATEL777 and others added 8 commits July 12, 2020 13:04
Suggestion applied

Co-authored-by: Yufan You <ouuansteve@gmail.com>
Co-authored-by: Yufan You <ouuansteve@gmail.com>
Added warnings saying the documents are translated from the English version and might be not up-to-date at the top of the documents
Patch applied
@IZOBRETATEL777
Copy link
Contributor Author

  • There are many warnings in Qt Linguist, you'd better resolve them.

  • You don't need to use "bak" as we are using git for version control.

  • Can you add warnings saying the documents are translated from the English version and might be not up-to-date at the top of the documents?

All done

I can't push to your branch, have you checked "allow edits from the maintainer"?

However, you can apply this patch:

diff --git a/src/Settings/settings.json b/src/Settings/settings.json
index e6ce769..0c45d89 100644
--- a/src/Settings/settings.json
+++ b/src/Settings/settings.json
@@ -818,7 +818,7 @@
         "type": "QString",
         "ui": "QComboBox",
         "default": "system",
-        "param": "QStringList { \"system\", \"English\", \"简体中文\" }",
+        "param": "QStringList { \"system\", \"English\", \"Русский\", \"简体中文\" }",
         "tip": "The language displayed in the UI."
     },
     {

Applied

You don't need to use "bak" as we are using git for version control.

@IZOBRETATEL777 Solution for this:
You should delete all *.bak files, We can switch to old translations using git checkout <old_hash>.

Or You can check "Allow edits by Maintainers" (found in the right side of this PR page). So we could solve all your warnings or issues.

image
Sorry, but I doesn't have this checkbox. You can read about there

@coder3101
Copy link
Member

One more things, please add to doc/CHANGELOG.md under "Unreleased" section under "Added" subsection that CP Editor now comes in Russian Language.

@coder3101
Copy link
Member

After you add this to changelog, I will approve the PR and when ouuan approves, he will merge it.

Thanks for your contributions.

coder3101
coder3101 previously approved these changes Jul 12, 2020
Copy link
Member

@coder3101 coder3101 left a comment

Choose a reason for hiding this comment

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

LGTM!

@coder3101 coder3101 requested a review from ouuan July 12, 2020 16:28
CONTRIBUTING_ru-RU.md Outdated Show resolved Hide resolved
@ouuan
Copy link
Member

ouuan commented Jul 12, 2020

Are you always editing the translation file with Qt Linguist? There are many unescaped characters, and some of them even affects the result like this one: (there's an extra > at the end)

image

You should use Qt Linguist to edit the translations, check all translations again. (I did this (double-check) with the Chinese translation before.)

And there are merge conflicts, you should resolve them.

@IZOBRETATEL777
Copy link
Contributor Author

Are you always editing the translation file with Qt Linguist? There are many unescaped characters, and some of them even affects the result like this one: (there's an extra > at the end)

image

You should use Qt Linguist to edit the translations, check all translations again. (I did this (double-check) with the Chinese translation before.)

And there are merge conflicts, you should resolve them.

I use VS code + Vine because it is comfortable for me. OK, for the last translation I used Qt Linguist.

translations/ru_RU.ts Show resolved Hide resolved
translations/ru_RU.ts Outdated Show resolved Hide resolved
translations/ru_RU.ts Outdated Show resolved Hide resolved
Copy link
Member

@ouuan ouuan left a comment

Choose a reason for hiding this comment

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

Don't forget #494 (comment).

translations/ru_RU.ts Outdated Show resolved Hide resolved
IZOBRETATEL777 and others added 2 commits July 16, 2020 11:23
Copy link
Member

@ouuan ouuan left a comment

Choose a reason for hiding this comment

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

I suggest you completely check all translations again. It seems that @IZOBRETATEL777 did most translations, so I think it's better to let @Sadykhzadeh to check.

translations/ru_RU.ts Outdated Show resolved Hide resolved
@Sadykhzadeh
Copy link
Member

I suggest you completely check all translations again. It seems that @IZOBRETATEL777 did most translations, so I think it's better to let @Sadykhzadeh to check.

We communicate with each other and translate the file together, so when someone gives a request for verification, it means that we both fully verified the translation😃
Given the fact that we may make mistakes during translation, I have now re-checked the entire file and found no errors.

Copy link
Member

@ouuan ouuan left a comment

Choose a reason for hiding this comment

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

It seems OK. We can fix errors in the future if there are any.

@ouuan ouuan merged commit 9f3e3b0 into cpeditor:master Jul 16, 2020
@ouuan
Copy link
Member

ouuan commented Jul 16, 2020

I think we can invite you to our organization, so that if you have time, you can add new translations in corresponding PRs.

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.

4 participants