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

Add react-i18n package with i18n React bindings #28465

Merged
merged 2 commits into from Feb 11, 2021
Merged

Conversation

jsnajdr
Copy link
Member

@jsnajdr jsnajdr commented Jan 25, 2021

Adds react-i18n package inspired by @sirreal's work in Calypso and by experimental locale switching by @swissspidy in #27973.

@sirreal and @swissspidy are the actual authors of the code I would say, I act mostly as a copy&paster here 🙂

The react-i18n bindings read from the I18n instance, supplied as a prop to the context provider, and makes the i18n functions available to children React components that use the consumer hook.

I added some methods to @wordpress/i18n that are needed by the react-i18n bindings for a concise and hack-free implementation:

  • exporting the defaultI18n instance, so that we can pass it around as a whole.
  • adding a new getLocaleData method.
  • adding a new hasTranslation method.
  • adding a subscribe method that notifies listeners about changes made by i18n.setLocaleData.

The @wordpress/hooks package gets a defaultHooks export, again, so that we can pass it around as a parameter.

The React bindings automatically rerender dependent components when the i18n instance changes, when new data are set on it with i18n.setLocaleData, or when a pre/post-translation hook is added or removed (cc @yuliyan for review).

Types:
I originally wanted to add native TypeScript sources for react-i18n, but ran into unsolvable problems when I tried. One of them are insufficient typings for imported packages. The Gutenberg monorepo doesn't have types for createHigherOrderComponent from @wordpress/compose, so I was unable to use it in a type-safe way.

@jsnajdr jsnajdr added Internationalization (i18n) Issues or PRs related to internationalization efforts [Package] i18n /packages/i18n labels Jan 25, 2021
@jsnajdr jsnajdr self-assigned this Jan 25, 2021
Comment on lines 27 to 39
// rerender translations whenever a hook is removed or added
useEffect( () => {
hooks.addAction( 'hookAdded', 'core/react-i18n/filters', () =>
forceUpdate()
);
hooks.addAction( 'hookRemoved', 'core/react-i18n/filters', () =>
forceUpdate()
);
return () => {
hooks.removeAction( 'hookAdded', 'core/react-i18n/filters' );
hooks.removeAction( 'hookRemoved', 'core/react-i18n/filters' );
};
}, [] );
Copy link
Member

Choose a reason for hiding this comment

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

Should filtering perhaps better be handled by #27966?

Copy link
Member

Choose a reason for hiding this comment

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

@leewillis77 is working on adding filters to the i18n package. I would be curious to learn how much those two PRs overlap.

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a question for @yuliyan, who added this feature in Automattic/wp-calypso#44743, presumably to implement a i18n feature like Community Translator. @yuliyan did you implement the feature you needed the hooks for yet?

And would it be ok if these hooks were not in the react-i18n library, but directly in the I18n instance in @wordpress/i18n?

Another difference is that @leewillis77's work in #27966 and also the Core translate PHP function only have hooks to modify the gettext result after the translation, and not its arguments before translation. @yuliyan's version has a preTranslation hook that can modify these arguments.

I'd personally prefer to move the hooks support to the core I18n class and simplify the React bindings as much as possible. But we need to make sure that the features that depend on these hooks are OK with that.

Copy link
Contributor

Choose a reason for hiding this comment

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

That's a question for @yuliyan, who added this feature in Automattic/wp-calypso#44743, presumably to implement a i18n feature like Community Translator.

That's correct, but the implementations are still in a draft state and have not been released yet.

And would it be ok if these hooks were not in the react-i18n library, but directly in the I18n instance in @wordpress/i18n?

I think it would be even better to have them directly in the I18n instance, though react-i18n bindings should still maintain reactivity when adding/removing hooks.

Another difference is that @leewillis77's work in #27966 and also the Core translate PHP function only have hooks to modify the gettext result after the translation, and not its arguments before translation. @yuliyan's version has a preTranslation hook that can modify these arguments.

I like the implementation in #27966 as it looks closer to the core PHP gettext function filters and essentially provides the same functionality as the postTranslation filter here.

As for the lack of preTranslation - I can't tell if it's a mandatory feature, but it would definitely come in handy. The first use case that pop into my head would be to use it for implementing a different translation lookup logic, in case the JED file uses translation keys other than the original string (e.g. hashes, ids, etc.).

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it would be even better to have them directly in the I18n instance

Perfect! That means I can remove them from the react-i18n bindings in this PR.

though react-i18n bindings should still maintain reactivity when adding/removing hooks.

That can be implemented in i18n by registering the hookAdded/hookRemoved callbacks and fire a subscribe event when a relevant i18n.* hook changes. At this moment, subscribe listeners are notified only on setLocaleData() calls, now they'll also be notified when hooks change.

As for the lack of preTranslation - I can't tell if it's a mandatory feature, but it would definitely come in handy. The first use case that pop into my head would be to use it for implementing a different translation lookup logic, in case the JED file uses translation keys other than the original string

OK, but that sounds like a rather hypothetical use case to me, not something we need in near future. Or is it needed for any of the existing i18n-calypso hooks and filters that we use, e.g., for Community Translator or for highlighting untranslated strings in the UI?

The pre_gettext hooks can be added at any later time to @wordpress/i18n.

Copy link
Contributor

Choose a reason for hiding this comment

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

That can be implemented in i18n by registering the hookAdded/hookRemoved callbacks and fire a subscribe event when a relevant i18n.* hook changes. At this moment, subscribe listeners are notified only on setLocaleData() calls, now they'll also be notified when hooks change.

Sounds good!

Or is it needed for any of the existing i18n-calypso hooks and filters that we use, e.g., for Community Translator or for highlighting untranslated strings in the UI?

No, it's not needed for any of the existing features. Although, i18n-calypso supports the mentioned translation lookup feature, we are not currently using it.

@sirreal
Copy link
Member

sirreal commented Jan 25, 2021

Types:
I originally wanted to add native TypeScript sources for react-i18n, but ran into unsolvable problems when I tried. One of them are insufficient typings for imported packages. The Gutenberg monorepo doesn't have types for createHigherOrderComponent from @wordpress/compose, so I was unable to use it in a type-safe way.

If you'd still like to go this route, there are a couple of options you may not have considered:

  • // @ts-ignore the problematic import
  • Relax some rules. I think setting noImplicitAny: false for just this module would allow the import.

@jsnajdr
Copy link
Member Author

jsnajdr commented Jan 26, 2021

If you'd still like to go this route, there are a couple of options you may not have considered:

@sirreal I'd love to add the TypeScript support back, but it was a too big task for me to do everything at once. I'll try to re-add the TS syntax after the dust settles on other parts of this PR 🙂

@@ -116,6 +145,19 @@ export const createI18n = ( initialData, initialDomain ) => {
...DEFAULT_LOCALE_DATA[ '' ],
...tannin.data[ domain ][ '' ],
};

listeners.forEach( ( listener ) => listener() );
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it make sense to use doAction here instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

Something like doAction( 'i18n.update' )? That's an interesting idea! 👍

Copy link
Member

Choose a reason for hiding this comment

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

Is this still a to-do?

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried to implement @yuliyan's suggestion with the doAction hook, but then found it's not practical to work with.

With the hook, it's no longer enough to pass an I18n instance as a prop the I18nProvider. I also need to pass along an instance of the Hooks object, the one that was used to construct that I18n instance. Because there's no direct way to subscribe to the I18n instance, I need to go indirectly through Hooks.

Also, what if I have multiple instances of I18n created with the same instance of Hooks? That's going to happen in the "real-time locale switcher" use case. Then the doAction hook would need to receive the I18n instance as a parameter, and the callback would need to check if the action fired for our instance, or for someone else.

In the end, I'm finding a I18n.subscribe method to be more practical.

@github-actions
Copy link

github-actions bot commented Jan 29, 2021

Size Change: -26 B (0%)

Total Size: 1.37 MB

