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

Allow text to be translated and fix URL paths in calls to docURL() function. #22311

Merged
merged 1 commit into from
Dec 24, 2021

Conversation

braders
Copy link
Contributor

@braders braders commented Dec 23, 2021

Overview

Primarially this ensures that the text passed to docLink can be translated (or word replaced). In a handful of cases I've also updated paths which were 404'ing to the appropriate locations.

Before

After

  • Use of {ts} instead of hardcoded text
  • Links don't 404

@civibot
Copy link

civibot bot commented Dec 23, 2021

(Standard links)

@civibot civibot bot added the master label Dec 23, 2021
@mlutfy
Copy link
Member

mlutfy commented Dec 23, 2021

jenkins, test this please

@mlutfy
Copy link
Member

mlutfy commented Dec 23, 2021

Thanks @braders - seems like a good fix to me. This function has always been a bit problematic. I will leave open for others to review, because I keep forgetting some of the fine print about this function.

@seamuslee001
Copy link
Contributor

jenkins, test this please

@totten
Copy link
Member

totten commented Dec 24, 2021

Yeah, it's tricky to work with those functions, and I think this PR is doing it effectively. For r-run, I spot-checked about ~2/3 of the changes (mostly in English; but also several in French), and all the links look good. Merging.

@totten totten merged commit d91ad3b into civicrm:master Dec 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants