From 270396a0a705dfad4bd8e6716e020b57daa03b99 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Tue, 31 Mar 2015 14:56:59 +0000
Subject: [PATCH] Revert "drop de_CH and use de_DE translations instead"

This reverts commit bd9b463d180210e53c877d266470002739d02830.
---
 roles/fedora-web/boot/files/languages.conf      | 10 +++++-----
 roles/fedora-web/community/files/languages.conf | 10 +++++-----
 roles/fedora-web/fudcon/files/languages.conf    | 10 +++++-----
 roles/fedora-web/getfedora/files/languages.conf | 10 +++++-----
 roles/fedora-web/main/files/languages.conf      | 10 +++++-----
 roles/fedora-web/spins/files/languages.conf     | 10 +++++-----
 roles/fedora-web/start/files/languages.conf     | 10 +++++-----
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/roles/fedora-web/boot/files/languages.conf b/roles/fedora-web/boot/files/languages.conf
index 2342c8fcc1..b238d626a9 100644
--- a/roles/fedora-web/boot/files/languages.conf
+++ b/roles/fedora-web/boot/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/boot.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/boot.fedoraproject.org$1
 
 <Directory /srv/web/boot.fedoraproject.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/community/files/languages.conf b/roles/fedora-web/community/files/languages.conf
index 4ee202a767..24db85673b 100644
--- a/roles/fedora-web/community/files/languages.conf
+++ b/roles/fedora-web/community/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fedoracommunity.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fedoracommunity.org$1
 
 <Directory /srv/web/fedoracommunity.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/fudcon/files/languages.conf b/roles/fedora-web/fudcon/files/languages.conf
index 1aacb05a53..c5635ab01f 100644
--- a/roles/fedora-web/fudcon/files/languages.conf
+++ b/roles/fedora-web/fudcon/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fudcon.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fudcon.fedoraproject.org$1
 
 <Directory /srv/web/fudcon.fedoraproject.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/getfedora/files/languages.conf b/roles/fedora-web/getfedora/files/languages.conf
index 9007a8f736..f5d588b023 100644
--- a/roles/fedora-web/getfedora/files/languages.conf
+++ b/roles/fedora-web/getfedora/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/getfedora.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/getfedora.org$1
 
 <Directory /srv/web/getfedora.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/main/files/languages.conf b/roles/fedora-web/main/files/languages.conf
index 899513a6b9..4db0ada7eb 100644
--- a/roles/fedora-web/main/files/languages.conf
+++ b/roles/fedora-web/main/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fedoraproject.org$1
 
 <Directory /srv/web/fedoraproject.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/spins/files/languages.conf b/roles/fedora-web/spins/files/languages.conf
index b9973f9a4d..1786596653 100644
--- a/roles/fedora-web/spins/files/languages.conf
+++ b/roles/fedora-web/spins/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/spins.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/spins.fedoraproject.org$1
 
 <Directory /srv/web/spins.fedoraproject.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
diff --git a/roles/fedora-web/start/files/languages.conf b/roles/fedora-web/start/files/languages.conf
index 888997e9cc..db31ca9dbb 100644
--- a/roles/fedora-web/start/files/languages.conf
+++ b/roles/fedora-web/start/files/languages.conf
@@ -19,7 +19,7 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de
+AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -74,9 +74,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/start.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/start.fedoraproject.org$1
 
 <Directory /srv/web/start.fedoraproject.org>
   Options MultiViews
@@ -94,7 +94,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de
+  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb