Changeset 785
- Timestamp:
- 2007-11-01 10:55:18 (1 year ago)
- Files:
-
- trunk/app/helpers/application_helper.rb (modified) (1 diff)
- trunk/lib/parser/lib/rules/zazen.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/helpers/application_helper.rb
r775 r785 249 249 # TODO: test 250 250 def make_wiki_link(opts) 251 l = opts[:node] ? opts[:node].version.lang : lang 251 252 if opts[:url] 252 253 if opts[:url][0..3] == 'http' 253 254 "<a href='#{opts[:url]}' class='wiki'>#{opts[:title]}</a>" 254 255 else 255 "<a href='http://#{l ang}.wikipedia.org/wiki/#{opts[:url]}' class='wiki'>#{opts[:title]}</a>"256 end 257 else 258 "<a href='http://#{l ang}.wikipedia.org/wiki/Special:Search?search=#{CGI::escape(opts[:title])}' class='wiki'>#{opts[:title]}</a>"256 "<a href='http://#{l}.wikipedia.org/wiki/#{opts[:url]}' class='wiki'>#{opts[:title]}</a>" 257 end 258 else 259 "<a href='http://#{l}.wikipedia.org/wiki/Special:Search?search=#{CGI::escape(opts[:title])}' class='wiki'>#{opts[:title]}</a>" 259 260 end 260 261 end trunk/lib/parser/lib/rules/zazen.rb
r744 r785 255 255 if url =~ /[^\w0-9]$/ 256 256 # keep trailing punctuation 257 store @helper.make_wiki_link(:title=>title, :url=>url[0..-2] ) + $&258 else 259 store @helper.make_wiki_link(:title=>title, :url=>url )260 end 261 else 262 store @helper.make_wiki_link(:title=>title ) + $2257 store @helper.make_wiki_link(:title=>title, :url=>url[0..-2], :node=>@context[:node]) + $& 258 else 259 store @helper.make_wiki_link(:title=>title, :url=>url, :node=>@context[:node]) 260 end 261 else 262 store @helper.make_wiki_link(:title=>title, :node=>@context[:node]) + $2 263 263 end 264 264 else