Filename Size Change
build/annotations/index.js 3.78 kB +5 B (0%)
build/api-fetch/index.js 3.4 kB -1 B (0%)
build/autop/index.js 2.84 kB -2 B (0%)
build/block-directory/index.js 9.09 kB -2 B (0%)
build/block-editor/index.js 123 kB -2 B (0%)
build/block-library/index.js 145 kB -22 B (0%)
build/block-serialization-default-parser/index.js 1.88 kB -1 B (0%)
build/blocks/index.js 48.2 kB +1 B (0%)
build/components/index.js 270 kB +2 B (0%)
build/compose/index.js 11 kB -3 B (0%)
build/core-data/index.js 16.8 kB -1 B (0%)
build/customize-widgets/index.js 4.08 kB -1 B (0%)
build/data/index.js 8.86 kB -1 B (0%)
build/dom/index.js 4.94 kB +1 B (0%)
build/edit-navigation/index.js 10.5 kB -4 B (0%)
build/edit-post/index.js 307 kB +1 B (0%)
build/editor/index.js 41.8 kB -5 B (0%)
build/format-library/index.js 6.77 kB +6 B (0%)
build/i18n/index.js 4.01 kB -1 B (0%)
build/keyboard-shortcuts/index.js 2.53 kB +1 B (0%)
build/keycodes/index.js 1.93 kB +5 B (0%)
build/media-utils/index.js 5.35 kB +1 B (0%)
build/notices/index.js 1.85 kB +1 B (0%)
build/plugins/index.js 2.54 kB -1 B (0%)
build/redux-routine/index.js 2.84 kB +1 B (0%)
build/rich-text/index.js 13.4 kB -1 B (0%)
build/url/index.js 3.01 kB -2 B (0%)
build/viewport/index.js 1.85 kB -2 B (0%)
build/wordcount/index.js 1.22 kB +1 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/blob/index.js 665 B 0 B
build/block-directory/style-rtl.css 1.01 kB 0 B
build/block-directory/style.css 1.01 kB 0 B
build/block-editor/style-rtl.css 12.1 kB 0 B
build/block-editor/style.css 12.1 kB 0 B
build/block-library/blocks/archives/editor-rtl.css 61 B 0 B
build/block-library/blocks/archives/editor.css 60 B 0 B
build/block-library/blocks/audio/editor-rtl.css 58 B 0 B
build/block-library/blocks/audio/editor.css 58 B 0 B
build/block-library/blocks/audio/style-rtl.css 103 B 0 B
build/block-library/blocks/audio/style.css 103 B 0 B
build/block-library/blocks/block/editor-rtl.css 161 B 0 B
build/block-library/blocks/block/editor.css 161 B 0 B
build/block-library/blocks/button/editor-rtl.css 475 B 0 B
build/block-library/blocks/button/editor.css 474 B 0 B
build/block-library/blocks/button/style-rtl.css 465 B 0 B
build/block-library/blocks/button/style.css 464 B 0 B
build/block-library/blocks/buttons/editor-rtl.css 233 B 0 B
build/block-library/blocks/buttons/editor.css 233 B 0 B
build/block-library/blocks/buttons/style-rtl.css 303 B 0 B
build/block-library/blocks/buttons/style.css 303 B 0 B
build/block-library/blocks/calendar/style-rtl.css 208 B 0 B
build/block-library/blocks/calendar/style.css 208 B 0 B
build/block-library/blocks/categories/editor-rtl.css 84 B 0 B
build/block-library/blocks/categories/editor.css 83 B 0 B
build/block-library/blocks/categories/style-rtl.css 79 B 0 B
build/block-library/blocks/categories/style.css 79 B 0 B
build/block-library/blocks/code/style-rtl.css 90 B 0 B
build/block-library/blocks/code/style.css 90 B 0 B
build/block-library/blocks/columns/editor-rtl.css 190 B 0 B
build/block-library/blocks/columns/editor.css 190 B 0 B
build/block-library/blocks/columns/style-rtl.css 421 B 0 B
build/block-library/blocks/columns/style.css 421 B 0 B
build/block-library/blocks/cover/editor-rtl.css 390 B 0 B
build/block-library/blocks/cover/editor.css 389 B 0 B
build/block-library/blocks/cover/style-rtl.css 1.25 kB 0 B
build/block-library/blocks/cover/style.css 1.25 kB 0 B
build/block-library/blocks/embed/editor-rtl.css 486 B 0 B
build/block-library/blocks/embed/editor.css 486 B 0 B
build/block-library/blocks/embed/style-rtl.css 396 B 0 B
build/block-library/blocks/embed/style.css 395 B 0 B
build/block-library/blocks/file/editor-rtl.css 199 B 0 B
build/block-library/blocks/file/editor.css 198 B 0 B
build/block-library/blocks/file/style-rtl.css 248 B 0 B
build/block-library/blocks/file/style.css 248 B 0 B
build/block-library/blocks/freeform/editor-rtl.css 2.45 kB 0 B
build/block-library/blocks/freeform/editor.css 2.45 kB 0 B
build/block-library/blocks/gallery/editor-rtl.css 679 B 0 B
build/block-library/blocks/gallery/editor.css 679 B 0 B
build/block-library/blocks/gallery/style-rtl.css 1.07 kB 0 B
build/block-library/blocks/gallery/style.css 1.06 kB 0 B
build/block-library/blocks/group/editor-rtl.css 318 B 0 B
build/block-library/blocks/group/editor.css 317 B 0 B
build/block-library/blocks/group/style-rtl.css 57 B 0 B
build/block-library/blocks/group/style.css 57 B 0 B
build/block-library/blocks/heading/editor-rtl.css 129 B 0 B
build/block-library/blocks/heading/editor.css 129 B 0 B
build/block-library/blocks/heading/style-rtl.css 76 B 0 B
build/block-library/blocks/heading/style.css 76 B 0 B
build/block-library/blocks/html/editor-rtl.css 281 B 0 B
build/block-library/blocks/html/editor.css 281 B 0 B
build/block-library/blocks/image/editor-rtl.css 717 B 0 B
build/block-library/blocks/image/editor.css 716 B 0 B
build/block-library/blocks/image/style-rtl.css 477 B 0 B
build/block-library/blocks/image/style.css 478 B 0 B
build/block-library/blocks/latest-comments/editor-rtl.css 159 B 0 B
build/block-library/blocks/latest-comments/editor.css 158 B 0 B
build/block-library/blocks/latest-comments/style-rtl.css 269 B 0 B
build/block-library/blocks/latest-comments/style.css 269 B 0 B
build/block-library/blocks/latest-posts/editor-rtl.css 137 B 0 B
build/block-library/blocks/latest-posts/editor.css 137 B 0 B
build/block-library/blocks/latest-posts/style-rtl.css 523 B 0 B
build/block-library/blocks/latest-posts/style.css 522 B 0 B
build/block-library/blocks/list/editor-rtl.css 65 B 0 B
build/block-library/blocks/list/editor.css 65 B 0 B
build/block-library/blocks/list/style-rtl.css 63 B 0 B
build/block-library/blocks/list/style.css 63 B 0 B
build/block-library/blocks/media-text/editor-rtl.css 191 B 0 B
build/block-library/blocks/media-text/editor.css 191 B 0 B
build/block-library/blocks/media-text/style-rtl.css 535 B 0 B
build/block-library/blocks/media-text/style.css 532 B 0 B
build/block-library/blocks/more/editor-rtl.css 434 B 0 B
build/block-library/blocks/more/editor.css 434 B 0 B
build/block-library/blocks/navigation-link/editor-rtl.css 395 B 0 B
build/block-library/blocks/navigation-link/editor.css 397 B 0 B
build/block-library/blocks/navigation-link/style-rtl.css 704 B 0 B
build/block-library/blocks/navigation-link/style.css 702 B 0 B
build/block-library/blocks/navigation/editor-rtl.css 1.34 kB 0 B
build/block-library/blocks/navigation/editor.css 1.34 kB 0 B
build/block-library/blocks/navigation/style-rtl.css 195 B 0 B
build/block-library/blocks/navigation/style.css 195 B 0 B
build/block-library/blocks/nextpage/editor-rtl.css 395 B 0 B
build/block-library/blocks/nextpage/editor.css 395 B 0 B
build/block-library/blocks/page-list/editor-rtl.css 214 B 0 B
build/block-library/blocks/page-list/editor.css 214 B 0 B
build/block-library/blocks/page-list/style-rtl.css 527 B 0 B
build/block-library/blocks/page-list/style.css 526 B 0 B
build/block-library/blocks/paragraph/editor-rtl.css 109 B 0 B
build/block-library/blocks/paragraph/editor.css 109 B 0 B
build/block-library/blocks/paragraph/style-rtl.css 273 B 0 B
build/block-library/blocks/paragraph/style.css 273 B 0 B
build/block-library/blocks/post-author/editor-rtl.css 209 B 0 B
build/block-library/blocks/post-author/editor.css 209 B 0 B
build/block-library/blocks/post-author/style-rtl.css 183 B 0 B
build/block-library/blocks/post-author/style.css 184 B 0 B
build/block-library/blocks/post-comments-form/style-rtl.css 250 B 0 B
build/block-library/blocks/post-comments-form/style.css 250 B 0 B
build/block-library/blocks/post-content/editor-rtl.css 139 B 0 B
build/block-library/blocks/post-content/editor.css 139 B 0 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B 0 B
build/block-library/blocks/post-excerpt/editor.css 73 B 0 B
build/block-library/blocks/post-featured-image/editor-rtl.css 338 B 0 B
build/block-library/blocks/post-featured-image/editor.css 338 B 0 B
build/block-library/blocks/post-featured-image/style-rtl.css 100 B 0 B
build/block-library/blocks/post-featured-image/style.css 100 B 0 B
build/block-library/blocks/preformatted/style-rtl.css 63 B 0 B
build/block-library/blocks/preformatted/style.css 63 B 0 B
build/block-library/blocks/pullquote/editor-rtl.css 183 B 0 B
build/block-library/blocks/pullquote/editor.css 183 B 0 B
build/block-library/blocks/pullquote/style-rtl.css 316 B 0 B
build/block-library/blocks/pullquote/style.css 316 B 0 B
build/block-library/blocks/query-loop/editor-rtl.css 90 B 0 B
build/block-library/blocks/query-loop/editor.css 89 B 0 B
build/block-library/blocks/query-loop/style-rtl.css 315 B 0 B
build/block-library/blocks/query-loop/style.css 317 B 0 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B 0 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B 0 B
build/block-library/blocks/query-pagination/editor-rtl.css 270 B 0 B
build/block-library/blocks/query-pagination/editor.css 262 B 0 B
build/block-library/blocks/query-pagination/style-rtl.css 168 B 0 B
build/block-library/blocks/query-pagination/style.css 168 B 0 B
build/block-library/blocks/query/editor-rtl.css 159 B 0 B
build/block-library/blocks/query/editor.css 160 B 0 B
build/block-library/blocks/quote/editor-rtl.css 61 B 0 B
build/block-library/blocks/quote/editor.css 61 B 0 B
build/block-library/blocks/quote/style-rtl.css 169 B 0 B
build/block-library/blocks/quote/style.css 169 B 0 B
build/block-library/blocks/rss/editor-rtl.css 201 B 0 B
build/block-library/blocks/rss/editor.css 202 B 0 B
build/block-library/blocks/rss/style-rtl.css 290 B 0 B
build/block-library/blocks/rss/style.css 290 B 0 B
build/block-library/blocks/search/editor-rtl.css 165 B 0 B
build/block-library/blocks/search/editor.css 165 B 0 B
build/block-library/blocks/search/style-rtl.css 342 B 0 B
build/block-library/blocks/search/style.css 344 B 0 B
build/block-library/blocks/separator/editor-rtl.css 99 B 0 B
build/block-library/blocks/separator/editor.css 99 B 0 B
build/block-library/blocks/separator/style-rtl.css 236 B 0 B
build/block-library/blocks/separator/style.css 236 B 0 B
build/block-library/blocks/shortcode/editor-rtl.css 504 B 0 B
build/block-library/blocks/shortcode/editor.css 504 B 0 B
build/block-library/blocks/site-logo/editor-rtl.css 201 B 0 B
build/block-library/blocks/site-logo/editor.css 201 B 0 B
build/block-library/blocks/site-logo/style-rtl.css 117 B 0 B
build/block-library/blocks/site-logo/style.css 117 B 0 B
build/block-library/blocks/social-link/editor-rtl.css 164 B 0 B
build/block-library/blocks/social-link/editor.css 165 B 0 B
build/block-library/blocks/social-links/editor-rtl.css 696 B 0 B
build/block-library/blocks/social-links/editor.css 696 B 0 B
build/block-library/blocks/social-links/style-rtl.css 1.37 kB 0 B
build/block-library/blocks/social-links/style.css 1.37 kB 0 B
build/block-library/blocks/spacer/editor-rtl.css 302 B 0 B
build/block-library/blocks/spacer/editor.css 302 B 0 B
build/block-library/blocks/spacer/style-rtl.css 48 B 0 B
build/block-library/blocks/spacer/style.css 48 B 0 B
build/block-library/blocks/subhead/editor-rtl.css 99 B 0 B
build/block-library/blocks/subhead/editor.css 99 B 0 B
build/block-library/blocks/subhead/style-rtl.css 80 B 0 B
build/block-library/blocks/subhead/style.css 80 B 0 B
build/block-library/blocks/table/editor-rtl.css 489 B 0 B
build/block-library/blocks/table/editor.css 489 B 0 B
build/block-library/blocks/table/style-rtl.css 386 B 0 B
build/block-library/blocks/table/style.css 386 B 0 B
build/block-library/blocks/tag-cloud/editor-rtl.css 118 B 0 B
build/block-library/blocks/tag-cloud/editor.css 118 B 0 B
build/block-library/blocks/tag-cloud/style-rtl.css 94 B 0 B
build/block-library/blocks/tag-cloud/style.css 94 B 0 B
build/block-library/blocks/template-part/editor-rtl.css 557 B 0 B
build/block-library/blocks/template-part/editor.css 556 B 0 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B 0 B
build/block-library/blocks/text-columns/editor.css 95 B 0 B
build/block-library/blocks/text-columns/style-rtl.css 166 B 0 B
build/block-library/blocks/text-columns/style.css 166 B 0 B
build/block-library/blocks/verse/editor-rtl.css 62 B 0 B
build/block-library/blocks/verse/editor.css 62 B 0 B
build/block-library/blocks/verse/style-rtl.css 87 B 0 B
build/block-library/blocks/verse/style.css 87 B 0 B
build/block-library/blocks/video/editor-rtl.css 504 B 0 B
build/block-library/blocks/video/editor.css 503 B 0 B
build/block-library/blocks/video/style-rtl.css 193 B 0 B
build/block-library/blocks/video/style.css 193 B 0 B
build/block-library/common-rtl.css 1.01 kB 0 B
build/block-library/common.css 1.01 kB 0 B
build/block-library/editor-rtl.css 9.04 kB 0 B
build/block-library/editor.css 9.03 kB 0 B
build/block-library/style-rtl.css 8.8 kB 0 B
build/block-library/style.css 8.8 kB 0 B
build/block-library/theme-rtl.css 748 B 0 B
build/block-library/theme.css 748 B 0 B
build/block-serialization-spec-parser/index.js 3.06 kB 0 B
build/components/style-rtl.css 15.5 kB 0 B
build/components/style.css 15.5 kB 0 B
build/customize-widgets/style-rtl.css 168 B 0 B
build/customize-widgets/style.css 168 B 0 B
build/data-controls/index.js 827 B 0 B
build/date/index.js 31.8 kB 0 B
build/deprecated/index.js 769 B 0 B
build/dom-ready/index.js 570 B 0 B
build/edit-navigation/style-rtl.css 1.11 kB 0 B
build/edit-navigation/style.css 1.11 kB 0 B
build/edit-post/style-rtl.css 6.79 kB 0 B
build/edit-post/style.css 6.78 kB 0 B
build/edit-site/index.js 24.8 kB 0 B
build/edit-site/style-rtl.css 4.04 kB 0 B
build/edit-site/style.css 4.04 kB 0 B
build/edit-widgets/index.js 20 kB 0 B
build/edit-widgets/style-rtl.css 3.2 kB 0 B
build/edit-widgets/style.css 3.2 kB 0 B
build/editor/editor-styles-rtl.css 543 B 0 B
build/editor/editor-styles.css 545 B 0 B
build/editor/style-rtl.css 3.89 kB 0 B
build/editor/style.css 3.89 kB 0 B
build/element/index.js 4.61 kB 0 B
build/escape-html/index.js 735 B 0 B
build/format-library/style-rtl.css 637 B 0 B
build/format-library/style.css 639 B 0 B
build/hooks/index.js 2.28 kB 0 B
build/html-entities/index.js 622 B 0 B
build/is-shallow-equal/index.js 699 B 0 B
build/list-reusable-blocks/index.js 3.15 kB 0 B
build/list-reusable-blocks/style-rtl.css 629 B 0 B
build/list-reusable-blocks/style.css 628 B 0 B
build/nux/index.js 3.41 kB 0 B
build/nux/style-rtl.css 731 B 0 B
build/nux/style.css 727 B 0 B
build/primitives/index.js 1.42 kB 0 B
build/priority-queue/index.js 791 B 0 B
build/react-i18n/index.js 1.45 kB 0 B
build/reusable-blocks/index.js 2.92 kB 0 B
build/server-side-render/index.js 2.77 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/warning/index.js 1.14 kB 0 B

