# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1426804794 -3600
# Node ID 1357a0cfdbf7944f9883db63f95277e72a6ad5d4
# Parent  92d0f441ca7f3bc79678309744b29f3aca623142
continue django 1.7 upgrade

diff -r 92d0f441ca7f -r 1357a0cfdbf7 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Thu Mar 19 22:52:51 2015 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Thu Mar 19 23:39:54 2015 +0100
@@ -16,6 +16,7 @@
 encoding//src/hdabo/views.py=utf-8
 encoding//src/hdabo/wp_utils.py=utf-8
 encoding//src/hdalab/__init__.py=utf-8
+encoding//src/hdalab/apps.py=utf-8
 encoding//src/hdalab/celery.py=utf-8
 encoding//src/hdalab/config.py=utf-8
 encoding//src/hdalab/fields.py=utf-8
diff -r 92d0f441ca7f -r 1357a0cfdbf7 src/hdalab/__init__.py
--- a/src/hdalab/__init__.py	Thu Mar 19 22:52:51 2015 +0100
+++ b/src/hdalab/__init__.py	Thu Mar 19 23:39:54 2015 +0100
@@ -17,10 +17,6 @@
 
 __version__ = get_version()
 
-try:
-    from .celery import app as celery_app
-except:
-    pass
+default_app_config = 'hdalab.apps.HdalabAppConfig'
 
 
-
diff -r 92d0f441ca7f -r 1357a0cfdbf7 src/hdalab/apps.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/apps.py	Thu Mar 19 23:39:54 2015 +0100
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+'''
+Created on Mar 19, 2015
+
+@author: ymh
+'''
+
+from __future__ import absolute_import
+
+from django.apps import AppConfig
+
+
+class HdalabAppConfig(AppConfig):
+    
+    name = "hdalab"
+    verbose_name = "HdaLab"
+    
+    def ready(self):
+        from .celery import app as celery_app  # @UnusedImport
+        import hdalab.signals # @UnusedImport
\ No newline at end of file
diff -r 92d0f441ca7f -r 1357a0cfdbf7 src/hdalab/models/__init__.py
--- a/src/hdalab/models/__init__.py	Thu Mar 19 22:52:51 2015 +0100
+++ b/src/hdalab/models/__init__.py	Thu Mar 19 23:39:54 2015 +0100
@@ -4,5 +4,3 @@
 from hdalab.models.renkan import HdalabRenkan, HdalabRenkanStateTransition
 
 __all__ = ['WpCategory', 'InfoboxParameter', 'TagInfobox', 'TagWpCategory', 'TagYears', 'Country', 'GeoInclusion', 'TagLinks', 'DbpediaFields', 'DbpediaFieldsTranslation', 'HdaSession', 'InseeCoords', 'DatasheetExtras', 'WpCategoryInclusion', 'HdalabRenkan', 'HdalabRenkanStateTransition']
-
-import hdalab.signals
\ No newline at end of file
diff -r 92d0f441ca7f -r 1357a0cfdbf7 src/hdalab/models/renkan.py
--- a/src/hdalab/models/renkan.py	Thu Mar 19 22:52:51 2015 +0100
+++ b/src/hdalab/models/renkan.py	Thu Mar 19 23:39:54 2015 +0100
@@ -9,7 +9,7 @@
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 
 logger = logging.getLogger(__name__)