diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-09-25 16:53:38 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-09-25 16:53:38 +0000 |
| commit | a54c76a1fc8917231c034ffc1938fe54b77b7c3d (patch) | |
| tree | a9e23d9c801952945ac52140d6d82b769a1ce263 /roundcubemail/program/steps | |
| parent | 91d7d2e8e58f5858a49f17e259ef597ccecea2a9 (diff) | |
*** empty log message ***
git-svn-id: https://svn.roundcube.net/trunk@7 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 6 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 2109bed3a..d53b8b0c3 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -427,13 +427,13 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_pr $url_chars_within = '\?\.~,!'; $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; - $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', \$replace_strings)"; $convert_patterns[] = "/([^\/:]|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; - $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', \$replace_strings)"; $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie'; - $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', &\$replace_strings)"; + $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)"; $body = wordwrap(trim($body), 80); $body = preg_replace($convert_patterns, $convert_replaces, $body); diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 826717fd9..c48f41c90 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -51,8 +51,13 @@ function rcmail_user_prefs_form($attrib) // show language selection $field_id = 'rcmfd_lang'; $select_lang = new select(array('name' => '_language', 'id' => $field_id)); - $select_lang->add('English', 'en'); + // $select_lang->add('Czech', 'cs'); + $select_lang->add('Dansk', 'da'); $select_lang->add('Deutsch', 'de'); + $select_lang->add('English', 'en'); + $select_lang->add('Espanol', 'es'); + $select_lang->add('Fran¨ais', 'fr'); + $select_lang->add('Italiano', 'it'); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, |