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

Use default locale_dirs value #13079

Merged
merged 1 commit into from
Nov 2, 2024
Merged

Conversation

rffontenelle
Copy link
Contributor

Feature or Bugfix

  • Refactoring

Purpose

Remove the locale_dirs entry from documentation's conf.py to use the default value 'locales', which would avoid the need for setting -Dlocale_dirs

Detail

sphinx-doc/sphinx-doc-translations#58 is just holding this to land.

Relates

@jayaddison
Copy link
Contributor

@rffontenelle this follows-on from #13025 I guess?

@rffontenelle
Copy link
Contributor Author

@jayaddison Sort of. After AA Turner message, I realized the issue was in the docs that states locale_dirs defaults to locale when the correct was locales. Well, Sphinx's own conf.py is set to 'locale', so I'm working on changing it.

@AA-Turner
Copy link
Member

Is this setting currently causing trouble? The linked PR seems to move every file in the repo to locales.

A

P.S. Adam Turner (and most variants) was taken when I created my account on GitHub - my name isn't 'AA'!

@rffontenelle
Copy link
Contributor Author

Is this setting currently causing trouble? The linked PR seems to move every file in the repo to locales.

No trouble at all. My intention is to remove -Dlocale_dirs from sphinx-build command line, and also to follow current Sphinx default (locales).

P.S. Adam Turner (and most variants) was taken when I created my account on GitHub - my name isn't 'AA'!

Sure, I apologize. It was a reference to your username.

@AA-Turner
Copy link
Member

No need to apologise, don't worry.

Which PR should be merged first? I'll look at both tomorrow (UK time)

A

@rffontenelle
Copy link
Contributor Author

Which PR should be merged first? I'll look at both tomorrow (UK time)

This one. That other one require solving a merge conflict caused by daily translation string update. I'll solve as soon as this is merged

@AA-Turner AA-Turner merged commit db1a190 into sphinx-doc:master Nov 2, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants