Commit fb577596 authored by webchick's avatar webchick

#228761 by zsanmartin and roborn: Fix language code regex and correct Portugal's language code.

parent 6078c16e
......@@ -2385,7 +2385,7 @@ function _locale_get_predefined_list() {
"pi" => array("Pali"),
"pl" => array("Polish", "Polski"),
"ps" => array("Pashto", /* Left-to-right marker "‭" */ "پښتو", LANGUAGE_RTL),
"pt" => array("Portuguese, Portugal", "Português"),
"pt-pt" => array("Portuguese, Portugal", "Português"),
"pt-br" => array("Portuguese, Brazil", "Português"),
"qu" => array("Quechua"),
"rm" => array("Rhaeto-Romance"),
......
......@@ -101,7 +101,7 @@ function install_main() {
// Locale selection
if (!empty($_GET['locale'])) {
$install_locale = preg_replace('/[^a-zA-Z_0-9]/', '', $_GET['locale']);
$install_locale = preg_replace('/[^a-zA-Z_0-9\-]/', '', $_GET['locale']);
}
elseif (($install_locale = install_select_locale($profile)) !== FALSE) {
install_goto("install.php?profile=$profile&locale=$install_locale");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment