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

[hi] Merge Hindi localization branch to main #29679

Merged
merged 123 commits into from
Aug 31, 2022
Merged

[hi] Merge Hindi localization branch to main #29679

merged 123 commits into from
Aug 31, 2022

Conversation

anubha-v-ardhan
Copy link
Member

@anubha-v-ardhan anubha-v-ardhan commented Sep 12, 2021 •
edited
Loading

Merge dev-1.22-hi.1 to main

Approvers and/or Reviewers for Hindi l10n:
@anubha-v-ardhan
@divya-mohan0209
@Garima-Negi
@verma-kunal

Deploy preview

verma-kunal and others added 14 commits August 13, 2021 11:34
@verma-kunal
Update supported-doc-versions.md
3a0268e
@anubha-v-ardhan
Create _index.md
078985f
@anubha-v-ardhan
Create _index.md
1f6603d
@anubha-v-ardhan
Create explore-interactive.html
59c6016
@verma-kunal
Add /hi/docs/tutorials/kubernetes-basics/scale/scale-interactive.html
b3d79b5
@anubha-v-ardhan
Create _index.md
7637b93
@anubha-v-ardhan
Update explore-interactive.html
024ced2
@verma-kunal
Add content/hi/docs/tutorials/kubernetes-basics/scale/_index.md
aade2e9
@verma-kunal
Add content/hi/docs/tutorials/kubernetes-basics/update/update-interac…
7db7aca 
…tive.html
@rajatgupta24
Add content/hi/docs/tasks/_index.md
8241d81
@anubha-v-ardhan @mittalyashu
Update content/hi/docs/setup/production-environment/windows/_index.md
8eadd71 
Co-authored-by: Yashu Mittal <mittalyashu77@gmail.com>
@rajatgupta24
Update _index.md
232e6d7
@sftim
Merge branch 'main' ready to merge into 'dev-1.22-hi.1'
53781c1
@sftim
Merge pull request #29675 from sftim/20210912_update_hindi_localization
57e5594 
Update the Hindi localization branch with the latest changes from main,
including updates to Hindi reviewers and approvers.
@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 12, 2021
@netlify
Copy link

netlify bot commented Sep 12, 2021 •
edited
Loading

✅ Pull request preview available for checking

Name Link
🔨 Latest commit 0629f94
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/630cc4b158e4ff0007597e79
😎 Deploy Preview https://deploy-preview-29679--kubernetes-io-main-staging.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 settings.

@anubha-v-ardhan
Copy link
Member Author

/language hi

@k8s-ci-robot k8s-ci-robot added the language/hi Issues or PRs related to Hindi language label Sep 12, 2021
@k8s-ci-robot
Merge pull request #29421 from verma-kunal/hi-docs-tuts-k8s-basics-sc…
5802224 
…ale-scaleLanding

[hi] Add content/hi/docs/tutorials/kubernetes-basics/scale/_index.md
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Sep 12, 2021
sftim and others added 2 commits September 12, 2021 17:34
@sftim
Enable Hindi localization
729ce02
@k8s-ci-robot
Merge pull request #29413 from anubha-v-ardhan/content/hi/docs/setup/…
e1552ba 
…production-environment/windows/_index.md

[hi] Add content/hi/docs/setup/production-environment/windows/_index.md
@sftim sftim mentioned this pull request Sep 12, 2021
Merged
verma-kunal and others added 2 commits September 13, 2021 14:26
@verma-kunal @mittalyashu
Final Update content/hi/docs/home/supported-doc-versions.md
2689435 
Update content/hi/docs/home/supported-doc-versions.md

Co-authored-by: Yashu Mittal <mittalyashu77@gmail.com>
@k8s-ci-robot
Merge pull request #29372 from verma-kunal/Hindi-localization-docs/home2
634983c 
[hi] Add content/hi/docs/home/supported-doc-versions.md
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 13, 2021
@rolfedh
Copy link
Contributor

rolfedh commented Aug 27, 2022 •
edited
Loading

TLDR: I have tested this merge and everything seems to work fine.

  1. Merged this PR with main on my local machine, and it merged cleanly.
  2. I built the site using make container-serve and it built without errors.
  3. Inspected the home page and various doc topics in various languages and everything looks fine.
  4. For the non-Hindi localizations, I "flipped" back and forth between topics on the production and test sites. I saw very minor differences in spacing in the upper nav bar.
  5. I verified that the parent branch of dev-1.22-hi.1 is main.

I believe this PR is ready to merge.

rolfedh and others added 2 commits August 28, 2022 15:17
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 29, 2022
@rolfedh
Copy link
Contributor

rolfedh commented Aug 29, 2022 •
edited
Loading

@divya-mohan0209 @Garima-Negi @natalisucks @reylejano @sftim, would you remove the hold and approve this PR for merge?

@natalisucks
Copy link
Contributor

Re-adding the LGTM so we can get an approval going 😃
/remove-hold
/lgtm

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 29, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 29, 2022
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 1656a2fadc04c617dff5784f62178273f83513e7

@rolfedh
Copy link
Contributor

rolfedh commented Aug 29, 2022

Thanks @natalisucks! Now this PR needs an /approved label from someone else.

amolmote and others added 2 commits August 29, 2022 18:23
@amolmote
[hi] Localize content/en/docs/reference/glossary/cni.md
58507e6 
Signed-off-by: amolmote <amolmote201@gmail.com>
@k8s-ci-robot
Merge pull request #36104 from amolmote/amol/cni
0629f94 
[hi] Localize content/en/docs/reference/glossary/cni.md
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 29, 2022
@anubha-v-ardhan
Copy link
Member Author

anubha-v-ardhan commented Aug 29, 2022 •
edited
Loading

Thanks @natalisucks @rolfedh
Hindi localization is still working on dev-1.22-hi.1, so each time we merge a PR lgtm label is removed. I guess we'll need /lgtm and /approved at the same time 😅

@reylejano
Copy link
Member

/hold
placing a hold until ready to merge into main

re-applying lgtm
/lgtm

/approve

feel free to unhold when ready to merge

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 30, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 30, 2022
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4e910cd93f85fbec9dd61d3b5b37e5183dbb7e56

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: reylejano, rolfedh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 30, 2022
@rolfedh rolfedh mentioned this pull request Aug 30, 2022
Merged
@sftim
Copy link
Contributor

sftim commented Aug 31, 2022

Hindi approvers: if you need a new LGTM for this PR, and have confirmed that the changes since the last LGTM look OK, reply here and consider also asking in #sig-docs-maintainers on Slack.

This looks good to go. 🎉

@divya-mohan0209
Copy link
Contributor

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 31, 2022
@k8s-ci-robot k8s-ci-robot merged commit 9c9b866 into main Aug 31, 2022
@sftim sftim deleted the dev-1.22-hi.1 branch November 19, 2022 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sea-n Sea-n Sea-n left review comments

@rolfedh rolfedh rolfedh approved these changes

@natalisucks natalisucks Awaiting requested review from natalisucks

@reylejano reylejano Awaiting requested review from reylejano

@sftim sftim Awaiting requested review from sftim

@celestehorgan celestehorgan Awaiting requested review from celestehorgan

@divya-mohan0209 divya-mohan0209 Awaiting requested review from divya-mohan0209

@Garima-Negi Garima-Negi Awaiting requested review from Garima-Negi

Assignees

@natalisucks natalisucks

@Garima-Negi Garima-Negi

@reylejano reylejano

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/hi Issues or PRs related to Hindi language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.