Cleaned up directories to be more like modern django projects with

the project in it's own folder Added default but optional django-rosetta Added first spanish translation "Hola."
burke-software · Jan 18, 2013 · f294b8b · f294b8b
1 parent d0caa1c
commit f294b8b
Show file tree

Hide file tree

Showing 34 changed files with 46 additions and 8 deletions.
diff --git a/django_sis/__init__.py b/django_sis/__init__.py
diff --git a/ecwsp/settings.py → django_sis/settings.py b/ecwsp/settings.py → django_sis/settings.py
@@ -67,20 +67,24 @@
 '%b %d, %Y', '%d %b %Y', '%d %b, %Y', '%B %d %Y',
 '%B %d, %Y', '%d %B %Y', '%d %B, %Y','%b. %d, %Y')
 DATE_FORMAT = 'b. d, Y'
-#USE_L10N = True
+USE_L10N = True
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
+LANGUAGES = (
+  ('es', 'Spanish'),
+  ('en', 'English'),
+)
 SITE_ID = 1
 INTERNAL_IPS = ('127.0.0.1',)
-#USE_I18N = True
+USE_I18N = True
 SECRET_KEY = '4@=mqjpx*f$3m(1-wl6&02p#cx@*dz4_t26lu@@pmd^2%+)**y'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
     'apptemplates.Loader',
     'django.template.loaders.eggs.Loader',
 )
-ROOT_URLCONF = 'ecwsp.urls'
+ROOT_URLCONF = 'django_sis.urls'
 WSGI_APPLICATION = 'ecwsp.wsgi.application'
 
 # Optional these you can copy into settings_local and change or maybe they need to come first.
@@ -119,13 +123,16 @@
     'south',
     'djcelery',
     'csvimport',
+    'rosetta-grappelli',
+    'rosetta',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'pagination.middleware.PaginationMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
     )

diff --git a/ecwsp/urls.py → django_sis/urls.py b/ecwsp/urls.py → django_sis/urls.py
@@ -68,7 +68,10 @@
     urlpatterns += patterns('', (r'^canvas_sync/', include('ecwsp.integrations.canvas_sync.urls')), )
 if 'ecwsp.integrations.schoolreach' in settings.INSTALLED_APPS:
     urlpatterns += patterns('', (r'^schoolreach/', include('ecwsp.integrations.schoolreach.urls')), )
-
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )
 if 'report_builder' in settings.INSTALLED_APPS:
     urlpatterns += url(r'^report_builder/', include('report_builder.urls')),
 

diff --git a/templates/benchmark_grade/custom_test.html → ...emplates/benchmark_grade/custom_test.html b/templates/benchmark_grade/custom_test.html → ...emplates/benchmark_grade/custom_test.html
diff --git a/...rk_grade/demonstration_form_fragment.html → ...rk_grade/demonstration_form_fragment.html b/...rk_grade/demonstration_form_fragment.html → ...rk_grade/demonstration_form_fragment.html
diff --git a/...nchmark_grade/fill_all_form_fragment.html → ...nchmark_grade/fill_all_form_fragment.html b/...nchmark_grade/fill_all_form_fragment.html → ...nchmark_grade/fill_all_form_fragment.html
diff --git a/templates/benchmark_grade/gradebook.html → .../templates/benchmark_grade/gradebook.html b/templates/benchmark_grade/gradebook.html → .../templates/benchmark_grade/gradebook.html
diff --git a/templates/benchmark_grade/item_details.html → ...mplates/benchmark_grade/item_details.html b/templates/benchmark_grade/item_details.html → ...mplates/benchmark_grade/item_details.html
diff --git a/templates/benchmark_grade/student_grade.html → ...plates/benchmark_grade/student_grade.html b/templates/benchmark_grade/student_grade.html → ...plates/benchmark_grade/student_grade.html
diff --git a/...rk_grade/student_grade_course_detail.html → ...rk_grade/student_grade_course_detail.html b/...rk_grade/student_grade_course_detail.html → ...rk_grade/student_grade_course_detail.html
diff --git a/templates/benchmark_grade/upload.html → ...ade/templates/benchmark_grade/upload.html b/templates/benchmark_grade/upload.html → ...ade/templates/benchmark_grade/upload.html
diff --git a/ecwsp/sis/locale/es/LC_MESSAGES/django.mo b/ecwsp/sis/locale/es/LC_MESSAGES/django.mo
diff --git a/ecwsp/sis/locale/es/LC_MESSAGES/django.po b/ecwsp/sis/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-01-18 14:49-0500\n"
+"PO-Revision-Date: 2013-01-18 14:50-0500\n"
+"Last-Translator:   <aa@aa.aa>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Translated-Using: django-rosetta 0.7.0\n"
+
+#: templates/registration/login.html:5
+msgid "Hello."
+msgstr "Hola."
diff --git a/templates/registration/login.html → ecwsp/sis/templates/registration/login.html b/templates/registration/login.html → ecwsp/sis/templates/registration/login.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
+{% load i18n %}
 
 {% block content %}
-<h1>Hello.</h1>
+<h1>{% trans "Hello." %}</h1>
 
 <div class="subhead-text">
 <strong>Welcome to SWoRD, the Student Worker Relational Database.</strong><br />

diff --git a/...es/registration/password_change_done.html → ...es/registration/password_change_done.html b/...es/registration/password_change_done.html → ...es/registration/password_change_done.html
diff --git a/...es/registration/password_change_form.html → ...es/registration/password_change_form.html b/...es/registration/password_change_form.html → ...es/registration/password_change_form.html
diff --git a/templates/sis/asp_submissions.html → ecwsp/sis/templates/sis/asp_submissions.html b/templates/sis/asp_submissions.html → ecwsp/sis/templates/sis/asp_submissions.html
diff --git a/templates/sis/attendance_report.html → .../sis/templates/sis/attendance_report.html b/templates/sis/attendance_report.html → .../sis/templates/sis/attendance_report.html
diff --git a/templates/sis/flashcard.html → ecwsp/sis/templates/sis/flashcard.html b/templates/sis/flashcard.html → ecwsp/sis/templates/sis/flashcard.html
diff --git a/templates/sis/generic_form.html → ecwsp/sis/templates/sis/generic_form.html b/templates/sis/generic_form.html → ecwsp/sis/templates/sis/generic_form.html
diff --git a/templates/sis/generic_form_fragment.html → .../templates/sis/generic_form_fragment.html b/templates/sis/generic_form_fragment.html → .../templates/sis/generic_form_fragment.html
diff --git a/templates/sis/generic_list_fragment.html → .../templates/sis/generic_list_fragment.html b/templates/sis/generic_list_fragment.html → .../templates/sis/generic_list_fragment.html
diff --git a/templates/sis/generic_msg.html → ecwsp/sis/templates/sis/generic_msg.html b/templates/sis/generic_msg.html → ecwsp/sis/templates/sis/generic_msg.html
diff --git a/templates/sis/grade_report.html → ecwsp/sis/templates/sis/grade_report.html b/templates/sis/grade_report.html → ecwsp/sis/templates/sis/grade_report.html
diff --git a/templates/sis/list_with_confirm.html → .../sis/templates/sis/list_with_confirm.html b/templates/sis/list_with_confirm.html → .../sis/templates/sis/list_with_confirm.html
diff --git a/templates/sis/reportBuilder.html → ecwsp/sis/templates/sis/reportBuilder.html b/templates/sis/reportBuilder.html → ecwsp/sis/templates/sis/reportBuilder.html
diff --git a/templates/sis/stats.html → ecwsp/sis/templates/sis/stats.html b/templates/sis/stats.html → ecwsp/sis/templates/sis/stats.html
diff --git a/templates/sis/teacher_attendance.html → ...sis/templates/sis/teacher_attendance.html b/templates/sis/teacher_attendance.html → ...sis/templates/sis/teacher_attendance.html
diff --git a/templates/sis/teacher_attendance_which.html → ...mplates/sis/teacher_attendance_which.html b/templates/sis/teacher_attendance_which.html → ...mplates/sis/teacher_attendance_which.html
diff --git a/templates/sis/teacher_submissions.html → ...is/templates/sis/teacher_submissions.html b/templates/sis/teacher_submissions.html → ...is/templates/sis/teacher_submissions.html
diff --git a/templates/sis/user_preferences.html → ...p/sis/templates/sis/user_preferences.html b/templates/sis/user_preferences.html → ...p/sis/templates/sis/user_preferences.html
diff --git a/templates/sis/view_student.html → ecwsp/sis/templates/sis/view_student.html b/templates/sis/view_student.html → ecwsp/sis/templates/sis/view_student.html
diff --git a/install/dependencies.txt b/install/dependencies.txt
@@ -1,4 +1,4 @@
-#django>=1.5
+django>=1.5
 django-admin-export>=1.5
 django-ajax-filtered-fields>=0.5
 django-ajax-selects>=1.2.4
@@ -23,3 +23,5 @@ django-apptemplates>=0.0.1
 django-filter>=0.5.4
 file:../install/hatchery/django-ckeditor-3.6.2.tar.gz
 file:../install/hatchery/django-ldap-groups-0.1.3.tar.gz
+-e git://github.com/mbi/django-rosetta.git#egg=django-rosetta
+-e git://github.com/zsiciarz/django-rosetta-grappelli.git#egg=django-rosetta-grappelli
diff --git a/manage.py b/manage.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
-import os, sys
+import os
+import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ecwsp.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "django_sis.settings")
 
     from django.core.management import execute_from_command_line