Skip to content

Specify domain when extracting strings from Jetpack and Layout Grid #4409

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

Merged
fluiddot merged 2 commits into from
Jan 5, 2022
Merged

Specify domain when extracting strings from Jetpack and Layout Grid #4409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36e4698
Use domain in jetpack and layout-grid makepot commands
fluiddot Dec 29, 2021
50fc41c
Update localization strings files
fluiddot Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/android/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<string name="gutenberg_native_build_layouts" tools:ignore="UnusedResources">Build layouts</string>
<string name="gutenberg_native_button_link_url" tools:ignore="UnusedResources">Button Link URL</string>
<string name="gutenberg_native_button_position" tools:ignore="UnusedResources">Button position</string>
<string name="gutenberg_native_cancel" tools:ignore="UnusedResources">Cancel</string>
Copy link
Copy Markdown
Contributor Author

@fluiddot fluiddot Dec 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

  • Referenced in block-experiments/blocks/layout-grid/src/grid/variation-control/index.native.js (reference)
  • Translated in Gutenberg GlotPress project (reference)

<string name="gutenberg_native_cancel_search" tools:ignore="UnusedResources">Cancel search</string>
<string name="gutenberg_native_change_block_position" tools:ignore="UnusedResources">Change block position</string>
<string name="gutenberg_native_changes_to_featured_image_will_not_be_affected_by_the_undo_redo_b" tools:ignore="UnusedResources">Changes to featured image will not be affected by the undo/redo buttons.</string>
Expand Down Expand Up @@ -320,6 +319,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
<string name="gutenberg_native_take_a_video" tools:ignore="UnusedResources">Take a Video</string>
<string name="gutenberg_native_tap_here_to_show_help" tools:ignore="UnusedResources">Tap here to show help</string>
<string name="gutenberg_native_tap_to_hide_the_keyboard" tools:ignore="UnusedResources">Tap to hide the keyboard</string>
<string name="gutenberg_native_text_color" tools:ignore="UnusedResources">Text color</string>
Copy link
Copy Markdown
Contributor Author

@fluiddot fluiddot Dec 29, 2021

Choose a reason for hiding this comment

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

This is a new string that has been recently added (PR reference).

  • Referenced in gutenberg/packages/format-library/src/text-color/index.native.js (reference)
  • Already translated in Gutenberg GlotPress project (reference) but since it's only referenced in a *.native.js file, it will most likely be removed eventually.

<string name="gutenberg_native_text_formatting_controls_are_located_within_the_toolbar_positione" tools:ignore="UnusedResources">Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block</string>
<string name="gutenberg_native_the_basics" tools:ignore="UnusedResources">The basics</string>
<string name="gutenberg_native_to_remove_a_block_select_the_block_and_click_the_three_dots_in_th" tools:ignore="UnusedResources">To remove a block, select the block and click the three dots in the bottom right of the block to view the settings. From there, choose the option to remove the block.</string>
Expand Down
2 changes: 1 addition & 1 deletion bundle/ios/GutenbergNativeTranslations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ private func dummy() {
_ = NSLocalizedString("Build layouts", comment: "")
_ = NSLocalizedString("Button Link URL", comment: "")
_ = NSLocalizedString("Button position", comment: "")
_ = NSLocalizedString("Cancel", comment: "")
_ = NSLocalizedString("Cancel search", comment: "")
_ = NSLocalizedString("Change block position", comment: "")
_ = NSLocalizedString("Changes to featured image will not be affected by the undo/redo buttons.", comment: "")
Expand Down Expand Up @@ -268,6 +267,7 @@ private func dummy() {
_ = NSLocalizedString("Take a Video", comment: "")
_ = NSLocalizedString("Tap here to show help", comment: "")
_ = NSLocalizedString("Tap to hide the keyboard", comment: "")
_ = NSLocalizedString("Text color", comment: "")
_ = NSLocalizedString("Text formatting controls are located within the toolbar positioned above the keyboard while editing a text block", comment: "")
_ = NSLocalizedString("The basics", comment: "")
_ = NSLocalizedString("To remove a block, select the block and click the three dots in the bottom right of the block to view the settings. From there, choose the option to remove the block.", comment: "")
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@
"prewp": "npm run install:wpcli && npm run update:wpcli",
"wp": "php -d memory_limit=4G bin/wp-cli.phar",
"makepot:android:gutenberg": "npm run wp -- i18n make-pot ./gutenberg/packages --include=*.native.js,*.android.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./gutenberg.pot --ignore-domain gutenberg-android.pot",
"makepot:android:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --include=*.native.js,*.android.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./jetpack.pot --ignore-domain jetpack-android.pot",
"makepot:android:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --include=*.native.js,*.android.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./layout-grid.pot --ignore-domain layout-grid-android.pot",
"makepot:android:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --include=*.native.js,*.android.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./jetpack.pot --domain=jetpack jetpack-android.pot",
"makepot:android:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --include=*.native.js,*.android.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./layout-grid.pot --domain=layout-grid layout-grid-android.pot",
"makepot:ios:gutenberg": "npm run wp -- i18n make-pot ./gutenberg/packages --include=*.native.js,*.ios.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./gutenberg.pot --ignore-domain gutenberg-ios.pot",
"makepot:ios:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --include=*.native.js,*.ios.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./jetpack.pot --ignore-domain jetpack-ios.pot",
"makepot:ios:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --include=*.native.js,*.ios.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./layout-grid.pot --ignore-domain layout-grid-ios.pot",
"makepot:ios:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --include=*.native.js,*.ios.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./jetpack.pot --domain=jetpack jetpack-ios.pot",
"makepot:ios:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --include=*.native.js,*.ios.js --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/* --skip-php --subtract=./layout-grid.pot --domain=layout-grid layout-grid-ios.pot",
"premakepot:gutenberg": "npm run clean:gutenberg && npm run build:gutenberg",
"makepot:gutenberg": "npm run wp -- i18n make-pot ./gutenberg/packages --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/*,*.native.js,*.ios.js,*.android.js,bundle/* --ignore-domain gutenberg.pot",
"postmakepot:gutenberg": "npm run clean:gutenberg",
"makepot:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/*,*.native.js,*.ios.js,*.android.js,bundle/* --ignore-domain jetpack.pot",
"makepot:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/*,*.native.js,*.ios.js,*.android.js,bundle/* --ignore-domain layout-grid.pot",
"makepot:jetpack": "npm run wp -- i18n make-pot ./jetpack/projects/plugins/jetpack/extensions --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/*,*.native.js,*.ios.js,*.android.js,bundle/* --domain=jetpack jetpack.pot",
"makepot:layout-grid": "npm run wp -- i18n make-pot ./block-experiments/blocks/layout-grid --exclude=test/*,e2e-tests/*,build/*,build-module/*,build-style/*,*.native.js,*.ios.js,*.android.js,bundle/* --domain=layout-grid layout-grid.pot",
"pregenstrings": "npm run makepot:gutenberg && npm run makepot:jetpack && npm run makepot:layout-grid",
"genstrings": "npm run genstrings:android && npm run genstrings:ios",
"genstrings:android": "npm run makepot:android:gutenberg && npm run makepot:android:jetpack && npm run makepot:android:layout-grid && ./bin/po2android.js bundle/android/strings.xml gutenberg-android.pot jetpack-android.pot layout-grid-android.pot",
Expand Down