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

fix typo in translation key #1238

Closed
wants to merge 64 commits into from

Conversation

baukezwaan
Copy link
Contributor

Minor typo, causing translation of string to fail

Sabina Talipova and others added 30 commits January 9, 2023 15:24
…remove-legacy-upgrader

MNT Remove legacy upgrader config
…php82

MNT Unit test PHP 8.2 compatibility
…0/cms5-readme

DOC Update README.md for CMS 5
@michalkleiner
Copy link
Contributor

@baukezwaan this would be best targeted at the minor version that introduced the change, if we target 5 the fix won't meet the bug for the current minor.

@baukezwaan baukezwaan changed the base branch from 5 to 5.15 September 12, 2023 10:37
@GuySartorelli
Copy link
Member

There are a lot of commits here that aren't related to the change you're trying to make - presumably carried over from retargetting the PR. Please reset the PR so that only your commits are reflected here.

@baukezwaan
Copy link
Contributor Author

@GuySartorelli would love to do it, but can't figure out how to do that...
I have synced my fork with the upstream, but I don't see all the new branches (like 5.15). I presume I would need this branch, to update my branche?
Or I drop this PR and just try it again... sorry for the hassle

@michalkleiner
Copy link
Contributor

@baukezwaan if you enable updates by maintainers I can fix the branch for you, but at the moment I can't push to it.

@michalkleiner
Copy link
Contributor

I've fixed the branch and it's on my fork for now https://github.com/michalkleiner/silverstripe-userforms/tree/fix_translation_key

@GuySartorelli
Copy link
Member

GuySartorelli commented Sep 18, 2023

@baukezwaan Thanks for giving it a go - there are a few ways to proceed from here.

  1. Easiest will be to allow maintainers to modify your branch (I don't know where the setting for that is after you've created a PR though) - and then Michal can update it from his fork (you will still be credited for your change)
  2. You can definitely start the PR over again, so long as you link to it from here, and link to here from the new one
  3. If you want to give resetting commits another go, I've created this gist with instructions for how to do it.

@baukezwaan
Copy link
Contributor Author

Thanks @michalkleiner and @GuySartorelli for the feedback, I will save these to my notes for future reference.

I will close this PR, since @michalkleiner has a clean PR now.

@baukezwaan baukezwaan closed this Sep 19, 2023
@baukezwaan baukezwaan deleted the fix_translation_key branch September 19, 2023 07:04
@GuySartorelli
Copy link
Member

@baukezwaan I don't think @michalkleiner created a PR - rather, I think he just prepared the changes required to update this PR, and was waiting for you to open it up for him to edit.

@baukezwaan
Copy link
Contributor Author

Okay... reopening it now. Hopefully my ealier branch will be picked up, since I chose to delete it.
Meanwhile I've managed to make it a clean branch, based on 5.15.

Unfortunately reopening is not an option, since it was recreated

@GuySartorelli
Copy link
Member

For future reference, see #1241 for the replacement PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants