Daniel Holbach has proposed merging lp:~dholbach/loco-directory/newtheme-fixes into lp:loco-directory with lp:~mhall119/loco-directory/newtheme as a prerequisite.
Requested reviews: loco-directory-dev (loco-directory-dev) -- https://code.launchpad.net/~dholbach/loco-directory/newtheme-fixes/+merge/28964 Your team loco-directory-dev is requested to review the proposed merge of lp:~dholbach/loco-directory/newtheme-fixes into lp:loco-directory.
=== modified file 'INSTALL' --- INSTALL 2010-07-01 06:29:24 +0000 +++ INSTALL 2010-06-04 11:48:19 +0000 @@ -13,7 +13,6 @@ - cp local_settings.py.sample local_settings.py # edit local_settings.py and set DATABASE_USER, DATABASE_PASSWORD, SECRET_KEY - to make maps work, head to http://code.google.com/apis/maps/ and set GOOGLE_API_KEY in local_settings.py - - bzr branch lp:ubuntu-website/light-django-theme ubuntu_website ** Karmic users must also do the following: - sudo ln -s /usr/share/javascript/jquery-ui/jquery-ui-1.7.1.custom.min.js /usr/share/javascript/jquery-ui/jquery-ui.js === modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-07-01 06:29:24 +0000 +++ loco_directory/locale/loco-directory.pot 2010-07-01 06:29:24 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-30 13:38+0000\n" +"POT-Creation-Date: 2010-07-01 06:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -696,7 +696,7 @@ #: templates/events/team_event_delete_confirm.html:16 #, python-format -msgid "Do you realy want to delete the Team Event: %(eventname)s?" +msgid "Do you really want to delete the Team Event: %(eventname)s?" msgstr "" #: templates/events/team_event_detail.html:9 === modified file 'loco_directory/settings.py' --- loco_directory/settings.py 2010-07-01 06:29:24 +0000 +++ loco_directory/settings.py 2010-07-01 06:29:24 +0000 @@ -1,7 +1,12 @@ # Django settings for loco_directory project. import os -import ubuntu_website +try: + import ubuntu_website + uw_import = True +except ImportError: + print "You will need to run ./manage.py init-ld to make the LoCo Directory fully work." + uw_import = False PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) @@ -81,7 +86,6 @@ "common.context_processors.google_api_key", "common.context_processors.login_redirect", "common.context_processors.url_base", - "ubuntu_website.media_processor", ) ROOT_URLCONF = 'loco_directory.urls' @@ -91,9 +95,16 @@ # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. os.path.join(PROJECT_PATH, 'templates'), - ubuntu_website.TEMPLATE_DIR, ) +if uw_import: + TEMPLATE_CONTEXT_PROCESSORS += ( + "ubuntu_website.media_processor", + ) + TEMPLATE_DIRS += ( + ubuntu_website.TEMPLATE_DIR, + ) + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', === modified file 'loco_directory/teams/management/commands/init-ld.py' --- loco_directory/teams/management/commands/init-ld.py 2010-02-17 14:48:47 +0000 +++ loco_directory/teams/management/commands/init-ld.py 2010-07-01 06:29:24 +0000 @@ -44,3 +44,12 @@ print " * Creating jquery symlinks: updated." else: print " * Creating jquery symlinks: not necessary." + + print " * Adding ubuntu_website media:", + if os.path.isdir(os.path.join(path, "ubuntu_website")): + print "not necessary." + else: + subprocess.call(["bzr", "branch", "-q", + "lp:ubuntu-website/light-django-theme", + "ubuntu_website"]) + print "added." === modified file 'loco_directory/templates/events/team_event_delete_confirm.html' --- loco_directory/templates/events/team_event_delete_confirm.html 2010-07-01 06:29:24 +0000 +++ loco_directory/templates/events/team_event_delete_confirm.html 2010-07-01 06:29:24 +0000 @@ -13,7 +13,7 @@ {% block content %} <article class="main-content"> <h2>{% trans "Delete Team Event" %}</h2> -{% blocktrans with team_event_object.name as eventname %}Do you realy want to delete the Team Event: {{eventname}}?{% endblocktrans %} +{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %} <form action="." method="post"> <p><input type="submit" value="Submit" /> <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a></p> </form>
_______________________________________________ Mailing list: https://launchpad.net/~loco-directory-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~loco-directory-dev More help : https://help.launchpad.net/ListHelp
