Skip to content

Conversation

@Mr-Pepe
Copy link
Contributor

@Mr-Pepe Mr-Pepe commented Sep 23, 2025

Fixes #138609

The original logic of splitting by underscore doesn't work for locales like pt_BR where the part after the underscore is itself a valid locale.

Pre-launch Checklist

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

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Sep 23, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request addresses a bug in the localization generation tool where filenames for certain locales, like pt_BR, were being parsed incorrectly. The tool would ambiguously interpret the BR country code as the br (Breton) language code, leading to a validation failure. The proposed change cleverly relaxes the validation logic to correctly handle these cases by checking if the @@locale metadata matches the filename, which is a pragmatic and effective fix. A corresponding test case has been added to ensure this scenario is covered. The change is well-targeted and resolves the issue.

@Mr-Pepe
Copy link
Contributor Author

Mr-Pepe commented Oct 7, 2025

@matanlurey You labeled the referenced issue as still valid. Are you interested in reviewing this PR?

@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 29, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Oct 29, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Oct 29, 2025

autosubmit label was removed for flutter/flutter/175832, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

@auto-submit
Copy link
Contributor

auto-submit bot commented Oct 29, 2025

autosubmit label was removed for flutter/flutter/175832, because This PR has not met approval requirements for merging. The PR author is not a member of flutter-hackers and needs 1 more review(s) in order to merge this PR.

  • Merge guidelines: A PR needs at least one approved review if the author is already part of flutter-hackers or two member reviews if the author is not a flutter-hacker before re-applying the autosubmit label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

@bkonyi bkonyi requested a review from chingjun October 29, 2025 17:29
@chingjun
Copy link
Contributor

chingjun commented Oct 29, 2025

Thank you for the contribution.

The change is basically bypassing the check if localeString == fileName. But doing it in an inner loop makes the code more difficult to understand. Can we add the check outside the loop instead?


The other issue I think the code has, is that the loop serves two purposes, to check if the locale provided is the same as in the file name, and if the locale is not provided, attempt to read the locale from the filename.

My suggestion for this PR, to make it clearer, and slightly more robust:

  1. If '@@locale' is not null, use that as the localeString. Check if filename == localeString || filename.endsWith('_' + localeString), and throw an error if it doesn't. (This check might be a breaking change to some users.)
  2. If '@@locale' is null, then we go through the for loop to determine the localeString that should be used. And make a change so that we also try to parse the whole filename as the locale, and after every underscores.

What do you think?

@chingjun
Copy link
Contributor

I just realized that I misunderstood the change when I left the comment yesterday. But I think my suggestions still apply. I've updated the comment above, thanks!

@bkonyi
Copy link
Contributor

bkonyi commented Nov 10, 2025

Hi @Mr-Pepe, are you still interested in pursuing this PR?

@Mr-Pepe
Copy link
Contributor Author

Mr-Pepe commented Nov 11, 2025

@bkonyi Yes, but I'll have to find time to fully understand @chingjun's comment

@Mr-Pepe
Copy link
Contributor Author

Mr-Pepe commented Nov 15, 2025

@chingjun I pulled the checks out of the loop. Your first suggestion is indeed a breaking change and breaks existing tests, so I did not incorporate that.

Copy link
Contributor

@chingjun chingjun left a comment

Choose a reason for hiding this comment

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

Thanks for the change! It makes the intention clearer :)

@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 25, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 25, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Nov 25, 2025

autosubmit label was removed for flutter/flutter/175832, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

@auto-submit
Copy link
Contributor

auto-submit bot commented Nov 25, 2025

autosubmit label was removed for flutter/flutter/175832, because - The status or check suite Linux web_long_running_tests_3_5 has failed. Please fix the issues identified (or deflake) before re-applying this label.

@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 25, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Nov 26, 2025
Merged via the queue into flutter:master with commit 8fed33a Nov 26, 2025
142 checks passed
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Nov 26, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 27, 2025
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Nov 27, 2025
flutter/flutter@7b98d50...022b155

2025-11-27 [email protected] Make tree green again by fixing lints (flutter/flutter#179186)
2025-11-26 [email protected] Add shared Darwin implementation for plugins (flutter/flutter#176495)
2025-11-26 [email protected] Fixed changing supportedLocales fails to update the locale (flutter/flutter#178526)
2025-11-26 [email protected] [ Tool ] Remove --no-sandbox when launching web apps on Chrome device (flutter/flutter#178670)
2025-11-26 [email protected] Build hooks: Don't require toolchain for unit tests (flutter/flutter#178954)
2025-11-26 [email protected] Fix a small typo in `HandlerCompat.java` docs (flutter/flutter#178595)
2025-11-26 [email protected] Roll Fuchsia Linux SDK from nzuAxCJGeJbkZCTkr... to _e9MNK4nfBOrERVP_... (flutter/flutter#179130)
2025-11-26 [email protected] Make sure that a CupertinoActivityIndicator doesn't crash in 0x0 envi… (flutter/flutter#178565)
2025-11-26 [email protected] [native assets] Bump minimum iOS version from 12 to 13 (flutter/flutter#179079)
2025-11-26 [email protected] Documents and fixes behavior when clipping background filter fragment shader (flutter/flutter#178940)
2025-11-26 [email protected] Replace the hardcoded link with an actual link tag in `PlatformChannel.java‎` docs (flutter/flutter#178588)
2025-11-26 [email protected] Roll Packages from cc3dca6 to 5d8d954 (5 revisions) (flutter/flutter#179140)
2025-11-26 [email protected] Add more templates that the UIScene migrator can match against (flutter/flutter#179044)
2025-11-26 [email protected] Remove deprecated activeColor in `dynamic_content_color.0.dart`‎ example (flutter/flutter#178961)
2025-11-26 [email protected] Remove deprecated `activeColor` in `decorated_sliver.1.dart‎` example (flutter/flutter#178959)
2025-11-26 [email protected] Small refactor in `PlayStoreDeferredComponentManager.java‎` (flutter/flutter#178586)
2025-11-26 [email protected] Roll Dart SDK from 9e605f706cdf to 1d8dc04bd1d7 (4 revisions) (flutter/flutter#179080)
2025-11-26 [email protected] Fix error when generating pt_BR localizations (flutter/flutter#175832)
2025-11-26 [email protected] Roll Fuchsia Test Scripts from JUeFbA8y0E-_pj-bg... to MHF-UAfO6sVKqSEYk... (flutter/flutter#179151)
2025-11-26 [email protected] Add flutter_lints to samples (flutter/flutter#179091)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
mboetger pushed a commit to mboetger/flutter that referenced this pull request Dec 2, 2025
Fixes flutter#138609

The original logic of splitting by underscore doesn't work for locales
like pt_BR where the part after the underscore is itself a valid locale.

<!--
Thanks for filing a pull request!
Reviewers are typically assigned within a week of filing a request.
To learn more about code review, see our documentation on Tree Hygiene:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
-->

## Pre-launch Checklist

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

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

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

---------

Co-authored-by: Ben Konyi <[email protected]>
reidbaker pushed a commit to AbdeMohlbi/flutter that referenced this pull request Dec 10, 2025
Fixes flutter#138609

The original logic of splitting by underscore doesn't work for locales
like pt_BR where the part after the underscore is itself a valid locale.

<!--
Thanks for filing a pull request!
Reviewers are typically assigned within a week of filing a request.
To learn more about code review, see our documentation on Tree Hygiene:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
-->

## Pre-launch Checklist

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

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

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

---------

Co-authored-by: Ben Konyi <[email protected]>
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.

Error when generating pt_BR localizations.

3 participants