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

[Tools] Fix pug regular expression #24006

Merged
merged 3 commits into from
Oct 17, 2018
Merged

[Tools] Fix pug regular expression #24006

merged 3 commits into from
Oct 17, 2018

Conversation

LeanidShutau
Copy link
Contributor

Actual
i18n_check parses only interpolation expressions in Pug: #{i18n(...)}.

Expected
i18n function can be called without #{...} interpolation, e.g. h2= i18n(...)
i18n_check tool should parse all possible i18n(...) use cases.

@LeanidShutau LeanidShutau added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc Project:i18n v6.5.0 labels Oct 15, 2018
@LeanidShutau LeanidShutau self-assigned this Oct 15, 2018
@LeanidShutau LeanidShutau added this to In progress in I18n Oct 15, 2018
@maryia-lapata maryia-lapata mentioned this pull request Oct 15, 2018
Closed
@elasticmachine
Copy link
Contributor

💔 Build Failed

@LeanidShutau
Copy link
Contributor Author

retest

azasypkin
azasypkin approved these changes Oct 15, 2018
View reviewed changes
Copy link
Member

@azasypkin azasypkin left a comment

Choose a reason for hiding this comment

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

LGTM

src/dev/i18n/extractors/pug.test.js Show resolved Hide resolved
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@LeanidShutau LeanidShutau moved this from In progress to Review in I18n Oct 16, 2018
maryia-lapata
maryia-lapata approved these changes Oct 16, 2018
View reviewed changes
Copy link
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

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

LGTM.
I checked with an example: .kibanaWelcomeText(data-error-message=i18n('common.ui.welcomeErrorMessage', { defaultMessage: 'Kibana did not load properly. Check the server output for more information.' }))
The message is extracted by the tool.

@elasticmachine
Copy link
Contributor

💔 Build Failed

@LeanidShutau
Copy link
Contributor Author

retest

@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@LeanidShutau LeanidShutau merged commit 9326e8f into elastic:master Oct 17, 2018
@LeanidShutau LeanidShutau deleted the fix/i18n-pug-regex branch October 17, 2018 09:44
LeanidShutau added a commit to LeanidShutau/kibana that referenced this pull request Oct 17, 2018
@LeanidShutau
[Tools] Fix pug regular expression (elastic#24006)
48d43f7 
* [Tools] Fix pug regular expression

* Add one more test
@LeanidShutau LeanidShutau mentioned this pull request Oct 17, 2018
Merged
@LeanidShutau LeanidShutau moved this from Review to Backporting in I18n Oct 17, 2018
LeanidShutau added a commit that referenced this pull request Oct 17, 2018
@LeanidShutau
[Tools] Fix pug regular expression (#24006) (#24122)
b2ba7c3 
* [Tools] Fix pug regular expression

* Add one more test
@LeanidShutau
Copy link
Contributor Author

6.x/6.5: b2ba7c3

@LeanidShutau LeanidShutau moved this from Backporting to Done in I18n Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azasypkin azasypkin azasypkin approved these changes

@maryia-lapata maryia-lapata maryia-lapata approved these changes

@pavel06081991 pavel06081991 Awaiting requested review from pavel06081991

Assignees

@LeanidShutau LeanidShutau

Labels
backported Project:i18n Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v6.5.0
Projects
I18n
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LeanidShutau @elasticmachine @azasypkin @maryia-lapata