compressed-size-action

@jsnajdr
Copy link
Member Author

jsnajdr commented Jan 29, 2021

Can we make the return value be filtered here.

@leewillis77 I'll try to add the filter. I'll need to figure out which filter to call: i18n.gettext, i18n.ngettext, the _with_context variants?

@leewillis77
Copy link
Contributor

Can we make the return value be filtered here.

@leewillis77 I'll try to add the filter. I'll need to figure out which filter to call: i18n.gettext, i18n.ngettext, the _with_context variants?

I think it should be a new filter, something like:

let hasTranslation = tannin.data[ domain ] && key in tannin.data[ domain ];
return applyFilters( 'i18n.has-translation', hasTranslation, singular, context, domain );

Type annotations are probably required on the return value from applyFilters. The only other complication is that unsupplied values are passed as undefined to the other filters, whereas it looks like you'd pass "default" here (e.g. for WordPress core strings which have no text-domain).

@jsnajdr jsnajdr force-pushed the add/react-i18n branch 2 times, most recently from 4d1f992 to d45668a Compare February 1, 2021 12:07
Copy link
Member

@sirreal sirreal left a comment

Choose a reason for hiding this comment

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

Very exciting to see this coming together, I left a few quick notes.

I was working on some tooling updates to support TypeScript but haven't been able to finish. It would be nice to get those landed: #27143

"compilerOptions": {
"rootDir": "src",
"declarationDir": "build-types",
"jsx": "preserve"
Copy link
Member

Choose a reason for hiding this comment

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

Because we don't rely on TypeScript compiling jsx, I think we can move this to the base config.

Copy link
Member Author

Choose a reason for hiding this comment

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

Turns out the jsx options already is in the base config. I don't know why I felt I need to add it here, too. Removed in the latest commit.

bin/packages/build-worker.js Outdated Show resolved Hide resolved
bin/packages/build-worker.js Outdated Show resolved Hide resolved
@swissspidy
Copy link
Member

I feel like the TS build tooling changes should be done in a separate PR.

Does the rest of the core team agree that this move to TS makes sense?

Aside: why not .ts instead of .tsx? The project already doesn't use .jsx for JSX files and I don't think we should start doing that.

@sirreal
Copy link
Member

sirreal commented Feb 1, 2021

I feel like the TS build tooling changes should be done in a separate PR.

I agree, that would be nice to isolate.

Aside: why not .ts instead of .tsx? The project already doesn't use .jsx for JSX files and I don't think we should start doing that.

TypeScript requires TypeScript files that include JSX to use the .tsx extension for technical reasons related to some syntax:

Recall how to write a type assertion:
var foo = <foo>bar;
This asserts the variable bar to have the type foo. Since TypeScript also uses angle brackets for type assertions, combining it with JSX’s syntax would introduce certain parsing difficulties. As a result, TypeScript disallows angle bracket type assertions in .tsx files.

This is very minor in practice, but does require using .tsx. This is unlike JavaScript where the .jsx extension is a convention that doesn't convey much relevant information in my experience.

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 1, 2021

I feel like the TS build tooling changes should be done in a separate PR.

I agree, I'm trying to make the entire package work end-to-end and figure out what it takes. Then we can merge independent parts incrementally.

Aside: why not .ts instead of .tsx?

I was getting TypeScript compiler errors where it couldn't recognize the JSX syntax unless the file had a .tsx extension. Now, when I changed .tsx to .ts, the errors didn't come back 😕 Maybe it was the TypeScript 4.0 to 4.1 upgrade that @sirreal did recently? I don't know. Anyway, I'm pushing a commit where I'm changing .tsx to .ts.

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 1, 2021

OK, as @sirreal explains, the .tsx extension is needed after all. With just .ts, npm run build:package-types (and the tsc --build it ran) was reporting syntax errors after encountering JSX syntax.

@leewillis77
Copy link
Contributor

The Javascript standards don't seem to be clear on case selection for filter names. The closest I can find would be this which suggests "camel case with a lower case first letter":

https://developer.wordpress.org/coding-standards/wordpress-coding-standards/javascript/#naming-conventions

If that seems sensible then I'll:

  • Raise a PR to get the current gettext filters updated (to get in before the final GB 9.9/ WP 5.7 releases
  • Try and work out how to raise an issue to get the standards clarified

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 3, 2021

@leewillis77 The coding standard specifies only names for variables and functions, not for hooks identifiers, as far as I see.

Consistency with WordPress Core PHP hook names is a very strong argument in favor of i18n.gettext_context. Especially for classes like I18n that have a 1:1 counterpart between JS and PHP. I wouldn't hurry to change these names.

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 4, 2021

@leewillis77 FYI that I renamed the hasTranslation filter to has_translation. All filters in i18n have nice consistent names, at least internally within the package.

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 4, 2021

Status of this PR:

All the changes I wanted here are done and all checks are green. Time to start merging this step-by-step. There are three broad areas where this PR modifies things:

  • setup the build pipeline (Babel, build scripts, docgen) to support TypeScript sources
  • add several new APIs to the @wordpress/i18n and @wordpress/hooks packages that are needed to make the react-i18n bindings work, and to make them simple
  • the actual react-i18n bindings themselves. The source is 100% TypeScript, with native type annotations instead of JSDoc.

@@ -395,7 +395,7 @@ export const createI18n = ( initialData, initialDomain, hooks ) => {
*/
result = /** @type { boolean } */ (
/** @type {*} */ hooks.applyFilters(
'i18n.hasTranslation',
'i18n.has_translation',
result,
single,
context,
Copy link
Contributor

Choose a reason for hiding this comment

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

"domain" here is still being passed to filters as "default" rather than "undefined" for calls with no domain due to the default value in the method signature. That's different behaviour from the other i18n. filters so would be nice to standardise.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the reminder, fixed in 43c0fff 🚀

@jsnajdr jsnajdr force-pushed the add/react-i18n branch 3 times, most recently from e494dab to 76cb431 Compare February 9, 2021 12:23
@jsnajdr jsnajdr changed the base branch from master to add/typescript-build-support February 9, 2021 12:35
Base automatically changed from add/typescript-build-support to master February 11, 2021 06:46
@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 11, 2021

I feel like the TS build tooling changes should be done in a separate PR.

@swissspidy This dream has finally come true 🙂 The i18n API improvements were merged in #28784, the TypeScript build tooling was merged in #28879 and now this branch contains just the react-i18n package and nothing else. Ready for final review and merge.

@swissspidy
Copy link
Member

I feel like the TS build tooling changes should be done in a separate PR.

@swissspidy This dream has finally come true 🙂 The i18n API improvements were merged in #28784, the TypeScript build tooling was merged in #28879 and now this branch contains just the react-i18n package and nothing else. Ready for final review and merge.

Yay :-) nice work!

Looks good to me even though I personally wouldn't have written it in TS in the first place :-)

@jsnajdr
Copy link
Member Author

jsnajdr commented Feb 11, 2021

Thanks everyone for collaboration ❤️ Going to merge the PR now.

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 [Package] i18n /packages/i18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants