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

translate tutorials(apm) #22217

Conversation

pavel06081991
Copy link
Contributor

#21957
translate tutorials(apm)

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@yankouskia
Copy link

blocked by #22181

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@elasticcla
Copy link

Hi @pavel06081991, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile?

# Conflicts:
#	src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js
#	src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js
#	src/core_plugins/kibana/server/tutorials/apm/elastic_cloud.js
#	src/core_plugins/kibana/server/tutorials/apm/index.js
#	src/core_plugins/kibana/server/tutorials/apm/on_prem.js
@pavel06081991 pavel06081991 force-pushed the feature/tutorial-translations-part7 branch from b23f80e to 04ea98f Compare August 29, 2018 09:20
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Copy link
Contributor

@LeanidShutau LeanidShutau left a comment

Choose a reason for hiding this comment

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

LGTM, but old eslint comments should be removed

defaultMessage: 'Configure the agent',
}),
textPre: i18n.translate('kbn.server.tutorials.apm.nodeClient.configure.textPre', {
// eslint-disable-next-line no-multi-str
Copy link
Contributor

Choose a reason for hiding this comment

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

no-multi-str rule is disabled in eslint config

// eslint-disable-next-line no-multi-str
defaultMessage: 'Note: If script execution is disabled on your system, \
you need to set the execution policy for the current session \
to allow the script to run. For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File .\\install-service-apm-server.ps1`.',
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should move PowerShell.exe -ExecutionPolicy UnRestricted -File .\\install-service-apm-server.ps1 to the values. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's a good point. Thank you.
Fixed.

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@maryia-lapata maryia-lapata requested review from tsullivan and removed request for tsullivan September 5, 2018 15:17
Copy link
Member

@tsullivan tsullivan left a comment

Choose a reason for hiding this comment

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

LGTM

@tsullivan
Copy link
Member

this has a merge conflict, needs to be updated with master

@elasticmachine
Copy link
Contributor

💔 Build Failed

@maryia-lapata
Copy link
Contributor

retest

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@maryia-lapata maryia-lapata merged commit e6ebcf2 into elastic:master Sep 6, 2018
@maryia-lapata maryia-lapata deleted the feature/tutorial-translations-part7 branch September 6, 2018 10:59
maryia-lapata pushed a commit to maryia-lapata/kibana that referenced this pull request Sep 6, 2018
* translate tutorials(apm)

* remove tabs from the line beginning

* remove id duplicate

* Remove disabling no-multi-str rule

* Move command to the values
maryia-lapata added a commit that referenced this pull request Sep 6, 2018
* translate tutorials(apm)

* remove tabs from the line beginning

* remove id duplicate

* Remove disabling no-multi-str rule

* Move command to the values
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants