Bug 822817: redirect /telemetry

mozilla · Jan 5, 2013 · a1ab17a · a1ab17a
1 parent 16b4e0c
commit a1ab17a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/apps/redirects/urls.py b/apps/redirects/urls.py
@@ -59,4 +59,7 @@
     redirect(r'tabzilla/media/css/tabzilla\.css$',
              lambda r: '/media/css/tabzilla.less.css' if settings.TEMPLATE_DEBUG
                        else '/media/css/tabzilla-min.css'),
+
+    # Bug 822817 /telemetry/ -> http://wiki.mozilla.org/Telemetry/FAQ
+    redirect(r'telemetry/$', 'http://wiki.mozilla.org/Telemetry/FAQ'),
 )
diff --git a/settings/base.py b/settings/base.py
@@ -41,6 +41,18 @@
 
 DOTLANG_FILES = ['main', 'base', 'newsletter']
 
+# Paths that don't require a locale code in the URL.
+# matches the first url component (e.g. mozilla.org/gameon/)
+SUPPORTED_NONLOCALES = [
+    'media',
+    'admin',
+
+    # from redirects.urls
+    'telemetry',
+    'webmaker',
+    'gameon',
+]
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '1iz#v0m55@h26^m6hxk3a7at*h$qj_2a$juu1#nv50548j(x1v'