Skip to content

Conversation

@aduth
Copy link
Member

@aduth aduth commented Sep 4, 2017

Closes #1927

This pull request seeks to enhance the i18n strings extraction parser to support string concatenation (BinaryExpression type).

Testing instructions:

Verify that concatenated strings (like that of the InvalidBlockWarning component) are included in the generated languages/gutenberg.pot file when running npm run gettext-strings.

@aduth aduth added [Type] Build Tooling Issues or PRs related to build tooling Internationalization (i18n) Issues or PRs related to internationalization efforts labels Sep 4, 2017
@codecov
Copy link

codecov bot commented Sep 4, 2017

Codecov Report

Merging #2655 into master will increase coverage by 0.06%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2655      +/-   ##
==========================================
+ Coverage   31.38%   31.45%   +0.06%     
==========================================
  Files         177      177              
  Lines        5413     5418       +5     
  Branches      949      950       +1     
==========================================
+ Hits         1699     1704       +5     
  Misses       3139     3139              
  Partials      575      575
Impacted Files Coverage Δ
i18n/babel-plugin.js 39.58% <85.71%> (+3.31%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 78dd8b6...12caa99. Read the comment docs.

@BE-Webdesign
Copy link
Contributor

Verify that concatenated strings (like that of the InvalidBlockWarning component) are included in the generated languages/gutenberg.pot file when running npm run gettext-strings.

Verified that this works.

@BE-Webdesign
Copy link
Contributor

It is however copying over the first line break as well:

#: editor/modes/visual-editor/invalid-block-warning.js:32
msgid ""
"This block appears to have been modified externally. Overwrite the external "
"changes or Convert to %s to keep your changes."
msgstr ""

Everything is working good though as far as I can tell.

@aduth
Copy link
Member Author

aduth commented Sep 6, 2017

@BE-Webdesign Thanks for the review! The behavior there can be attributed to the gettext parser I believe, specifically its foldLength option:

> var foldLine = require( 'gettext-parser/lib/shared' ).foldLine;
undefined
> foldLine( 'This block appears to have been modified externally. Overwrite the external changes or Convert to %s to keep your changes.', 76 );
[ 'This block appears to have been modified externally. Overwrite the external ',
  'changes or Convert to %s to keep your changes.' ]

@aduth
Copy link
Member Author

aduth commented Sep 6, 2017

Just in case, I manually debugged the running parsing code and confirmed there are no newlines in the original extracted text argument.

@aduth aduth merged commit c8b1be2 into master Sep 6, 2017
@aduth aduth deleted the update/1927-i18n-string-concat branch September 6, 2017 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Internationalization (i18n) Issues or PRs related to internationalization efforts [Type] Build Tooling Issues or PRs related to build tooling

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants