diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-09-17 19:32:53 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-09-17 19:32:53 +0000 |
| commit | fb577596044efb049a0ea74c7c74f7f5ebcd91d2 (patch) | |
| tree | f21872ccb0e923f0b08849af8831778ba1da81c1 | |
| parent | 6078c16e3e4755bf80533cb654c39bb2e7870043 (diff) | |
| download | brdo-fb577596044efb049a0ea74c7c74f7f5ebcd91d2.tar.gz brdo-fb577596044efb049a0ea74c7c74f7f5ebcd91d2.tar.bz2 | |
#228761 by zsanmartin and roborn: Fix language code regex and correct Portugal's language code.
| -rw-r--r-- | includes/locale.inc | 2 | ||||
| -rw-r--r-- | install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 31c88317f..fbe8f6e0b 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -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"), diff --git a/install.php b/install.php index 159761e78..6c01f1040 100644 --- a/install.php +++ b/install.php @@ -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"); |