fix(templ): accept slug for subpage macros - #686
Draft
caugner wants to merge 4 commits into
Draft
Conversation
Previously, this triggered flaws like this: ``` fixed legacy url: Learn/Common_questions -> /es/docs/Learn/Common_questions ```
Contributor
|
afcf314 was deployed to: https://rari-pr686.review.mdn.allizom.net/ |
LeoMcA
reviewed
May 18, 2026
LeoMcA
left a comment
Member
There was a problem hiding this comment.
This PR feels in conflict with mdn/translated-content#36029 - I'm not sure why we need to "fix" behaviour in rari if we can fix it in translated content, especially because these macros aren't used at all in en-US
Comment on lines
+70
to
76
| fn prefix_check_is_locale_specific() { | ||
| // A `/fr/docs/...` URL processed under en-US is treated as a slug | ||
| // and gets re-prefixed. | ||
| assert_eq!( | ||
| fix_broken_legacy_url("/Web", Locale::EnUs), | ||
| "/en-US/docs/Web" | ||
| normalize_url("/fr/docs/Web", Locale::EnUs), | ||
| "/en-US/docs/fr/docs/Web" | ||
| ); |
Comment on lines
+9
to
+17
| if input.is_empty() { | ||
| return String::new(); | ||
| } | ||
| let prefix = format!("/{}/docs", locale.as_url_str()); | ||
| if input.starts_with(&prefix) { | ||
| input.to_string() | ||
| } else { | ||
| (trimmed.starts_with("docs/"), trimmed) | ||
| }; | ||
| format!("{prefix}/{}", input.trim_start_matches('/')) | ||
| } |
Member
There was a problem hiding this comment.
There's a number of helper functions in crates/rari-doc/src/resolve.rs which feel like they'd be useful here
caugner
marked this pull request as draft
May 20, 2026 13:41
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Updates the
{{QuickLinksWithSubpages}}and{{ListSubpagesForSidebar}}macros to accept a slug (without/{locale}/docs/prefix), without triggering a flaw.Motivation
Avoid unnecessary flaws (the slug in the context of a locale is not ambiguous).
Additional details
Previously, this triggered flaws like this:
Related issues and pull requests
Part of mdn/fred#1462.
Related to mdn/translated-content#36029.