Merge pull request #3266 from chikoski/bug1200464

[bug1200464] Fixed the redirection bugs in ja locale
mozilla · Sep 8, 2015 · 81d996a · 81d996a
2 parents a17313d + 7ecde6f
commit 81d996a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
@@ -125,11 +125,10 @@ RewriteRule ^/ja/?$ http://www.mozilla.jp/ [L,R]
 # bug 1051686
 RewriteRule ^/ja/firefox/organizations/?$ http://www.mozilla.jp/business/downloads/ [L,R=301]
 
-# bug 1138280
-RewriteRule ^/ja/(firefox|thunderbird)/(beta/)?notes/ http://mozilla.jp/$1$2/notes/ [L,R=301]
-RewriteRule ^/ja/mobile/(beta/?)notes/ http://mozilla.jp/android/$1$2/notes/ [L,R=301]
-RewriteRule ^/ja/(firefox|thunderbird)/(\d+\.\d+(\.\d+)*)(beta)?/releasenotes(/?|/.+)$ http://mozilla.jp/firefox/$1/$2$3/releasenotes/ [L,R=301]
-RewriteRule ^/ja/mobile/(\d+\.\d+(\.\d+)*)(beta)?/releasenotes(/?|/.+)$ http://mozillla.jp/firefox/android/$1$2/releasenotes/ [L,R=301]
+# bug 1138280, bug 1200464
+RewriteRule ^/ja/(firefox|thunderbird)/(beta/)?notes/? http://www.mozilla.jp/$1/$2notes/ [L,R=301]
+RewriteRule ^/ja/(firefox|thunderbird)/((android/)?[0-9.]+(beta)?)/releasenotes/? http://www.mozilla.jp/$1/$2/releasenotes/ [L,R=301]
+
 
 ## Redirect things to django!