Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[CP] Fix message type inconsistency between locales (#120129) #120678

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

Merged
merged 1 commit into from
Feb 21, 2023

Conversation

AlexV525
Copy link
Member

(cherry picked from commit becb6bd)

packages/flutter_tools/lib/src/localizations/message_parser.dart could be different from the master branch. @thkim1011 could you check to ensure it's working?

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Feb 14, 2023
Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

I approve the overall cherrypicking of the upstream fix to this branch. I'll leave it @thkim1011 to give final approval that the conflict resolution is correct.

@thkim1011
Copy link
Contributor

I think this cherry pick contains changes from #116625. I think the safest approach here is to cherry pick that PR first (commit hash 583a812), so that we include the test in message_parser_test.dart as well, and then the new PR (commit hash becb6bd). Then I can try running the tests locally just to be sure everything's working properly.

@AlexV525 AlexV525 marked this pull request as ready for review February 18, 2023 06:21
@AlexV525
Copy link
Member Author

Rebased on the latest change. cc @thkim1011

Copy link
Contributor

@thkim1011 thkim1011 left a comment

Choose a reason for hiding this comment

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

LGTM

@itsjustkevin itsjustkevin merged commit b4bce91 into flutter:flutter-3.7-candidate.1 Feb 21, 2023
@AlexV525 AlexV525 deleted the cp-becb6bd branch February 21, 2023 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants