Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
315c8e08
Commit
315c8e08
authored
Oct 01, 2014
by
Tim Babych
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not require South package to be installed when it is not present in INSTALLED_APPS
parent
dcc9d459
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
18 deletions
+25
-18
weblate/accounts/models.py
weblate/accounts/models.py
+5
-3
weblate/lang/models.py
weblate/lang/models.py
+6
-4
weblate/requirements.py
weblate/requirements.py
+9
-7
weblate/trans/__init__.py
weblate/trans/__init__.py
+5
-4
No files found.
weblate/accounts/models.py
View file @
315c8e08
...
...
@@ -33,7 +33,6 @@ from django.utils import translation as django_translation
from
django.template.loader
import
render_to_string
from
django.core.mail
import
EmailMultiAlternatives
from
south.signals
import
post_migrate
from
social.apps.django_app.default.models
import
UserSocialAuth
from
weblate.lang.models
import
Language
...
...
@@ -706,8 +705,6 @@ def remove_user(user):
user
.
social_auth
.
all
().
delete
()
@
receiver
(
post_syncdb
)
@
receiver
(
post_migrate
)
def
sync_create_groups
(
sender
,
app
,
**
kwargs
):
'''
Create groups on syncdb.
...
...
@@ -716,6 +713,11 @@ def sync_create_groups(sender, app, **kwargs):
or
getattr
(
app
,
'__name__'
,
''
)
==
'weblate.accounts.models'
):
create_groups
(
False
)
post_syncdb
.
connect
(
sync_create_groups
)
if
'south'
in
settings
.
INSTALLED_APPS
:
from
south.signals
import
post_migrate
post_migrate
.
connect
(
sync_create_groups
)
@
receiver
(
post_save
,
sender
=
User
)
def
create_profile_callback
(
sender
,
instance
,
created
=
False
,
**
kwargs
):
...
...
weblate/lang/models.py
View file @
315c8e08
...
...
@@ -25,9 +25,8 @@ from translate.lang.data import languages
from
weblate.lang
import
data
from
weblate.trans.mixins
import
PercentMixin
from
south.signals
import
post_migrate
from
django.conf
import
settings
from
django.db.models.signals
import
post_syncdb
from
django.dispatch
import
receiver
from
weblate.appsettings
import
SIMPLIFY_LANGUAGES
import
weblate
...
...
@@ -288,8 +287,6 @@ class LanguageManager(models.Manager):
return
errors
@
receiver
(
post_syncdb
)
@
receiver
(
post_migrate
)
def
setup_lang
(
sender
,
app
,
**
kwargs
):
'''
Hook for creating basic set of languages on database migration.
...
...
@@ -297,6 +294,11 @@ def setup_lang(sender, app, **kwargs):
if
app
==
'lang'
or
getattr
(
app
,
'__name__'
,
''
)
==
'weblate.lang.models'
:
Language
.
objects
.
setup
(
False
)
post_syncdb
.
connect
(
setup_lang
)
if
'south'
in
settings
.
INSTALLED_APPS
:
from
south.signals
import
post_migrate
post_migrate
.
connect
(
setup_lang
)
class
Language
(
models
.
Model
,
PercentMixin
):
PLURAL_CHOICES
=
(
...
...
weblate/requirements.py
View file @
315c8e08
...
...
@@ -24,6 +24,7 @@ from distutils.version import LooseVersion
from
weblate.trans.vcs
import
GitRepository
import
importlib
import
sys
import
django
def
get_version_module
(
module
,
name
,
url
,
optional
=
False
):
...
...
@@ -139,6 +140,7 @@ def get_versions():
name
=
'South'
url
=
'http://south.aeracode.org/'
if
django
.
VERSION
<
(
1
,
7
,
0
):
mod
=
get_version_module
(
'south'
,
name
,
url
)
result
.
append
((
name
,
...
...
weblate/trans/__init__.py
View file @
315c8e08
...
...
@@ -18,11 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
from
south.signals
import
post_migrate
from
django.dispatch
import
receiver
from
django.conf
import
settings
@
receiver
(
post_migrate
)
def
create_permissions_compat
(
app
,
**
kwargs
):
'''
Creates permissions like syncdb would if we were not using South
...
...
@@ -30,7 +28,6 @@ def create_permissions_compat(app, **kwargs):
See http://south.aeracode.org/ticket/211
'''
from
django.db.models
import
get_app
,
get_models
from
django.conf
import
settings
from
django.contrib.auth.management
import
create_permissions
if
app
in
(
'trans'
,
'lang'
,
'accounts'
):
try
:
...
...
@@ -40,3 +37,7 @@ def create_permissions_compat(app, **kwargs):
except
AttributeError
as
error
:
# See https://code.djangoproject.com/ticket/20442
print
'Failed to create permission objects: {0}'
.
format
(
error
)
if
'south'
in
settings
.
INSTALLED_APPS
:
from
south.signals
import
post_migrate
post_migrate
.
connect
(
create_permissions_compat
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment