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

docs: Update UI text #3461

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Conversation

patrickluoyu
Copy link
Contributor

Signed-off-by: Patrick-LuoYu patrickluo@yunify.com

What type of PR is this?

/kind documentation

What this PR does / why we need it:

Update UI text.

Special notes for reviewers:

/assign @harrisonliu5

Please take a look. Thanks!

Does this PR introduce a user-facing change?

None

Signed-off-by: Patrick-LuoYu <patrickluo@yunify.com>
@ks-ci-bot ks-ci-bot added release-note-none kind/documentation Categorizes issue or PR as related to documentation. labels Jul 25, 2022
@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Patrick-LuoYu

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

@ks-ci-bot ks-ci-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 25, 2022
@harrisonliu5
Copy link
Contributor

/lgtm

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2022
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: c77bb08f151cf238443a0bdd3e2065183eb87724

@harrisonliu5 harrisonliu5 merged commit bc581f7 into kubesphere:master Jul 26, 2022
@harrisonliu5
Copy link
Contributor

/cherry-pick release-3.3

@ks-ci-bot
Copy link
Collaborator

@harrisonliu5: #3461 failed to apply on top of branch "release-3.3":

Applying: Update UI text
Using index info to reconstruct a base tree...
M	locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
M	locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
A	src/components/Tables/Base/Pagination/index.jsx
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/components/Tables/Base/Pagination/index.jsx deleted in HEAD and modified in Update UI text. Version Update UI text of src/components/Tables/Base/Pagination/index.jsx left in tree.
Auto-merging locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
CONFLICT (content): Merge conflict in locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
Auto-merging locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
CONFLICT (content): Merge conflict in locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update UI text
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-3.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ks-ci-bot
Copy link
Collaborator

@harrisonliu5: new issue created for failed cherrypick: #3504

In response to this:

/cherry-pick release-3.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/documentation Categorizes issue or PR as related to documentation. lgtm Indicates that a PR is ready to be merged. release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants