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

all: remove the repetitive word "the" #35975

Closed
wants to merge 5 commits into from
Closed

all: remove the repetitive word "the" #35975

wants to merge 5 commits into from

Conversation

cuishuang
Copy link
Contributor

@cuishuang cuishuang commented Jun 30, 2023

What does this PR do?

To ensure grammatical correctness, it is recommended to remove repetitive instances of the word "the" in sentences.

Why is it important?

Fixes grammatical errors.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Signed-off-by: cui fliter <[email protected]>
@cuishuang cuishuang requested review from a team as code owners June 30, 2023 07:49
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 30, 2023
@botelastic
Copy link

botelastic bot commented Jun 30, 2023

This pull request doesn't have a Team:<team> label.

@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @cuishuang? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 30, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-08-29T15:01:10.195+0000

  • Duration: 130 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 27766
Skipped 1978
Total 29744

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Aug 14, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b main upstream/main
git merge upstream/main
git push upstream main

Signed-off-by: cui fliter <[email protected]>
@cuishuang
Copy link
Contributor Author

Done. Please review again.

@shmsr
Copy link
Member

shmsr commented Aug 14, 2023

@cuishuang Can you please run make check followed by make update and commit and push those changes as well?

@cuishuang
Copy link
Contributor Author

@cuishuang Can you please run make check followed by make update and commit and push those changes as well?

Hello, I executed make check but reported the following error

cgo-gcc-prolog:452:2: warning: 'FSEventStreamScheduleWithRunLoop' is deprecated: first deprecated in macOS 13.0 - Use FSEventStreamSetDispatchQueue instead. [-Wdeprecated-declarations] /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/FSEvents.framework/Headers/FSEvents.h:1138:1: note: 'FSEventStreamScheduleWithRunLoop' has been explicitly marked deprecated here Error: some files are not up-to-date. Run 'make update' then review and commit the changes. Modified: [auditbeat/include/fields.go] make[1]: *** [check] Error 1 make: *** [check] Error 1

@shmsr
Copy link
Member

shmsr commented Aug 15, 2023

@cuishuang Can you please run make check followed by make update and commit and push those changes as well?

Hello, I executed make check but reported the following error

cgo-gcc-prolog:452:2: warning: 'FSEventStreamScheduleWithRunLoop' is deprecated: first deprecated in macOS 13.0 - Use FSEventStreamSetDispatchQueue instead. [-Wdeprecated-declarations] /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/FSEvents.framework/Headers/FSEvents.h:1138:1: note: 'FSEventStreamScheduleWithRunLoop' has been explicitly marked deprecated here Error: some files are not up-to-date. Run 'make update' then review and commit the changes. Modified: [auditbeat/include/fields.go] make[1]: *** [check] Error 1 make: *** [check] Error 1

Yeah, run make update.

Signed-off-by: cui fliter <[email protected]>
@cuishuang
Copy link
Contributor Author

@cuishuang Can you please run make check followed by make update and commit and push those changes as well?

Hello, I executed make check but reported the following error
cgo-gcc-prolog:452:2: warning: 'FSEventStreamScheduleWithRunLoop' is deprecated: first deprecated in macOS 13.0 - Use FSEventStreamSetDispatchQueue instead. [-Wdeprecated-declarations] /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreServices.framework/Frameworks/FSEvents.framework/Headers/FSEvents.h:1138:1: note: 'FSEventStreamScheduleWithRunLoop' has been explicitly marked deprecated here Error: some files are not up-to-date. Run 'make update' then review and commit the changes. Modified: [auditbeat/include/fields.go] make[1]: *** [check] Error 1 make: *** [check] Error 1

Yeah, run make update.

Done. Please review again.

@cuishuang
Copy link
Contributor Author

friendly ping~

@shmsr
Copy link
Member

shmsr commented Aug 25, 2023

@cuishuang Can you check why golangci-lint is failing? Otherwise, changes look good to me.

@cuishuang
Copy link
Contributor Author

@cuishuang Can you check why golangci-lint is failing? Otherwise, changes look good to me.

I checked the relevant error reports and got the reason: golangci-lint in the workflow will detect the files that have been modified this time. I changed winlogbeat/sys/winevent/event_test.go, this file contains a piece of information in Spanish, and the variable mensajeEnEspañol contains non-ascii characters (Español means Spanish); in addition, comando in the text is considered to be misspelled (It's not wrong actually, it means "command" in Spanish).

I guess golangci-lint may have been added after this information, so there was no error message at that time. I think it can be ignored

@shmsr shmsr changed the title all: remove repetitive the all: remove the repetitive word "the" Aug 26, 2023
@mergify
Copy link
Contributor

mergify bot commented Aug 31, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b main upstream/main
git merge upstream/main
git push upstream main

@cuishuang cuishuang closed this Sep 1, 2023
@shmsr shmsr self-requested a review September 8, 2023 11:48
@@ -32,5 +32,5 @@ func init() {
// AssetFieldsYml returns asset data.
// This is the base64 encoded zlib format compressed contents of fields.yml.
func AssetFieldsYml() string {
Copy link
Member

@shmsr shmsr Sep 8, 2023

Choose a reason for hiding this comment

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

Hey. Why *.go files are touched? I see some more files are modified and in some unexpected parts.

@@ -1,36 +0,0 @@
// Licensed to Elasticsearch B.V. under one or more contributor
Copy link
Member

Choose a reason for hiding this comment

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

why full file removed?

@@ -19,5 +19,5 @@ func init() {
// AssetFieldsYml returns asset data.
// This is the base64 encoded zlib format compressed contents of fields.yml.
func AssetFieldsYml() string {
Copy link
Member

Choose a reason for hiding this comment

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

This is also not right. Read my first comment.

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 feel like too much time has been spent and this submission is of little value.

Feel sorry, I hope other developers can submit a new PR based on this.

@shmsr shmsr self-requested a review September 8, 2023 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants