nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added vimeo method, still needs support from lib/youtube_titles.rb. updated locales

Browse source
This commit is contained in:
Dan Hansen & Sarah Mei 2010-12-15 01:20:53 -05:00
parent c4a7745c88
commit fbfe28bcfa
31 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/helpers/application_helper.rb
View file

@ -178,6 +178,7 @@ module ApplicationHelper
message = process_autolinks(message)
message = process_emphasis(message)
message = process_youtube_again(message, options[:youtube_maps])
message = process_vimeo(message, options[:vimeo_maps])
if options[:newlines]
message.gsub!(/\n+/, '<br />')
@ -245,13 +246,28 @@ module ApplicationHelper
if youtube_maps && youtube_maps[video_id]
title = youtube_maps[video_id]
else
title = I18n.t 'application.helper.youtube_title.unknown'
title = I18n.t 'application.helper.video_title.unknown'
end
message.gsub!('youtube.com::'+video_id, '<a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
end
return message
end
def process_vimeo(message, vimeo_maps)
regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})/
while vimeo = message.match(regex)
video_id = vimeo[1]
if vimeo_maps && vimeo_maps[video_id]
title = vimeo_maps[video_id]
else
title = I18n.t 'application.helper.video_title.unknown'
end
message.gsub!(vimeo[0], '<a class="video-link" data-host="vimeo.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
end
return message
end
def info_text(text)
image_tag 'icons/monotone_question.png', :class => 'what_is_this', :title => text
end

2
config/locales/diaspora/ar.yml
View file

@ -30,7 +30,7 @@ ar:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "شخص غير معروف"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/ca.yml
View file

@ -30,7 +30,7 @@ ca:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconeguda"
youtube_title:
video_title:
unknown: "Títol desconegut de vídeo"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/cs.yml
View file

@ -30,7 +30,7 @@ cs:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "neznámá osoba"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/cy.yml
View file

@ -30,7 +30,7 @@ cy:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "unknown person"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/da.yml
View file

@ -30,7 +30,7 @@ da:
aspect_badge:
all_aspects: "Alle aspekter"
unknown_person: "ukendt person"
youtube_title:
video_title:
unknown: "Ukendt videotitel"
are_you_sure: "Er du sikker?"
aspects:

2
config/locales/diaspora/de.yml
View file

@ -30,7 +30,7 @@ de:
aspect_badge:
all_aspects: "Alle Aspekte"
unknown_person: "unbekannte Person"
youtube_title:
video_title:
unknown: "Unbekannter Video-Titel"
are_you_sure: "Bist du sicher?"
aspects:

2
config/locales/diaspora/el.yml
View file

@ -30,7 +30,7 @@ el:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "άγνωστο άτομο"
youtube_title:
video_title:
unknown: "αγνώστος τίτλος αρχείου πολυμέσων"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/en.yml
View file

@ -60,7 +60,7 @@ en:
application:
helper:
unknown_person: "unknown person"
youtube_title:
video_title:
unknown: "Unknown Video Title"
aspect_badge:
all_aspects: "All aspects"

2
config/locales/diaspora/eo.yml
View file

@ -30,7 +30,7 @@ eo:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "unknown person"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/es-CL.yml
View file

@ -30,7 +30,7 @@ es-CL:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconocida"
youtube_title:
video_title:
unknown: "Titulo del video desconocido"
are_you_sure: "¿Estás seguro?"
aspects:

2
config/locales/diaspora/es.yml
View file

@ -30,7 +30,7 @@ es:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconocida"
youtube_title:
video_title:
unknown: "Título Desconocido de Vídeo"
are_you_sure: "¿Estás seguro?"
aspects:

2
config/locales/diaspora/fi.yml
View file

@ -30,7 +30,7 @@ fi:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "tuntematon persoona"
youtube_title:
video_title:
unknown: "Videon otsikko tuntematon"
are_you_sure: "Oletko varma?"
aspects:

2
config/locales/diaspora/fr.yml
View file

@ -30,7 +30,7 @@ fr:
aspect_badge:
all_aspects: "Tous les aspects"
unknown_person: "personne inconnue"
youtube_title:
video_title:
unknown: "Titre de vidéo inconnu"
are_you_sure: "Vous confirmez ?"
aspects:

2
config/locales/diaspora/he.yml
View file

@ -30,7 +30,7 @@ he:
aspect_badge:
all_aspects: "כל ההיבטים"
unknown_person: "אדם לא ידוע"
youtube_title:
video_title:
unknown: "כותרת הווידאו אינה ידועה"
are_you_sure: "בבטחה?"
aspects:

2
config/locales/diaspora/hu.yml
View file

@ -30,7 +30,7 @@ hu:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "ismeretlen személy"
youtube_title:
video_title:
unknown: "Ismeretlen videó cím"
are_you_sure: "Biztos vagy benne?"
aspects:

2
config/locales/diaspora/id.yml
View file

@ -30,7 +30,7 @@ id:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "orang tak dikenal"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/it.yml
View file

@ -30,7 +30,7 @@ it:
aspect_badge:
all_aspects: "Tutti gli aspetti"
unknown_person: "persona sconosciuta"
youtube_title:
video_title:
unknown: "Titolo Video Sconosciuto"
are_you_sure: "Sei sicuro?"
aspects:

2
config/locales/diaspora/lt.yml
View file

@ -30,7 +30,7 @@ lt:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "nežinomas asmuo"
youtube_title:
video_title:
unknown: "Nežinomas video pavadinimas"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/mk.yml
View file

@ -30,7 +30,7 @@ mk:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "непозната личност"
youtube_title:
video_title:
unknown: "Непознато име на видео"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/nb.yml
View file

@ -30,7 +30,7 @@ nb:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "ukjent person"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/nl.yml
View file

@ -30,7 +30,7 @@ nl:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "onbekend persoon"
youtube_title:
video_title:
unknown: "Onbekende video titel"
are_you_sure: "Weet je het zeker?"
aspects:

2
config/locales/diaspora/pl.yml
View file

@ -30,7 +30,7 @@ pl:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "nieznana osoba"
youtube_title:
video_title:
unknown: "Nieznany tytuł wideo"
are_you_sure: "Na pewno?"
aspects:

2
config/locales/diaspora/pt-BR.yml
View file

@ -30,7 +30,7 @@ pt-BR:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "pessoa desconhecida"
youtube_title:
video_title:
unknown: "Título de vídeo desconhecido"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/pt-PT.yml
View file

@ -30,7 +30,7 @@ pt-PT:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "utilizador(a) desconhecido(a)"
youtube_title:
video_title:
unknown: "Título do Vídeo Desconhecido"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/ro.yml
View file

@ -30,7 +30,7 @@ ro:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persoană necunoscută"
youtube_title:
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/ru.yml
View file

@ -30,7 +30,7 @@ ru:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "неизвестная персона"
youtube_title:
video_title:
unknown: "Неизвестный видео заголовок"
are_you_sure: "Вы уверены?"
aspects:

2
config/locales/diaspora/sk.yml
View file

@ -30,7 +30,7 @@ sk:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "neznáma osoba"
youtube_title:
video_title:
unknown: "Názov videa neznámy"
are_you_sure: "Are you sure?"
aspects:

2
config/locales/diaspora/sv.yml
View file

@ -30,7 +30,7 @@ sv:
aspect_badge:
all_aspects: "Alla sidor"
unknown_person: "okänd person"
youtube_title:
video_title:
unknown: "Okänd videotitel"
are_you_sure: "Är du säker?"
aspects:

2
config/locales/diaspora/tr.yml
View file

@ -30,7 +30,7 @@ tr:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "bilinmiyen kişiler"
youtube_title:
video_title:
unknown: "Bilinmeyen Video Başlığı"
are_you_sure: "Are you sure?"
aspects:

8
spec/helpers/application_helper_spec.rb
View file

@ -73,6 +73,14 @@ describe ApplicationHelper do
end
describe "video links" do
it "recognizes vimeo links" do
video_id = "17449557"
url = "http://www.vimeo.com/#{video_id}"
res = markdownify(url)
res.should =~ /data-host="vimeo.com"/
res.should =~ /data-video-id="#{video_id}"/
end
it "recognizes youtube links" do
video_id = "0x__dDWdf23"
url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"