-
Notifications
You must be signed in to change notification settings - Fork 310
🏗️(frontend) footer configurable #959
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
+490
−596
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| # For the CI job test-e2e | ||
| SUSTAINED_THROTTLE_RATES="200/hour" | ||
| BURST_THROTTLE_RATES="200/minute" | ||
| DJANGO_SERVER_TO_SERVER_API_TOKENS=test-e2e | ||
| SUSTAINED_THROTTLE_RATES="200/hour" | ||
| Y_PROVIDER_API_KEY=yprovider-api-key | ||
| Y_PROVIDER_API_BASE_URL=http://y-provider:4444/api/ | ||
| THEME_CUSTOMIZATION_FILE_PATH="" #force theme_customization to be empty |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,129 @@ | ||
| { | ||
| "footer": { | ||
| "default": { | ||
| "externalLinks": [ | ||
| { | ||
| "label": "Github", | ||
| "href": "https://github.com/suitenumerique/docs/" | ||
| }, | ||
| { | ||
| "label": "DINUM", | ||
| "href": "https://www.numerique.gouv.fr/dinum/" | ||
| }, | ||
| { | ||
| "label": "ZenDiS", | ||
| "href": "https://zendis.de/" | ||
| }, | ||
| { | ||
| "label": "BlockNote.js", | ||
| "href": "https://www.blocknotejs.org/" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Unless otherwise stated, all content on this site is under", | ||
| "link": { | ||
| "label": "licence etalab-2.0", | ||
| "href": "https://github.com/etalab/licence-ouverte/blob/master/LO.md" | ||
| } | ||
| } | ||
| "footer": { | ||
| "default": { | ||
| "logo": { | ||
| "src": "/assets/icon-docs.svg", | ||
| "width": "54px", | ||
| "alt": "Docs Logo", | ||
| "withTitle": true | ||
| }, | ||
| "en": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Legal Notice", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Personal data and cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Accessibility", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Unless otherwise stated, all content on this site is under", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| "externalLinks": [ | ||
| { | ||
| "label": "Github", | ||
| "href": "https://github.com/suitenumerique/docs/" | ||
| }, | ||
| { | ||
| "label": "DINUM", | ||
| "href": "https://www.numerique.gouv.fr/dinum/" | ||
| }, | ||
| { | ||
| "label": "ZenDiS", | ||
| "href": "https://zendis.de/" | ||
| }, | ||
| { | ||
| "label": "BlockNote.js", | ||
| "href": "https://www.blocknotejs.org/" | ||
| } | ||
| }, | ||
| "fr": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Mentions légales", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Données personnelles et cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Accessibilité", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Sauf mention contraire, tout le contenu de ce site est sous", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Unless otherwise stated, all content on this site is under", | ||
| "link": { | ||
| "label": "licence etalab-2.0", | ||
| "href": "https://github.com/etalab/licence-ouverte/blob/master/LO.md" | ||
| } | ||
| }, | ||
| "de": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Impressum", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Personenbezogene Daten und Cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Barrierefreiheit", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Sofern nicht anders angegeben, steht der gesamte Inhalt dieser Website unter", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| } | ||
| }, | ||
| "en": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Legal Notice", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Personal data and cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Accessibility", | ||
| "href": "#" | ||
| } | ||
| }, | ||
| "nl": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Wettelijke bepalingen", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Persoonlijke gegevens en cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Toegankelijkheid", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Tenzij anders vermeld, is alle inhoud van deze site ondergebracht onder", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Unless otherwise stated, all content on this site is under", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| } | ||
| }, | ||
| "fr": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Mentions légales", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Données personnelles et cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Accessibilité", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Sauf mention contraire, tout le contenu de ce site est sous", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| } | ||
| }, | ||
| "de": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Impressum", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Personenbezogene Daten und Cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Barrierefreiheit", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Sofern nicht anders angegeben, steht der gesamte Inhalt dieser Website unter", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| } | ||
| }, | ||
| "nl": { | ||
| "legalLinks": [ | ||
| { | ||
| "label": "Wettelijke bepalingen", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Persoonlijke gegevens en cookies", | ||
| "href": "#" | ||
| }, | ||
| { | ||
| "label": "Toegankelijkheid", | ||
| "href": "#" | ||
| } | ||
| ], | ||
| "bottomInformation": { | ||
| "label": "Tenzij anders vermeld, is alle inhoud van deze site ondergebracht onder", | ||
| "link": { | ||
| "label": "licence MIT", | ||
| "href": "https://github.com/suitenumerique/docs/blob/main/LICENSE" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about we consider a more direct approach for translating strings?
If we used translation slugs instead of plain text:
It could simplify things by removing the need for
default,fr,enand similar sub-keys.It would also alleviate the burden of updating the full theme configuration when a new language is added, a process currently more involved than maintaining a flat JSON for translations.
This shift would also enhance modularity and better separate responsibilities.
It would allow translators of crowdin to properly translate the default values.
It would reduce the size of the theming file significantly - potentially improving payload transfer speed and overall reactivity of the app
It would allow nested translations to be integrated in the future, further reducing complexity and improving flexibility
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Until we cannot override translations per instance we cannot do this way.
But I think you're right, we should refacto this part as soon we can override translations, I will open an issue about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Saved for later: #994