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.

Sign up for GitHub

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

Jump to bottom

Rescue Master Branch PR: ENH Remove legacy translation behaviour in template #1346

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Rescue Master Branch PR: ENH Remove legacy translation behaviour in template #1346

merged 1 commit into from
Aug 31, 2022

Conversation

GuySartorelli
Copy link
Member

Rescues (and expands upon) #78

Parent issue

@GuySartorelli GuySartorelli mentioned this pull request Aug 25, 2022
Closed
5 tasks
emteknetnz
emteknetnz requested changes Aug 29, 2022
View reviewed changes
Copy link
Member

@emteknetnz emteknetnz left a comment

Choose a reason for hiding this comment

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

This looks very different from the rescued commit?

@GuySartorelli
Copy link
Member Author

This PR rescues "and expands upon" the original PR.
I cherry-picked in the commit from the original PR and then looked for instances of what the original commit was doing which had been either missed or added since the original commit was created. The PR would be incomplete if these additional items were left unchanged, since the purpose is to update the old hardcoded string syntax.

@GuySartorelli GuySartorelli force-pushed the pulls/1/rescue-master-translation-strings branch from b8ae09a to 04e80f5 Compare August 29, 2022 21:15
@GuySartorelli
Copy link
Member Author

Conflicts resolved.

@emteknetnz emteknetnz merged commit 36fd3f4 into silverstripe:1 Aug 31, 2022
@emteknetnz emteknetnz deleted the pulls/1/rescue-master-translation-strings branch August 31, 2022 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emteknetnz emteknetnz emteknetnz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GuySartorelli @emteknetnz @robbieaverill