Merge

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Mozilla
+Copyright (c) 2012, Mozilla Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

docs/conf.py

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'a playdoh-based project'
-copyright = u'2011, the authors'
+copyright = u'2012, the authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

manage.py

@@ -5,20 +5,16 @@ import sys
 # Edit this if necessary or override the variable in your environment.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pontoon.settings')
 
-try:
-    # For local development in a virtualenv:
-    from funfactory import manage
-except ImportError:
-    # Production:
-    # Add a temporary path so that we can import the funfactory
-    tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                            'vendor', 'src', 'funfactory')
-    sys.path.append(tmp_path)
+# Add a temporary path so that we can import the funfactory
+tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                        'vendor', 'src', 'funfactory')
+# Comment out to load funfactory from your site packages instead
+sys.path.insert(0, tmp_path)
 
-    from funfactory import manage
+from funfactory import manage
 
-    # Let the path magic happen in setup_environ() !
-    sys.path.remove(tmp_path)
+# Let the path magic happen in setup_environ() !
+sys.path.remove(tmp_path)
 
 
 manage.setup_environ(__file__, more_pythonic=True)

pontoon/settings/base.py

@@ -44,6 +44,11 @@ TEMPLATE_CONTEXT_PROCESSORS = list(TEMPLATE_CONTEXT_PROCESSORS) + [
     'django_browserid.context_processors.browserid_form',
 ]
 
+# Should robots.txt deny everything or disallow a calculated list of URLs we
+# don't want to be crawled?  Default is false, disallow everything.
+# Also see http://www.google.com/support/webmasters/bin/answer.py?answer=93710
+ENGAGE_ROBOTS = False
+
 # Always generate a CSRF token for anonymous users.
 ANON_ALWAYS = True
 
@@ -56,7 +61,7 @@ DOMAIN_METHODS['messages'] = [
         'tower.management.commands.extract.extract_tower_template'),
     ('templates/**.html',
         'tower.management.commands.extract.extract_tower_template'),
-],
+]
 
 # # Use this if you have localizable HTML files:
 # DOMAIN_METHODS['lhtml'] = [

pontoon/settings/local.py-dist

@@ -60,6 +60,9 @@ PASSWORD_HASHERS = get_password_hashers(base.BASE_PASSWORD_HASHERS, HMAC_KEYS)
 # Make this unique, and don't share it with anybody.  It cannot be blank.
 SECRET_KEY = ''
 
+# Should robots.txt allow web crawlers?  Set this to True for production
+ENGAGE_ROBOTS = True
+
 # Uncomment these to activate and customize Celery:
 # CELERY_ALWAYS_EAGER = False  # required to activate celeryd
 # BROKER_HOST = 'localhost'