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 mobile Gutenberg localization to code freeze #11642

Merged
merged 2 commits into from
Apr 14, 2020

Conversation

loremattei
Copy link
Contributor

This PR adds a step in the code_freeze lane to import strings from the Gutenberg submodule into the main strings.xml.
As a first step, the script will stop and ask for a manual commit if any change to the main strings.xml is done (the script will modal-wait on the current terminal, but the changes can be reviewed and committed in another terminal).
We can automate this step when we are confident that everything works as expected.

To test:

  1. Run bundle install.
  2. Checkout a new test branch from this one.
  3. Update the Gutenberg submodule in order to include some changes in the strings.
  4. Run bundle exec fastlane localize_gutenberg (it's the same sub-lane called during the code freeze).
  5. Verify that the strings have been imported.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@loremattei loremattei added this to the 14.7 milestone Apr 10, 2020
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 10, 2020

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 10, 2020

You can test the changes on this Pull Request by downloading the APK here.

@@ -67,7 +67,9 @@ ENV["HAS_ALPHA_VERSION"]="true"
setbranchprotection(repository:GHHELPER_REPO, branch: "release/#{new_version}")
setfrozentag(repository:GHHELPER_REPO, milestone: new_version)

localize_gutenberg(skip_module_update: true)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a note to say that's great we're calling gutenberg_dep_check() before that, that should ensure the bundle, and bundled strings are up to date.

if (options[:auto_commit]) then
sh("cd .. && git add #{main_strings_path}")
sh("git commit -m 'Update strings for translation'")
sh("git push")
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we do git push origin HEAD here? Just to make sure the local git config doesn't interfere?

Copy link
Contributor Author

@loremattei loremattei Apr 14, 2020

Choose a reason for hiding this comment

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

Ah! Thank you for catching this @maxme!
It seems it's hard for me to get rid of this old habit! I'm sorry for having missed it again!
This is now updated!

Copy link
Contributor

@oguzkocer oguzkocer left a comment

Choose a reason for hiding this comment

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

This looks good to me, but I am not familiar with the Gutenberg flow, so I am leaving it to @maxme and @hypest.

@maxme maxme self-requested a review April 14, 2020 14:50
Copy link
Contributor

@maxme maxme left a comment

Choose a reason for hiding this comment

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

LGTM, thank you Lorenzo!!

@maxme maxme merged commit d34d7e4 into develop Apr 14, 2020
@maxme maxme deleted the issue/add-gutenberg-localization-to-codefreeze branch April 14, 2020 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants