diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-31 10:47:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-31 10:47:19 +0000 |
| commit | 6abd32be9e95954ca84285acf9c105f4bc7753aa (patch) | |
| tree | dcebe9ede59d9ad623f71b583fdc19732f176544 | |
| parent | 56318aab5381d0b8edcba64f32be90e64c2c1eb2 (diff) | |
| download | redmine-6abd32be9e95954ca84285acf9c105f4bc7753aa.tar.gz redmine-6abd32be9e95954ca84285acf9c105f4bc7753aa.zip | |
Merged r2212 to r2214 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2215 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 1 | ||||
| -rw-r--r-- | lang/pt-br.yml | 4 | ||||
| -rw-r--r-- | lib/redcloth3.rb | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 56db00855..a935ce9ec 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -526,6 +526,7 @@ module ApplicationHelper def back_url_hidden_field_tag back_url = params[:back_url] || request.env['HTTP_REFERER'] + back_url = CGI.unescape(back_url.to_s) hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank? end diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 72137889b..c0320b9c1 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -47,8 +47,8 @@ general_text_Yes: 'Sim' general_text_no: 'não' general_text_yes: 'sim' general_lang_name: 'Português(Brasil)' -general_csv_separator: ',' -general_csv_decimal_separator: '.' +general_csv_separator: ';' +general_csv_decimal_separator: ',' general_csv_encoding: ISO-8859-1 general_pdf_encoding: ISO-8859-1 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index ae17f6760..c138450a2 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -791,7 +791,10 @@ class RedCloth3 < String \s? (?:\(([^)]+?)\)(?="))? # $title ": - ([\w\/]\S+?) # $url + ( # $url + (\/|https?:\/\/|s?ftps?:\/\/|www\.) + [\w\/]\S+? + ) (\/)? # $slash ([^\w\=\/;\(\)]*?) # $post (?=<|\s|$) @@ -799,7 +802,7 @@ class RedCloth3 < String #" def inline_textile_link( text ) text.gsub!( LINK_RE ) do |m| - pre,atts,text,title,url,slash,post = $~[1..7] + pre,atts,text,title,url,proto,slash,post = $~[1..8] url, url_title = check_refs( url ) title ||= url_title |