Skip to content

Conversation

@tdhock
Copy link
Contributor

@tdhock tdhock commented Feb 10, 2026

Hi @cderv
As you suggested in #14012
here is a new file for fr-CA.
Does that look ok to you?
Merci !

@posit-snyk-bot
Copy link
Collaborator

posit-snyk-bot commented Feb 10, 2026

Snyk checks have passed. No issues have been found so far.

Status Scanner Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues
Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@cderv
Copy link
Collaborator

cderv commented Feb 10, 2026

Thanks for the new PR. Yes this is good !

Though I was not precise enough: there should be inheritance and merge in the sense that

  • _language-fr-CA.yml will be read
  • _language-fr.yml will be read

Both will be merged, meaning the former can only include what needs to be override in the later.

That would simplify maintenance.

To be tested for confirmation.

@tdhock
Copy link
Contributor Author

tdhock commented Feb 10, 2026

Thanks for your quick feedback.
I removed everything except the two author lines.
I don’t know how to write a test though.

Verifies that lang: fr-CA correctly applies regional overrides (Auteur(-trice)) while inheriting base French translations  (Date de publication).
Override all middle-dot author labels, not just title-block ones.
Copy link
Collaborator

@cderv cderv left a comment

Choose a reason for hiding this comment

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

Thanks @tdhock! The implementation looks correct — the minimal-override pattern (only the keys that differ from base fr.yml) is exactly the right approach, consistent with how other regional variants like de-CH.yml work.

I verified that translationsForLang() properly resolves fr-CA by loading _language-fr.yml first, then merging _language-fr-CA.yml on top. Only the overridden keys differ; all other French translations are inherited.

I've added a smoke-all test and one additional override:

  • listing-page-field-author (line 114 in _language-fr.yml) also uses the middle-dot form "Auteur·rice". I've added it to the fr-CA file so all three middle-dot author labels are overridden.

The test confirms:

  • Auteur(-trice) appears (fr-CA override)
  • Date de publication appears (inherited from base _language-fr.yml)
  • Auteur·rice does NOT appear (correctly overridden)

@cderv cderv merged commit 1b9b5e4 into quarto-dev:main Feb 11, 2026
51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants