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

Added support for language and options for async and defer #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for language and options for async and defer #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- 0.5.0
- Added support for laguages
- Added support for async and defer options

- 0.4.1
- Added Py.Test
- more refactoring
Expand Down
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,19 @@ The following are **Optional** arguments.

**RECAPTCHA_TABINDEX**: Int - Tabindex of the widget can be used, if the page uses tabidex, to make navigation easier. Defaults to 0

**RECAPTCHA_LANGUAGE**: String - You can choose one from the [languages available](https://developers.google.com/recaptcha/docs/language). Default is 'en'

**RECAPTCHA_ASYNC_DEFER**: Bool - Set scripts opcions async and defer available. Default is True

RECAPTCHA_ENABLED = True
RECAPTCHA_SITE_KEY = ""
RECAPTCHA_SECRET_KEY = ""
RECAPTCHA_THEME = "dark"
RECAPTCHA_TYPE = "image"
RECAPTCHA_SIZE = "compact"
RECAPTCHA_RTABINDEX = 10
RECAPTCHA_TABINDEX = 10
RECAPTCHA_LANGUAGE = "es"
RECAPTCHA_ASYNC_DEFER = False

---

Expand Down
18 changes: 15 additions & 3 deletions flask_recaptcha.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class DEFAULTS(object):
TYPE = "image"
SIZE = "normal"
TABINDEX = 0
LANGUAGE = "en"
ASYNC_DEFER = True


class ReCaptcha(object):
Expand All @@ -41,6 +43,8 @@ def __init__(self, app=None, site_key=None, secret_key=None, is_enabled=True, **
self.type = kwargs.get('type', DEFAULTS.TYPE)
self.size = kwargs.get('size', DEFAULTS.SIZE)
self.tabindex = kwargs.get('tabindex', DEFAULTS.TABINDEX)
self.language = kwargs.get('language', DEFAULTS.LANGUAGE)
self.async_defer = kwargs.get('async_defer', DEFAULTS.ASYNC_DEFER)

elif app:
self.init_app(app=app)
Expand All @@ -52,7 +56,9 @@ def init_app(self, app=None):
theme=app.config.get("RECAPTCHA_THEME", DEFAULTS.THEME),
type=app.config.get("RECAPTCHA_TYPE", DEFAULTS.TYPE),
size=app.config.get("RECAPTCHA_SIZE", DEFAULTS.SIZE),
tabindex=app.config.get("RECAPTCHA_TABINDEX", DEFAULTS.TABINDEX))
tabindex=app.config.get("RECAPTCHA_TABINDEX", DEFAULTS.TABINDEX),
language=app.config.get("RECAPTCHA_LANGUAGE", DEFAULTS.LANGUAGE),
async_defer=app.config.get("RECAPTCHA_ASYNC_DEFER", DEFAULTS.ASYNC_DEFER))

@app.context_processor
def get_code():
Expand All @@ -64,10 +70,16 @@ def get_code(self):
:return:
"""
return "" if not self.is_enabled else ("""
<script src='//www.google.com/recaptcha/api.js'></script>
<script src='//www.google.com/recaptcha/api.js?hl={LANGUAGE}' {ASYNC_DEFER}></script>
<div class="g-recaptcha" data-sitekey="{SITE_KEY}" data-theme="{THEME}" data-type="{TYPE}" data-size="{SIZE}"\
data-tabindex="{TABINDEX}"></div>
""".format(SITE_KEY=self.site_key, THEME=self.theme, TYPE=self.type, SIZE=self.size, TABINDEX=self.tabindex))
""".format(SITE_KEY=self.site_key,
THEME=self.theme,
TYPE=self.type,
SIZE=self.size,
TABINDEX=self.tabindex,
LANGUAGE=self.language,
ASYNC_DEFER="async defer" if self.async_defer else ""))

def verify(self, response=None, remote_ip=None):
if self.is_enabled:
Expand Down