diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-05-06 19:03:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 19:03:52 -0700 |
| commit | d4dddf53e6de2c4dc69d08ff0e00d7cc144c4931 (patch) | |
| tree | aa68d97aeb8b78b3d360d3cdea67c54aa44a34f8 /scripts | |
| parent | 534100530c1bc53b797676fbeb56c376756b9312 (diff) | |
| parent | 4561ea57ef9d075c04f00f765901a1d3de9e11b4 (diff) | |
| download | android_development-d4dddf53e6de2c4dc69d08ff0e00d7cc144c4931.tar.gz android_development-d4dddf53e6de2c4dc69d08ff0e00d7cc144c4931.tar.bz2 android_development-d4dddf53e6de2c4dc69d08ff0e00d7cc144c4931.zip | |
am 4561ea57: am 04ed3fe8: am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '4561ea57ef9d075c04f00f765901a1d3de9e11b4':
Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/app_engine_server/memcache_zipserve.py | 2 | ||||
| -rw-r--r-- | scripts/app_engine_server/redirects.yaml | 8 |
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 ---------------------- |