summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-05-04 12:27:49 -0700
committerDirk Dougherty <ddougherty@google.com>2013-05-06 18:44:36 -0700
commit4df667f498ccdcde28a572a5e45c8324e3d1c598 (patch)
tree1da51099c49cc383c20c56255f4e98a3d8995efd /scripts
parent952b2a0f132b90b2fdea43bdc3f5eba0fe4f8464 (diff)
downloadandroid_development-4df667f498ccdcde28a572a5e45c8324e3d1c598.tar.gz
android_development-4df667f498ccdcde28a572a5e45c8324e3d1c598.tar.bz2
android_development-4df667f498ccdcde28a572a5e45c8324e3d1c598.zip
Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
Change-Id: I1fada8710a43a9ac8d3d2d12a53023e78d686513
Diffstat (limited to 'scripts')
-rw-r--r--scripts/app_engine_server/memcache_zipserve.py2
-rw-r--r--scripts/app_engine_server/redirects.yaml8
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/app_engine_server/memcache_zipserve.py b/scripts/app_engine_server/memcache_zipserve.py
index 68aa0dd32..dfd7de9d0 100644
--- a/scripts/app_engine_server/memcache_zipserve.py
+++ b/scripts/app_engine_server/memcache_zipserve.py
@@ -110,7 +110,7 @@ class MemcachedZipHandler(webapp.RequestHandler):
REDIRECT_TYPE_TEMP = 'temporary' # Redirect 'type'string indicate a 302
# Redirect should be served
intlString = 'intl/'
- validLangs = ['en', 'de', 'es', 'fr','it','ja','ko','ru','zh-CN','zh-TW']
+ validLangs = ['en', 'de', 'es', 'fr','it','ja','ko','ru','zh-CN','zh-cn','zh-TW','zh-tw']
def TrueGet(self, reqUri):
"""The top-level entry point to serving requests.
diff --git a/scripts/app_engine_server/redirects.yaml b/scripts/app_engine_server/redirects.yaml
index bae2ff053..fb2e42227 100644
--- a/scripts/app_engine_server/redirects.yaml
+++ b/scripts/app_engine_server/redirects.yaml
@@ -543,9 +543,13 @@ redirects:
type: permanent
comment: Redirect to new location
+- src: /intl/zh-CN/...
+ dst: /intl/zh-cn/...
+ type: permanent
-
-
+- src: /intl/zh-TW/...
+ dst: /intl/zh-tw/...
+ type: permanent
# -------------------- EASTER EGG REDIRECTS ----------------------