Merge branch 'hotfix/bug811672-google-analytics'

apps/homepage/context_processors.py

@@ -3,12 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 """
-Make the settings `INCLUDE_WEBTRENDS` available to all templates so it can
+Make the settings `INCLUDE_ANALYTICS` available to all templates so it can
 be used in the base.html template.
 """
 from django.conf import settings
 
 
 
-def webtrends(request):
-    return {'include_webtrends': settings.INCLUDE_WEBTRENDS}
+def analytics(request):
+    return {'include_analytics': settings.INCLUDE_ANALYTICS}

settings/base.py

@@ -62,7 +62,7 @@
 TEMPLATE_CONTEXT_PROCESSORS += (
     'django.core.context_processors.static',
     'accounts.context_processors.accounts',
-    'homepage.context_processors.webtrends',
+    'homepage.context_processors.analytics',
 )
 
 # This is the common prefix displayed in front of ALL static files
@@ -179,8 +179,8 @@
 L10N_FEED_URL = 'http://planet.mozilla.org/l10n/atom.xml'
 HOMEPAGE_FEED_SIZE = 5
 
-## WebTrends
-INCLUDE_WEBTRENDS = False
+## Google Analytics
+INCLUDE_ANALYTICS = False
 
 
 try:

settings/local.py-dist

@@ -53,8 +53,8 @@ SESSION_COOKIE_SECURE = False
 # Feed for example, to avoid having to do a HTTP call for the feed use:
 #L10N_FEED_URL = 'file://' + os.path.abspath('apps/homepage/test_rss20.xml')
 
-# Enable WebTrends in production
-#INCLUDE_WEBTRENDS = True
+# Enable Google Analytics in production
+#INCLUDE_ANALYTICS = True
 
 try:
     from .mounts_local import *