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

Merge dev-ru to main to launch Russian localisation #3031

Merged
merged 72 commits into from
Apr 12, 2024
Merged

Merge dev-ru to main to launch Russian localisation #3031

merged 72 commits into from
Apr 12, 2024

Conversation

shurup
Copy link
Collaborator

@shurup shurup commented Apr 4, 2024

Describe your changes

The Russian version of Glossary is now ready to be merged into the main branch.
Our team (@kirkonru & @tym83 & @shurup) has translated 24 terms (and other minimum required content) into Russian.
I have checked that the localisation pages work, by building the website locally and via the preview feature in the previous PR (#3029).
We have also prepared a blog post to announce this localisation.

Related issue number or link (ex: resolves #issue-number)

Checklist before opening this PR (put x in the checkboxes)

  • This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • I have signed off on all commits
    • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

kirkonru and others added 30 commits July 24, 2023 10:31
@kirkonru
Add Russian setting to config.toml
21a9f95 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
Add i18n/ru.toml
a02f802 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Add _index.md
5d6bfd7 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Add /contribute/_index.md
eb3a15b 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Add /style-guide/_index.md
df72023 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Add _TEMPLATE.md
b424dcf 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Kubernetes
1860cdc 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Cloud Native Apps
0bf1e49 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Cloud Native Technology
228e953 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Container Orchestration
4df3510 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Containerization
602f3cc 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Containers
46dd678 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Continuous Delivery
96ed64f 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Continuous Deployment
1ef15aa 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize Continuous Integration
8e04a2b 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize DevOps
468322d 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
[ru] Localize DevSecOps
09740a5 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@seokho-son
Merge pull request #2455 from cncf/main
d14d43c 
Rebase dev-ru with the main branch
@kirkonru
Merge branch 'dev-ru' into dev-ru
6cc3908 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
Apply suggestions from code review
749affd 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>

Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru @shurup
Apply suggestions from code review
261b0b4 
Co-authored-by: Dmitry Shurupov <dmitry.shurupov@palark.com>
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru @shurup
Apply suggestions from code review
2a10e35 
These suggestions take into account the edits made in #2343 "Update ownership and emeritus state"

Co-authored-by: Dmitry Shurupov <dmitry.shurupov@palark.com>
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru @shurup
Apply suggestions from code review
d1ab8cc 
Remove all links to "native".

Co-authored-by: Dmitry Shurupov <dmitry.shurupov@palark.com>
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru @shurup
Apply suggestions from code review
d1e20d7 
Co-authored-by: Dmitry Shurupov <dmitry.shurupov@palark.com>
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru @seokho-son
Update config.toml
c92aa2e 
Co-authored-by: Seokho Son <shsongist@gmail.com>
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@kirkonru
Apply suggestions from code review
f4f6c76 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
Signed-off-by: lis <lis@localhost.localdomain>
Deleted space in style-guide dir name
60b43f0 
Changes to be committed:
renamed:    content/ru/style-guide /_index.md -> content/ru/style-guide/_index.md

Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
Signed-off-by: lis <lis@localhost.localdomain>
@kirkonru
Add ru prefix to links where needed
f788c89 
fix common term for service mesh

Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
Signed-off-by: lis <lis@localhost.localdomain>
@kirkonru
Minor fixes - suggestions from code review
36babc4 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
Signed-off-by: lis <lis@localhost.localdomain>
@kirkonru
Update content/ru/_index.md
d9bbd73 
Signed-off-by: Kirill Kononovich <41591254+kirkonru@users.noreply.github.com>
@github-actions github-actions bot added the lang/ru for Russian label Apr 4, 2024
@netlify Netlify
Copy link

netlify bot commented Apr 4, 2024 •
edited
Loading

✅ Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit f0b8229
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/6614e7443994f70008035657
😎 Deploy Preview https://deploy-preview-3031--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@kirkonru
Copy link
Collaborator

kirkonru commented Apr 4, 2024

Thanks for bringing all of these to fruition.

@kirkonru
Copy link
Collaborator

kirkonru commented Apr 4, 2024

LGTM

tym83
tym83 approved these changes Apr 4, 2024
View reviewed changes
Copy link
Collaborator

@tym83 tym83 left a comment

Choose a reason for hiding this comment

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

LGTM

@seokho-son
Copy link
Collaborator

seokho-son commented Apr 9, 2024 •
edited
Loading

Checklist to make localization live.

  • validate all files which are not in the localization directory (content/ru/*)
  • check i18n/ru.toml exist
  • check l10n configuration in config.toml
  • acknowledge to initial localization contributors list
  • check Preview works

seokho-son
seokho-son reviewed Apr 9, 2024
View reviewed changes
Copy link
Collaborator

@seokho-son seokho-son left a comment

Choose a reason for hiding this comment

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

Hi @shurup and Russian localization team!!
Thanks for this nice work!

We need to add ack for the Russian localization team to promote them and invite more contributors.

Please check the following comment.
Also, Please open another PR to update this document(PR). Don't make direct change to this PR.

content/ru/_index.md Outdated Show resolved Hide resolved
content/ru/_index.md Show resolved Hide resolved
@seokho-son seokho-son added the hold Wait, please do not proceed this yet label Apr 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 9, 2024

Wait, please do not proceed with this yet.

@shurup
Update _index.md before merging dev-ru
1c9756b 
Signed-off-by: Dmitry Shurupov <dmitry.shurupov@palark.com>
@shurup shurup mentioned this pull request Apr 9, 2024
Merged
2 tasks
@shurup
Copy link
Collaborator Author

shurup commented Apr 9, 2024

Thank you, @seokho-son! I proposed these changes in #3037 (not sure whether I could do it in this PR directly).

@seokho-son
Copy link
Collaborator

Thanks @shurup
I will take a look again once the #3037 merged. (I don't have to approve it)

FYI, we need to avoid working on upstream branches (this PR is to merge upstream/dev-ru into upstream/main)
So, using another PR to update upstream/dev-ru is appropriate approach. :)
This PR will be updated automatically, once #3037 has been merged in to dev-ru.

@tym83
Merge pull request #3037 from cncf/ru-index-md-fixes
1071784 
[ru] Update _index.md before merging dev-ru
@shurup
Copy link
Collaborator Author

shurup commented Apr 9, 2024

Great, thanks for your explanation, @seokho-son! We are ready to proceed, I guess 🚀

tym83 added 2 commits April 9, 2024 10:57
@tym83
Update ebpf.md
85a715f 
Some editor's stuff:)

Signed-off-by: Timur Tukaev <90071493+tym83@users.noreply.github.com>
@tym83
Merge pull request #3018 from lobkovilya/dev-ru
f0b8229 
[ru] Localize ebpf.md
@shurup
Copy link
Collaborator Author

shurup commented Apr 12, 2024

Hi @seokho-son! Now, with your suggestions being applied, can remove the hold label and proceed? Or is something else stopping us (e.g. more reviewers, etc.)?

@seokho-son
Copy link
Collaborator

Based on #3031 (comment)
, LGTM!!!

Thanks to all contributors!!

@seokho-son seokho-son added maintainers Use this label if PR requires maintainers to take action and removed hold Wait, please do not proceed this yet labels Apr 12, 2024
@seokho-son seokho-son merged commit fe1e04e into main Apr 12, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tym83 tym83 tym83 approved these changes

@kirkonru kirkonru kirkonru approved these changes

@iamNoah1 iamNoah1 iamNoah1 approved these changes

@seokho-son seokho-son seokho-son approved these changes

@caniszczyk caniszczyk Awaiting requested review from caniszczyk caniszczyk is a code owner

@jihoon-seo jihoon-seo Awaiting requested review from jihoon-seo jihoon-seo is a code owner

@nate-double-u nate-double-u Awaiting requested review from nate-double-u nate-double-u is a code owner

Assignees
No one assigned
Labels
lang/ru for Russian maintainers Use this label if PR requires maintainers to take action
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@shurup @kirkonru @seokho-son @iamNoah1 @tym83 @lobkovilya