From a4c6c134d7a055cf927487554bae3673b43d4cc5 Mon Sep 17 00:00:00 2001 From: "Francesco Lodolo (:flod)" Date: Mon, 7 Jul 2014 21:02:50 +0200 Subject: [PATCH] Bug 1035364 - [uz] Enable Uzbek on bedrock --- bedrock/settings/base.py | 4 ++-- etc/httpd/global.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bedrock/settings/base.py b/bedrock/settings/base.py index fbfa7deb66..6d989010b2 100644 --- a/bedrock/settings/base.py +++ b/bedrock/settings/base.py @@ -38,8 +38,8 @@ PROD_LANGUAGES = ('ach', 'af', 'ak', 'an', 'ar', 'as', 'ast', 'az', 'be', 'bg', 'mai', 'mk', 'ml', 'mn', 'mr', 'ms', 'my', 'nb-NO', 'nl', 'nn-NO', 'nso', 'oc', 'or', 'pa-IN', 'pl', 'pt-BR', 'pt-PT', 'rm', 'ro', 'ru', 'sah', 'si', 'sk', 'sl', 'son', 'sq', 'sr', - 'sv-SE', 'sw', 'ta', 'ta-LK', 'te', 'th', 'tr', 'uk', - 'ur', 'vi', 'wo', 'xh', 'zh-CN', 'zh-TW', 'zu') + 'sv-SE', 'sw', 'ta', 'ta-LK', 'te', 'th', 'tr', 'uk', 'ur', + 'uz', 'vi', 'wo', 'xh', 'zh-CN', 'zh-TW', 'zu') DEV_LANGUAGES = list(DEV_LANGUAGES) + ['en-US'] FEED_CACHE = 3900 diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf index 413047c6df..192bf94dbb 100644 --- a/etc/httpd/global.conf +++ b/etc/httpd/global.conf @@ -198,7 +198,7 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/sync(/?)$ /b/$1firefox/sync$2 [PT] # Bug 925278 # TODO: Remove when all locales are done. -RewriteRule ^/(af|an|ar|as|ast|az|be|br|ca|cs|cy|da|de|dsb|el|en-GB|en-ZA|eo|es-AR|es-ES|es-CL|es-MX|et|eu|fa|fi|ff|fr|fy-NL|ga-IE|gd|gl|he|hr|hsb|hu|hy-AM|id|is|it|ja|km|ko|ku|lt|lv|mk|ml|mr|ms|nb-NO|nl|oc|pa-IN|pl|pt-BR|pt-PT|rm|ro|ru|sk|sl|sq|sr|sv-SE|ta|te|tr|uk|vi|xh|zh-CN|zh-TW)/firefox/channel(/?)$ /b/$1/firefox/channel$2 [PT] +RewriteRule ^/(af|an|ar|as|ast|az|be|br|ca|cs|cy|da|de|dsb|el|en-GB|en-ZA|eo|es-AR|es-ES|es-CL|es-MX|et|eu|fa|fi|ff|fr|fy-NL|ga-IE|gd|gl|he|hr|hsb|hu|hy-AM|id|is|it|ja|km|ko|ku|lt|lv|mk|ml|mr|ms|nb-NO|nl|oc|pa-IN|pl|pt-BR|pt-PT|rm|ro|ru|sk|sl|sq|sr|sv-SE|ta|te|tr|uk|uz|vi|xh|zh-CN|zh-TW)/firefox/channel(/?)$ /b/$1/firefox/channel$2 [PT] # bug 929775 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/update(.*)?$ /$1firefox/new/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=firefox-update-redirect [L,R=301] @@ -208,7 +208,7 @@ RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/community(/?)$ /$1contribute/ [L,R=3 # bug 881754, 883127 # TODO: Remove when all locales are done. -RewriteRule ^/(af|an|ar|as|ast|az|be|bg|br|ca|cs|csb|cy|da|de|dsb|el|en-GB|en-ZA|eo|es-AR|es-CL|es-ES|es-MX|et|eu|fa|fi|ff|fr|fy-NL|ga-IE|gd|gl|he|hi-IN|hr|hsb|hu|hy-AM|id|is|it|ja|ka|kk|km|ko|ku|lij|lt|lv|mk|ml|mr|ms|my|nb-NO|nl|oc|pa-IN|pl|pt-BR|pt-PT|rm|ro|ru|sk|sl|son|sq|sr|sv-SE|ta|te|th|tr|uk|ur|vi|xh|zh-CN|zh-TW)/firefox/new(/?)$ /b/$1/firefox/new$2 [PT] +RewriteRule ^/(af|an|ar|as|ast|az|be|bg|br|ca|cs|csb|cy|da|de|dsb|el|en-GB|en-ZA|eo|es-AR|es-CL|es-ES|es-MX|et|eu|fa|fi|ff|fr|fy-NL|ga-IE|gd|gl|he|hi-IN|hr|hsb|hu|hy-AM|id|is|it|ja|ka|kk|km|ko|ku|lij|lt|lv|mk|ml|mr|ms|my|nb-NO|nl|oc|pa-IN|pl|pt-BR|pt-PT|rm|ro|ru|sk|sl|son|sq|sr|sv-SE|ta|te|th|tr|uk|ur|uz|vi|xh|zh-CN|zh-TW)/firefox/new(/?)$ /b/$1/firefox/new$2 [PT] # Bug 1006616 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?download/?$ /$1firefox/new/ [L,R=301]