-
Notifications
You must be signed in to change notification settings - Fork 1
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
Support language on user level #31
Open
nasief
wants to merge
3
commits into
master
Choose a base branch
from
611_multi_language_support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+102
−4
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
__version__ = '1.4.2' | ||
__version__ = '1.4.5' | ||
|
||
default_app_config = 'accountsplus.apps.AccountsConfig' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from __future__ import unicode_literals | ||
|
||
from contextlib import contextmanager | ||
|
||
from django.utils import translation | ||
|
||
|
||
@contextmanager | ||
def language(lang): | ||
old_language = translation.get_language() | ||
try: | ||
translation.activate(lang) | ||
yield | ||
finally: | ||
translation.activate(old_language) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,35 @@ | ||
from __future__ import unicode_literals | ||
import django.utils.timezone | ||
from django.utils.deprecation import MiddlewareMixin | ||
from django.utils import translation | ||
|
||
|
||
class TimezoneMiddleware(MiddlewareMixin): | ||
|
||
def process_request(self, request): | ||
if request.user.is_authenticated() and request.user.timezone: | ||
django.utils.timezone.activate(request.user.timezone) | ||
else: | ||
django.utils.timezone.deactivate() | ||
|
||
|
||
class UserLanguageMiddleware(MiddlewareMixin): | ||
|
||
# Update user preferred language each time a request has a new language and activate translation for that user. | ||
# Should be added after LocaleMiddleware as it depends on having request.LANGUAGE_CODE configured there. | ||
def process_request(self, request): | ||
if hasattr(request, 'user'): | ||
user = request.user | ||
if hasattr(user, 'preferred_language'): | ||
if not user.preferred_language or user.preferred_language != request.LANGUAGE_CODE: | ||
user.preferred_language = request.LANGUAGE_CODE | ||
user.save() | ||
else: | ||
translation.activate(user.preferred_language) | ||
request.LANGUAGE_CODE = translation.get_language() | ||
|
||
lang_in_url = request.GET.get('lang') | ||
if lang_in_url: | ||
translation.activate(lang_in_url) | ||
request.LANGUAGE_CODE = translation.get_language() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ flake8 | |
pep8 | ||
pyflakes | ||
django-timezone-field>=2.0rc1 | ||
django-localflavor | ||
django-localflavor==1.3 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @danaspiegel do you think locking version like this the requirements.txt is acceptable? I think its used for testing only... so I'm assuming its ok... please note also Django also has fixed version above... |
||
bcrypt==3.1.0 | ||
mock | ||
git+https://github.com/foundertherapy/django-axes.git@remove_dependency_on_ip | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
@nasief will this regex allow special characters? have you tested it locally?
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.
@waseem-omar Yes I did. The validator here only makes restrictions related to lowercase, uppercase and digits other characters are allowed.