Skip to content

Include strings referenced in GB-mobile files in localization strings files #4410

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 4 commits into from
Jan 5, 2022
Merged

Include strings referenced in GB-mobile files in localization strings files #4410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17713d6
Add makepot commands for gutenberg mobile strings
fluiddot Dec 29, 2021
0087d8c
Update localization strings files
fluiddot Dec 29, 2021
4d4fac0
Update release notes
fluiddot Dec 29, 2021
6df00c5
Merge branch 'develop' into add/gb-mobile-strings
fluiddot Jan 5, 2022
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Unreleased
* [*] Give multi-line block names central alignment in inserter [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4343]
* [**] Fix missing translations by refactoring the editor initialization code [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4332]
* [**] Add Jetpack and Layout Grid translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4359]
* [*] Add missing translations of unsupported block editor modal [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4410]

1.68.0
---
Expand Down
3 changes: 3 additions & 0 deletions bundle/android/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,13 @@ translators: %s: Select control button label e.g. "Button width" -->
<string name="gutenberg_native_no_preview_available" tools:ignore="UnusedResources">No preview available</string>
<string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Column layout may vary between themes and screen sizes</string>
<string name="gutenberg_native_note_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Layout may vary between themes and screen sizes</string>
<string name="gutenberg_native_note_you_must_allow_wordpress_com_login_to_edit_this_block_in_the" tools:ignore="UnusedResources">Note: You must allow WordPress.com login to edit this block in the mobile editor.</string>
<string name="gutenberg_native_number_of_columns" tools:ignore="UnusedResources">Number of columns</string>
<string name="gutenberg_native_once_you_become_familiar_with_the_names_of_different_blocks_you_c" tools:ignore="UnusedResources">Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading.</string>
<string name="gutenberg_native_only_show_excerpt" tools:ignore="UnusedResources">Only show excerpt</string>
<string name="gutenberg_native_open" tools:ignore="UnusedResources">OPEN</string>
<string name="gutenberg_native_open_block_actions_menu" tools:ignore="UnusedResources">Open Block Actions Menu</string>
<string name="gutenberg_native_open_jetpack_security_settings" tools:ignore="UnusedResources">Open Jetpack Security settings</string>
<string name="gutenberg_native_open_link_in_a_browser" tools:ignore="UnusedResources">Open link in a browser</string>
<string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
<string name="gutenberg_native_outside" tools:ignore="UnusedResources">Outside</string>
Expand Down Expand Up @@ -350,5 +352,6 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
<string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
<string name="gutenberg_native_x_axis_position" tools:ignore="UnusedResources">X–Axis Position</string>
<string name="gutenberg_native_y_axis_position" tools:ignore="UnusedResources">Y–Axis Position</string>
<string name="gutenberg_native_you_can_edit_this_block_using_the_web_version_of_the_editor" tools:ignore="UnusedResources">You can edit this block using the web version of the editor.</string>
<string name="gutenberg_native_you_can_rearrange_blocks_by_tapping_a_block_and_then_tapping_the" tools:ignore="UnusedResources">You can rearrange blocks by tapping a block and then tapping the up and down arrows that appear on the bottom left side of the block to move it above or below other blocks.</string>
</resources>
3 changes: 3 additions & 0 deletions bundle/ios/GutenbergNativeTranslations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,13 @@ private func dummy() {
_ = NSLocalizedString("No preview available", comment: "")
_ = NSLocalizedString("Note: Column layout may vary between themes and screen sizes", comment: "")
_ = NSLocalizedString("Note: Layout may vary between themes and screen sizes", comment: "")
_ = NSLocalizedString("Note: You must allow WordPress.com login to edit this block in the mobile editor.", comment: "")
_ = NSLocalizedString("Number of columns", comment: "")
_ = NSLocalizedString("Once you become familiar with the names of different blocks, you can add a block by typing a forward slash followed by the block name — for example, /image or /heading.", comment: "")
_ = NSLocalizedString("Only show excerpt", comment: "")
_ = NSLocalizedString("OPEN", comment: "")
_ = NSLocalizedString("Open Block Actions Menu", comment: "")
_ = NSLocalizedString("Open Jetpack Security settings", comment: "")
_ = NSLocalizedString("Open link in a browser", comment: "")
_ = NSLocalizedString("Open Settings", comment: "")
_ = NSLocalizedString("Outside", comment: "")
Expand Down Expand Up @@ -293,4 +295,5 @@ private func dummy() {
_ = NSLocalizedString("WordPress Media Library", comment: "")
_ = NSLocalizedString("X-Axis Position", comment: "")
_ = NSLocalizedString("Y-Axis Position", comment: "")
_ = NSLocalizedString("You can edit this block using the web version of the editor.", comment: "")
_ = NSLocalizedString("You can rearrange blocks by tapping a block and then tapping the up and down arrows that appear on the bottom left side of the block to move it above or below other blocks.", comment: "")
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@
"update:wpcli": "bin/wp-cli.phar cli update --nightly --yes && bin/wp-cli.phar --info",
"prewp": "npm run install:wpcli && npm run update:wpcli",
"wp": "php -d memory_limit=4G bin/wp-cli.phar",
"makepot:android:gutenberg-mobile": "npm run wp -- i18n make-pot ./src --include=*.js,*.native.js,*.android.js --exclude=test/* --subtract=./gutenberg.pot --ignore-domain gutenberg-mobile-android.pot",
"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 --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-mobile": "npm run wp -- i18n make-pot ./src --include=*.js,*.native.js,*.ios.js --exclude=test/* --subtract=./gutenberg.pot --ignore-domain gutenberg-mobile-ios.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 --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",
Expand All @@ -87,8 +89,8 @@
"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",
"genstrings:ios": "npm run makepot:ios:gutenberg && npm run makepot:ios:jetpack && npm run makepot:ios:layout-grid && ./bin/po2swift.js bundle/ios/GutenbergNativeTranslations.swift gutenberg-ios.pot jetpack-ios.pot layout-grid-ios.pot",
"genstrings:android": "npm run makepot:android:gutenberg && npm run makepot:android:gutenberg-mobile && npm run makepot:android:jetpack && npm run makepot:android:layout-grid && ./bin/po2android.js bundle/android/strings.xml gutenberg-android.pot gutenberg-mobile-android.pot jetpack-android.pot layout-grid-android.pot",
"genstrings:ios": "npm run makepot:ios:gutenberg && npm run makepot:ios:gutenberg-mobile && npm run makepot:ios:jetpack && npm run makepot:ios:layout-grid && ./bin/po2swift.js bundle/ios/GutenbergNativeTranslations.swift gutenberg-ios.pot gutenberg-mobile-ios.pot jetpack-ios.pot layout-grid-ios.pot",
"prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android",
"wpandroid": "cd gutenberg && react-native run-android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity",
"test": "cross-env NODE_ENV=test jest --verbose --config ./jest.config.js",
Expand Down