Skip to content

Conversation

@ArnyminerZ
Copy link
Member

@ArnyminerZ ArnyminerZ commented Dec 25, 2025

Purpose

See #1896 and https://gitlab.com/fdroid/fdroiddata/-/issues/2323

Short description

Remove r from locales in Fastlane following BCP47 as per Fastlane requirement.

  • I've noticed that some languages were duplicated with and without r, with the same content, so I've removed the versions with r. Affected locales: en-rGB, fr-rFR, zh-rTW.
  • Moved pt-rBR to pt-BR.

Checklist

  • The PR has a proper title, description and label.
  • I have self-reviewed the PR.
  • I have added documentation to complex functions and functions that can be used by other modules.
  • I have added reasonable tests or consciously decided to not add tests.

@ArnyminerZ ArnyminerZ self-assigned this Dec 25, 2025
@ArnyminerZ ArnyminerZ added the refactoring Internal improvement of existing functions label Dec 25, 2025
@ArnyminerZ ArnyminerZ linked an issue Dec 25, 2025 that may be closed by this pull request
Copy link
Member

@rfc2822 rfc2822 left a comment

Choose a reason for hiding this comment

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

Changing the file names is not enough because they will be created again as soon as we run scripts/fetch-translations.sh (usually before a release).

I think we will have to change [.tx/config]https://github.com/bitfireAT/davx5-ose/blob/main-ose/.tx/config) so that the lang_map is applied to everything but the fastlane files.

I see there's already a comment about that:

# Attention: fastlane directories are like "en-us", not "en-rUS"!

but it's not reflected in the file_filter definitions.

Because [https://developers.transifex.com/docs/using-the-client#language-management-1]:

The "per-resource" mappings take precedence.

Maybe it's enough to add lang_map = to the fastlane resources?

@ArnyminerZ
Copy link
Member Author

The updated lang_map does work fine. I'm not sure if it's overkill, but I've copy-pasted the original from main, and removed the r.

Without it, tx stores the resources with r, now it stores them correctly.

@ArnyminerZ ArnyminerZ marked this pull request as ready for review January 12, 2026 10:01
@ArnyminerZ ArnyminerZ requested a review from a team as a code owner January 12, 2026 10:01
@ArnyminerZ ArnyminerZ requested a review from rfc2822 January 12, 2026 10:02
Copy link
Member

@rfc2822 rfc2822 left a comment

Choose a reason for hiding this comment

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

Fine for now! I think we will migrate to Transifex soon anyway so it's not worth digging too much into optimizting this.

@rfc2822 rfc2822 merged commit 07b646e into main-ose Jan 12, 2026
7 checks passed
@rfc2822 rfc2822 deleted the 1896-fastlane-directory-uses-invalid-names-for-some-locales branch January 12, 2026 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

refactoring Internal improvement of existing functions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Fastlane directory uses invalid names for some locales

2 participants