Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

django 1.4 (and using a modified version of django cms)

  • Loading branch information...
commit 0434c6155e013fc7c2d49b7ea215c4a45f3de2b4 1 parent 8de7144
@glibersat glibersat authored
View
1  apps/i4p_base/templates/login-slide.html
@@ -3,7 +3,6 @@
{% load menu_tags %}
{% load honeypot %}
{% load umessages_tags %}
-{% load i18nurls %}
{% load i4p_tags %}
<div id="toppanel">
View
1  apps/project_sheet/templates/project_sheet/all_recent_changes.html
@@ -3,7 +3,6 @@
{% load compress %}
{% load i18n %}
{% load humanize %}
-{% load i18nurls %}
{% block style %}
{% compress css %}
View
1  apps/project_sheet/templates/project_sheet/grey_column.html
@@ -1,5 +1,4 @@
{% load i18n %}
-{% load i18nurls %}
{% load tagging_tags %}
{% block extra_head %}
View
2  apps/project_sheet/templates/project_sheet/project_complete_card.html
@@ -1,4 +1,4 @@
-{% load i18nurls i18n %}
+{% load i18n %}
{% include "project_sheet/project_id_card.html" %}
View
1  apps/project_sheet/templates/project_sheet/project_id_card.html
@@ -1,5 +1,4 @@
{% load i18n %}
-{% load i18nurls %}
{% language project_translation.language_code %}
<a href="{% url project_sheet-show project_translation.slug %}" class="project_card" title="{{ project_translation.baseline}}">
View
15 manage.py
@@ -1,11 +1,10 @@
#!/usr/bin/env python
-from django.core.management import execute_manager
-try:
- import settings # Assumed to be in the same directory.
-except ImportError:
- import sys
- sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
- sys.exit(1)
+import os
+import sys
if __name__ == "__main__":
- execute_manager(settings)
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+ from django.core.management import execute_from_command_line
+
+ execute_from_command_line(sys.argv)
View
14 requirements.txt
@@ -1,4 +1,4 @@
-django==1.3.1
+django==1.4
psycopg2==2.4.1
south==0.7.5
@@ -11,14 +11,15 @@ django-tagging==0.3.1
django-autoslug==1.4.1
# Django cms 2.3rc2.post0
--e git+https://github.com/divio/django-cms.git@56afb01890396fe0562c3ce6700afbff81487f80#egg=django-cms
+#-e git+https://github.com/divio/django-cms.git@56afb01890396fe0562c3ce6700afbff81487f80#egg=django-cms
+-e git+https://github.com/ImaginationForPeople/django-cms.git@dj14#egg=django-cms
-e git+https://github.com/CommOnEcoute/cmsplugin_facebook.git@8416f8506eb77ed9954dc12aa1f4b6eebe68d39c#egg=cmsplugin-facebook
django-imagekit==0.3.6
Pillow==1.7.4
-whoosh==1.1.1
-django-haystack==1.1.0
+whoosh==1.8.4
+django-haystack==1.2.7
django-voting==0.1
django-annoying==0.7.4
@@ -44,7 +45,8 @@ linaro-django-pagination==2.0.2
-e git+https://github.com/jezdez/django_compressor.git@8c7961d2eb778edce2f1e101121629b96f93aba5#egg=django_compressor
--e git+https://github.com/jtauber/django-notification.git@555b506a3e225d476d17939d8b43f853fd0226ec#egg=django-notification
+#-e git+https://github.com/jtauber/django-notification.git@555b506a3e225d476d17939d8b43f853fd0226ec#egg=django-notification
+-e git+https://github.com/liberation/django-notification.git@75867589ad63078cba8271d228920a66a02833b0#egg=django-notification
-e hg+https://bitbucket.org/atiberghien/django-licenses@365f65fa7148312372783af370e37f80bd3787d5#egg=django-licenses
-e git+https://github.com/ImaginationForPeople/django-oembed-works#egg=django-oembed-works
@@ -56,7 +58,7 @@ django-social-auth==0.6.9
-e git+https://github.com/SpreadBand/django-backcap.git@79c6494d4d05587f4699947987b12d4a9322efdc#egg=django-backcap
-django-reversion==1.5.2
+django-reversion==1.6.1
-e git+https://github.com/ImaginationForPeople/django-mailman.git#egg=django-mailman
View
7 settings.py
@@ -106,7 +106,9 @@
# Language selection based on profile
# URL based language selection (eg. from top panel)
# We don't use django cms one, for compatibility reasons
- 'i18nurls.middleware.LocaleMiddleware',
+ # 'i18nurls.middleware.LocaleMiddleware',
+ # 'cms.middleware.multilingual.MultilingualURLMiddleware',
+ 'django.middleware.locale.LocaleMiddleware',
'userena.middleware.UserenaLocaleMiddleware',
'honeypot.middleware.HoneypotMiddleware',
@@ -171,7 +173,6 @@
INSTALLED_APPS = (
# External Apps
'dynamicsites',
- #'localeurl',
'south',
'django_nose',
'django_extensions',
@@ -180,7 +181,7 @@
'guardian',
'nani',
'honeypot',
- 'i18nurls',
+# 'i18nurls',
'tinymce',
'tagging',
View
6 urls.py
@@ -1,11 +1,12 @@
from django.conf import settings
from django.conf.urls.defaults import patterns, url, include
+from django.conf.urls.i18n import i18n_patterns
from django.contrib import admin
from django.views.generic.simple import redirect_to
from dynamicsites.views import site_info
-from i18nurls.i18n import i18n_patterns # XXX: update when moving to dj1.4
+#from i18nurls.i18n import i18n_patterns # XXX: update when moving to dj1.4
from userena.contrib.umessages import views as messages_views
from apps.member.forms import AutoCompleteComposeForm
@@ -67,7 +68,7 @@
'ajax_select.views.add_popup',
name = 'add_popup'
),
-
+
(r'^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog'),
url(r'^admin/filebrowser/', include('filebrowser.urls')),
@@ -86,7 +87,6 @@
url('^robots\.txt$', include('robots.urls')),
)
-
## CMS
urlpatterns += i18n_patterns('',
url(r'^', include('cms.urls'))
Please sign in to comment.
Something went wrong with that request. Please try again.