-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
#133 Add google recaptcha v2 support #1087
base: develop
Are you sure you want to change the base?
Conversation
Hi @Tthecreator, |
@vitormattos Thanks for the heads up! |
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.
I just reviewed the spanish translation and it's ok, only three words to correct.
@@ -271,7 +271,12 @@ | |||
$lang['could_not_add_to_google_calendar'] = 'No se ha podido agregar la cita a su cuenta de Google Calendar.'; | |||
$lang['ea_update_success'] = 'Easy!Appointments ha sido actualizado exitosamente'; | |||
$lang['require_captcha'] = 'Requiere CAPTCHA'; | |||
$lang['require_captcha_hint'] = 'Cuando se habilita, el cliente tendrá que escribir el código CAPTCHA antes de reservar/actualizar una cita.'; | |||
$lang['require_captcha_hint'] = 'Cuando está habilitado, los clientes deberán enfrentar un desafío CAPTCHA antes de reservar / actualizar una cita para demostrar que no son un robot.'; |
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.
"Cuando esté habilitado, los clientes deberán resolver un CAPTCHA antes de reservar / actualizar una cita para demostrar que no son un robot."
Three quick changes. I removed the "desafío" word before CAPTCHA. (I'm native spanish)
Hello @Tthecreator, any news with these? I was planning on doing it on my own but saw your PR. Do you need any help? |
Yea, I can check on this this Sunday, or you can take my work over if you need this sooner. |
That would be great! I can wait |
@priverop Hi, I'm deeply sorry for not showing anything on Sunday. I'm still not sure what to do with the language files. They are automatically translated right now, but there is no way we could find a contributor for every single language I think.... So just upload it like this? (After updating the Spanish of course). |
@Tthecreator don't worry!!! I don't need it right away 👍 👍 Let's see if we can get that PR merged then. I would definitely left the language files like that, at least in Spanish it was 9/10, so I think that's enough for now. |
Hi @Tthecreator Are you ready with this one or do you still need to work on it?
|
@alextselegidis I want to check if the migration order is still correct. I am also curious to see what exactly gets merged with #1081. Because that moves the captcha settings field, this PR could be affected as well. |
@Tthecreator If you have a migration file you can push it with already and I will make sure it is getting the right sequence number. |
@alextselegidis Then I think this can be merged. |
I'll solve these conflicts later today. |
No need to, thanks! I'll take care of them.
|
Hello @Tthecreator, After going through the PR again it looks like it makes more sense to manually merge this after the 1.5 refactoring is completed. The merge will be done manually so that we can avoid the merge conflicts, but I will leave this PR open till this happens. Stay tuned for more updates!
|
Hey! @alextselegidis the issue with that approach is that we will have to wait until v1.5 is complete, and it has a lot of pending tasks, we are talking about more than a year? It wouldn't be better to have more small releases? |
Hi @priverop, I understand your concerns but it will not take a year to release 1.5. In fact, the release was originally planned for October 2021, but had to be moved for November as I was doing some pretty interesting upgrades to the underlying code which will help developers achieve more with less code. Those changes are almost completed and soon all the Milestone tickets will be too. At this point I'd like to thank you all for your patience and your support on the projects! Stay tuned, great things are coming!
|
Hi @alextselegidis , |
Hello @DonSYS91! Thanks for checking back on this again :) I will have to manually merge this one, cause there are many things that were changed along the way in the original project. So at this moment star and follow the project to stay up to date with the latest development news!
|
Hi there, this is a pull request for issue #133 (from 2016, so it's quite due if you ask me)
I've got these things to do:
I've also on the side added some data validation for the settings page for security reasons. Sorry for making it piggyback on this other issue.
@alextselegidis if you end up reviewing this, merge it after merging #1082 PR. The reason is that these changes require these manual things to be done: