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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
maxwell 2010-12-15 12:28:09 -08:00
commit 61b2bbbd7d
38 changed files with 488 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/status_messages_controller.rb
View file

@ -65,11 +65,11 @@ class StatusMessagesController < ApplicationController
@status_message = current_user.my_posts.where(:_id => params[:id]).first
if @status_message
@status_message.destroy
render :nothing => true, :status => 200
else
Rails.logger.info "event=post_destroy status=failure user=#{current_user.diaspora_handle} reason='User does not own post'"
render :nothing => true, :status => 404
end
respond_with :location => root_url
end
def show

188
app/helpers/application_helper.rb
View file

@ -24,21 +24,24 @@ module ApplicationHelper
post.aspect_ids.include?(a.id)
end
end
def aspects_without_post aspects, post
aspects.reject do |a|
post.aspect_ids.include?(a.id)
end
end
def aspect_badge aspects
str = ''
if aspects.count > 1
str = "<span class='aspect_badge all'>#{I18n.t('application.helper.aspect_badge.all_aspects')}</span>"
elsif aspects.count == 1
aspect = aspects.first
str = "<span class='aspect_badge single'><a href=#{aspect_path(aspect)}>#{aspect.name}</a></span>"
str = "<span class='aspect_badge single'><a href=#{aspect_path(aspect)}>#{aspect.name}</a></span>"
end
str.html_safe
end
def aspect_links aspects, opts={}
str = ""
aspects.each do |a|
@ -46,15 +49,16 @@ module ApplicationHelper
end
str.html_safe
end
def aspect_li aspect, opts= {}
param_string = ""
if opts.size > 0
param_string << '?'
opts.each_pair do |k,v|
opts.each_pair do |k, v|
param_string << "#{k}=#{v}"
end
end
"<li>
"<li>
<a href='/aspects/#{aspect.id}#{param_string}'>
#{aspect.name}
</a>
@ -98,12 +102,12 @@ module ApplicationHelper
def person_url(person)
case person.class.to_s
when "User"
user_path(person)
when "Person"
person_path(person)
else
I18n.t('application.helper.unknown_person')
when "User"
user_path(person)
when "Person"
person_path(person)
else
I18n.t('application.helper.unknown_person')
end
end
@ -124,28 +128,28 @@ module ApplicationHelper
end
def person_link(person)
"<a href='/people/#{person.id}'>
"<a href='/people/#{person.id}'>
#{person.name}
</a>".html_safe
end
def image_or_default(person, size=:thumb_large)
image_location = person.profile.image_url(size) if person.profile
image_location ||= person.profile.image_url(:thumb_large) if person.profile #backwards compatability for old profile pictures
image_location ||= person.profile.image_url(:thumb_large) if person.profile #backwards compatability for old profile pictures
image_location ||= "/images/user/default.png"
image_location
end
def hard_link(string, path)
link_to string, path, :rel => 'external'
link_to string, path, :rel => 'external'
end
def person_image_link(person, opts = {})
return "" if person.nil?
if opts[:to] == :photos
link_to person_image_tag(person,opts[:size]), person_photos_path(person)
link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else
"<a href='/people/#{person.id}'>
"<a href='/people/#{person.id}'>
#{person_image_tag(person)}
</a>".html_safe
end
@ -158,78 +162,23 @@ module ApplicationHelper
def person_photos_path person
person_id = person.id if person.respond_to?(:id)
person_id ||= person
"#{photos_path}?person_id=#{person_id}"
end
def markdownify(message, options = {})
message = h(message).html_safe
[:autolinks, :youtube, :emphasis, :links, :newlines].each do |k|
if !options.has_key?(k)
options[k] = true
end
if !options.has_key?(:newlines)
options[:newlines] = true
end
if options[:links]
message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m|
escape = (options[:emphasis]) ? "\\" : ""
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\" title=\"#{$3}\">#{$1}</a>"
res
end
message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m|
escape = (options[:emphasis]) ? "\\" : ""
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\">#{$1}</a>"
res
end
end
if options[:youtube]
message.gsub!(/( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_]+)(&[^ ]*|)/) do |m|
res = "#{$1}youtube.com::#{$3}"
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis]
res
end
end
if options[:autolinks]
message.gsub!(/( |^)(www\.[^\s]+\.[^\s])/, '\1http://\2')
message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^\s]+)/) do |m|
if !$1.nil?
m
else
res = %{<a target="_blank" href="#{$2}://#{$3}">#{$3}</a>}
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis]
res
end
end
end
if options[:emphasis]
message.gsub!("\\**", "-^doublestar^-")
message.gsub!("\\__", "-^doublescore^-")
message.gsub!("\\*", "-^star^-")
message.gsub!("\\_", "-^score^-")
message.gsub!(/(\*\*\*|___)(.+?)\1/m, '<em><strong>\2</strong></em>')
message.gsub!(/(\*\*|__)(.+?)\1/m, '<strong>\2</strong>')
message.gsub!(/(\*|_)(.+?)\1/m, '<em>\2</em>')
message.gsub!("-^doublestar^-", "**")
message.gsub!("-^doublescore^-", "__")
message.gsub!("-^star^-", "*")
message.gsub!("-^score^-", "_")
end
if options[:youtube]
while youtube = message.match(/youtube\.com::([A-Za-z0-9_\\\-]+)/)
video_id = youtube[1]
if options[:youtube_maps] && options[:youtube_maps][video_id]
title = options[:youtube_maps][video_id]
else
title = I18n.t 'application.helper.youtube_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
end
message = process_links(message)
message = process_youtube(message)
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 />')
@ -238,6 +187,87 @@ module ApplicationHelper
return message
end
def process_links(message)
message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m|
escape = "\\"
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\" title=\"#{$3}\">#{$1}</a>"
res
end
message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m|
escape = "\\"
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\">#{$1}</a>"
res
end
return message
end
def process_youtube(message)
message.gsub!(/( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_]+)(&[^ ]*|)/) do |m|
res = "#{$1}youtube.com::#{$3}"
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" }
res
end
return message
end
def process_autolinks(message)
message.gsub!(/( |^)(www\.[^\s]+\.[^\s])/, '\1http://\2')
message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^\s]+)/) do |m|
if !$1.nil?
m
else
res = %{<a target="_blank" href="#{$2}://#{$3}">#{$3}</a>}
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" }
res
end
end
return message
end
def process_emphasis(message)
message.gsub!("\\**", "-^doublestar^-")
message.gsub!("\\__", "-^doublescore^-")
message.gsub!("\\*", "-^star^-")
message.gsub!("\\_", "-^score^-")
message.gsub!(/(\*\*\*|___)(.+?)\1/m, '<em><strong>\2</strong></em>')
message.gsub!(/(\*\*|__)(.+?)\1/m, '<strong>\2</strong>')
message.gsub!(/(\*|_)(.+?)\1/m, '<em>\2</em>')
message.gsub!("-^doublestar^-", "**")
message.gsub!("-^doublescore^-", "__")
message.gsub!("-^star^-", "*")
message.gsub!("-^score^-", "_")
return message
end
def process_youtube_again(message, youtube_maps)
while youtube = message.match(/youtube\.com::([A-Za-z0-9_\\\-]+)/)
video_id = youtube[1]
if youtube_maps && youtube_maps[video_id]
title = youtube_maps[video_id]
else
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
app/views/publics/host_meta.erb
View file

@ -3,7 +3,7 @@
xmlns:hm='http://host-meta.net/xrd/1.0'>
<hm:Host><%= APP_CONFIG[:pod_uri].host %></hm:Host>
<Link rel='lrdd'
template='<%= APP_CONFIG[:pod_uri].host %>/webfinger?q={uri}'>
template='<%= APP_CONFIG[:pod_url] %>webfinger?q={uri}'>
<Title>Resource Descriptor</Title>
</Link>
</XRD>

10
config/locales/devise/devise.de.yml
View file

@ -44,8 +44,8 @@ de:
subject: "Zurücksetzen deines Passworts"
wont_change: "Dein Passwort bleibt unverändert bis du es über den Link änderst."
unlock_instructions:
account_locked: "Dein Konto wurde aufgrund zu vielen fehlgeschlagenen Anmeldeversuchen gesperrt."
click_to_unlock: "Folge unten aufgeführtem Link, um dein Konto zu entsperren:"
account_locked: "Dein Konto wurde aufgrund zu vieler fehlgeschlagener Anmeldeversuche gesperrt."
click_to_unlock: "Folge dem unten aufgeführtem Link, um dein Konto zu entsperren:"
subject: "Konto entsperren"
unlock: "Mein Konto entsperren"
welcome: "Willkommen %{email}!"
@ -58,14 +58,14 @@ de:
send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt."
updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet."
registrations:
destroyed: "Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen."
destroyed: "Tschüss! Dein Konto wurde erfolgreich geschlossen. Wir hoffen dich bald wiederzusehen."
signed_up: "Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet."
updated: "Dein Konto wurde aktualisiert."
sessions:
new:
alpha_software: "Diese Software befindet sich im Alpha-Stadium."
bugs_and_feedback: "Du bist gewarnt, Fehler werden auftreten. Wir empfehlen dir, den Feedback-Knopf am rechten Browserrand zu nutzen, um diese zu berichten. Wir werden so schnell wie möglich daran arbeiten, alle Probleme zu beseitigen."
bugs_and_feedback_mobile: "Sei gewarnt, du wirst auf Bugs stoßen. Wir ermutigen dich, alle Störungen zu melden! Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
bugs_and_feedback: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, den Feedback-Knopf am rechten Browserrand zu nutzen, um alle Störungen zu berichten. Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
bugs_and_feedback_mobile: "Sei gewarnt, Fehler werden auftreten. Wir empfehlen dir, alle Störungen zu melden! Wir werden so schnell wir können arbeiten, um alle Probleme, die du meldest, zu lösen."
have_a_problem: "Du hast ein Problem? Finde eine Antwort hier (Englisch)"
login: "Einloggen"
modern_browsers: "unterstützt nur moderne Browser."

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

@ -11,7 +11,7 @@ es:
resend_confirmation: "Volver a enviar instrucciones de confirmación"
send_instructions: "Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos."
failure:
inactive: "Tu cuenta aun no ha sido activada."
inactive: "Tu cuenta aún no ha sido activada."
invalid: "Contraseña o email incorrecto."
invalid_token: "Identificador de autenticación incorrecto."
locked: "Tu cuenta está bloqueada."

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

@ -12,10 +12,18 @@ ar:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ ar:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ ca:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "Ja ha estat escollit"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ ca:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconeguda"
youtube_title:
unknown: "Títol desconegut de vídeo"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ ca:
try_it_out: "Hauries de pensar en corregir-ho."
request_accepted:
accepted: "ha acceptat la teva petició de contacte. Ara es troben en el teu"
aspect: "aspecte."
subject: "%{name} ha acceptat la teva petició de contacte a Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ cs:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ cs:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ cy:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "Is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ cy:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ da:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "er allerede taget"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ da:
aspect_badge:
all_aspects: "Alle aspekter"
unknown_person: "ukendt person"
youtube_title:
unknown: "Ukendt videotitel"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Er du sikker?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ da:
try_it_out: "Du bør virkelig overveje at tjekke den ud."
request_accepted:
accepted: "har accepteret din kontaktanmodning. De er nu i din"
aspect: "aspekt."
subject: "% {name} har accepteret din kontaktanmodning på Diaspora*"
single_admin:
admin: "Din Diaspora administrator"

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

@ -12,10 +12,18 @@ de:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "wurde bereits benutzt"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ de:
aspect_badge:
all_aspects: "Alle Aspekte"
unknown_person: "unbekannte Person"
youtube_title:
unknown: "Unbekannter Video-Titel"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Bist du sicher?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ de:
try_it_out: "Du solltest wirklich kurz darüber nachdenken es auszuprobieren."
request_accepted:
accepted: "hat deine Kontakt-Anfrage akzeptiert. Sie sind nun in deinem"
aspect: "Aspekt."
subject: "%{name} hat deine Kontakt-Anfrage auf Diaspora* akzeptiert"
single_admin:
admin: "Dein Diaspora-Administrator"
@ -229,7 +236,7 @@ de:
not_connected: "Du bist nicht mit dieser Person verbunden"
recent_posts: "Letzte Beiträge"
recent_public_posts: "Neueste öffentliche Beiträge"
request_people: "Wenn du möchtest, kannst du ihn fragen, ob du ihn/sie in einem deiner Aspekte platzieren darfst."
request_people: "Wenn du möchtest, kannst du anfragen, ob du ihn/sie in einem deiner Aspekte platzieren darfst."
return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
update:
@ -241,15 +248,15 @@ de:
create:
integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass es eine Bilddatei war?"
runtime_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass du deinen Morgenkaffee hattest?"
type_error: "Foto konnte nicht hochgeladen werden. Bist du sciher das ein Bild hinzugefügt wurde?"
type_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass ein Bild hinzugefügt wurde?"
destroy:
notice: "Foto gelöscht."
edit:
editing: "Bearbeiten"
new:
back_to_list: "Zurück zu Liste"
back_to_list: "Zurück zur Liste"
new_photo: "Neues Foto"
post_it: "Posten!"
post_it: "Teile es!"
new_photo:
empty: "{file} ist leer, bitte wähle die Dateien erneut ohne diese aus."
invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
@ -284,7 +291,7 @@ de:
unhappy: "Unglücklich?"
update: "Aktualisieren"
new:
enter_email: "Gib eine E-Mail Adresse an"
enter_email: "Gib eine E-Mail-Adresse an"
enter_password: "Gib ein Passwort ein"
enter_password_again: "Gib das gleiche Passwort wie eben ein"
enter_username: "Wähle einen Benutzernamen (nur Buchstaben, Nummern und Unterstriche)"
@ -293,7 +300,7 @@ de:
requests:
create:
sending: "Senden..."
sent: "Du hast angefragt mit %{name} zu teilen. Sie sollten dies sehen wenn sie sich das nächste mal bei Diaspora einloggen."
sent: "Du hast angefragt mit %{name} zu teilen. Sie sollten dies sehen, wenn sie sich das nächste mal bei Diaspora einloggen."
destroy:
error: "Bitte wähle einen Aspekt!"
ignore: "Kontaktanfrage ignoriert."
@ -310,7 +317,7 @@ de:
destroy:
success: "Erfolgreich Authentifizierung zerstört."
failure:
error: "es gab ein Fehler beim Verbinden mit dem Dienst"
error: "es gab einen Fehler beim Verbinden mit diesem Dienst"
index:
connect_to_facebook: "Mit Facebook verbinden"
connect_to_twitter: "Mit Twitter verbinden"
@ -323,7 +330,7 @@ de:
add_contact:
create_request: "Über die Diaspora-Adresse finden"
diaspora_handle: "diaspora@beispiel.org"
enter_a_diaspora_username: "Gib eine Diaspora-Benutzernamen ein:"
enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
know_email: "Du kennst die E-Mail Adresse? Du solltest sie einladen"
your_diaspora_username_is: "Deine Diaspora-Adresse ist: %{diaspora_handle}"
contact_list:
@ -369,19 +376,19 @@ de:
the_world: "die Welt"
username: "Benutzername"
users:
destroy: "Konto erfolgreich stillgelegt."
destroy: "Konto erfolgreich geschlossen."
edit:
change: "Ändern"
change_language: "Sprache ändern"
change_password: "Passwort ändern"
close_account: "Konto stilllegen"
close_account: "Konto schließen"
download_photos: "Meine Fotos herunterladen"
download_xml: "Mein XML herunterladen"
edit_account: "Konto bearbeiten"
email_notifications: "Emailbenachrichtigungen"
export_data: "Konto exportieren"
email_notifications: "E-Mail-Benachrichtigungen"
export_data: "Daten exportieren"
new_password: "Neues Passwort"
receive_email_notifications: "Emailbenachrichtigungen empfangen?"
receive_email_notifications: "E-Mail-Benachrichtigungen empfangen?"
your_email: "deine E-Mail-Adresse"
your_handle: "Deine Diaspora-Adresse"
getting_started:
@ -405,7 +412,7 @@ de:
your_services: "Deine Dienste"
step_4:
change_profile: "Du kannst dein Profil und deine verlinkten Dienste jederzeit bearbeiten unter"
continue: "Fahre fort um auf deine \"Alle\" Seite zu kommen, eine Übersicht über alle deiner Aspekte."
continue: "Fahre fort um auf deine \"Alle\" Seite zu kommen, eine Übersicht aller deiner Aspekte."
finish: "Fertigstellen"
manage_aspects: "Du kannst auch Kontakte hinzufügen, während du dich auf einer Aspekt-Seite befindest."
ready_to_share: "Du bist nun bereit zum Teilen mit"
@ -422,7 +429,7 @@ de:
password_not_changed: "Ändern des Passworts fehlgeschlagen"
webfinger:
fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden"
hcard_fetch_failed: "es gab Probleme beim Holen der hcard für %{account}"
hcard_fetch_failed: "es gab Probleme beim Laden der hcard für %{account}"
no_person_constructed: "Konnte keine Person aus dieser hcard erstellen."
not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
xrd_fetch_failed: "Konnte XRD Datei von %{account} nicht herunterladen"

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

@ -12,10 +12,18 @@ el:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "χρησιμοποιείται ήδη"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ el:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "άγνωστο άτομο"
youtube_title:
unknown: "αγνώστος τίτλος αρχείου πολυμέσων"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ el:
try_it_out: "Θα πρέπει πραγματικά να σκεφτείτε να το ελέγξετε."
request_accepted:
accepted: "έχει αποδεχθεί το αίτημα φιλίας σας. Βρίσκονται πλέον στην"
aspect: "πτυχή."
subject: "%{name} έχει αποδεχθεί το αίτημα φιλίας σας στο Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

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

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

@ -12,10 +12,18 @@ eo:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ eo:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your contact request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your contact request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ es-CL:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "ya ha sido elegido"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ es-CL:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconocida"
youtube_title:
unknown: "Titulo del video desconocido"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "¿Estás seguro?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ es-CL:
try_it_out: "Deberías pensar en echarle un vistazo."
request_accepted:
accepted: "ha aceptado tu solicitud de contacto. Ahora están en tu"
aspect: "aspecto."
subject: "%{name} ha aceptado tu solicitud de contacto en Diaspora*"
single_admin:
admin: "Tu administrador de Diaspora"

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

@ -12,10 +12,18 @@ es:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "Ya ha sido elegido"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ es:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "persona desconocida"
youtube_title:
unknown: "Título Desconocido de Vídeo"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "¿Estás seguro?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ es:
try_it_out: "Deberías pensar en corregirlo."
request_accepted:
accepted: "ha aceptado tu petición de contacto. Ahora se encuentran en tu"
aspect: "aspecto."
subject: "%{name} ha aceptado tu petición de contacto en Diaspora*"
single_admin:
admin: "Tu administrador de Diaspora"

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

@ -12,10 +12,18 @@ fi:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "on jo käytössä"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -28,10 +36,10 @@ fi:
application:
helper:
aspect_badge:
all_aspects: "All aspects"
all_aspects: "Kaikki verkostonäkymät"
unknown_person: "tuntematon persoona"
youtube_title:
unknown: "Videon otsikko tuntematon"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Oletko varma?"
aspects:
add_to_aspect:
@ -136,7 +144,7 @@ fi:
edit:
sign_up: "sign_up"
new:
already_invited: "Already invited"
already_invited: "On jo kutsuttu"
aspect: "Verkostonäkymä"
comma_seperated_plz: "Erottele sähköpostiosoitteet pilkulla."
if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
@ -172,7 +180,6 @@ fi:
try_it_out: "Sinun pitäisi todella harkita sen tarkistamista."
request_accepted:
accepted: "on hyväksynyt kontaktipyyntösi. He kuuluvat nyt sinun "
aspect: "verkostonäkymä."
subject: "%{name} on hyväksynyt kontaktipyyntösi Diaspora*ssa"
single_admin:
admin: "Diasporasi ylläpitäjä"
@ -203,8 +210,8 @@ fi:
people_on_pod_are_aware_of: " people on pod are aware of"
results_for: " tulokset kyselylle: %{params}"
index:
couldnt_find_them_send_invite: "Couldn't find them? Send an invite!"
no_one_found: "...and no one was found."
couldnt_find_them_send_invite: "Etkö löytänyt heitä? Lähetä kutsu!"
no_one_found: "...eikä ketään löytynyt."
no_results: "Hei! Sinun tulisi etsiä jotakin."
results_for: "hakutulokset kohteelle "
person:

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

@ -12,10 +12,18 @@ fr:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "est déjà pris"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ fr:
aspect_badge:
all_aspects: "Tous les aspects"
unknown_person: "personne inconnue"
youtube_title:
unknown: "Titre de vidéo inconnu"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Vous confirmez ?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ fr:
try_it_out: "Vous devriez vraiment envisager de l'essayer."
request_accepted:
accepted: "a accepté votre requête de contact. Il est maintenant dans votre aspect"
aspect: "."
subject: "%{name} a accepté votre requête de contact sur Diaspora*"
single_admin:
admin: "Votre administrateur Diaspora"

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

@ -12,10 +12,18 @@ he:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "כבר תפוס"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ he:
aspect_badge:
all_aspects: "כל ההיבטים"
unknown_person: "אדם לא ידוע"
youtube_title:
unknown: "כותרת הווידאו אינה ידועה"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "בבטחה?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ he:
try_it_out: "מאוד כדאי לבדוק זאת."
request_accepted:
accepted: "קיבל/ה את בקשת ההתקשרות שלך. וכעת יופיע/תופיע תחת"
aspect: "היבט."
subject: "בקשת ההתקשרות שלך התקבלה על ידי %{name} בדיאספורה*"
single_admin:
admin: "מנהל הדיאספורה שלך"

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

@ -12,10 +12,18 @@ hu:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "már foglalt"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ hu:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "ismeretlen személy"
youtube_title:
unknown: "Ismeretlen videó cím"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Biztos vagy benne?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ hu:
try_it_out: "Tényleg ki kellene próbálnod."
request_accepted:
accepted: "elfogadta a jelölésed. Most már a"
aspect: "csoportodban van."
subject: "%{name} elfogadta a felkérésed."
single_admin:
admin: "A Te Diaspora* rendszergazdád"

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

@ -12,10 +12,18 @@ id:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ id:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ it:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "non è disponibile"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ it:
aspect_badge:
all_aspects: "Tutti gli aspetti"
unknown_person: "persona sconosciuta"
youtube_title:
unknown: "Titolo Video Sconosciuto"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Sei sicuro?"
aspects:
add_to_aspect:
@ -120,10 +128,10 @@ it:
ownership: "Possesso"
ownership_explanation: "Tu possiedi le tue foto, e non dovresti perderne il possesso solo per condividerle. Tu mantieni il possesso di qualsiasi cosa condividi su Diaspora e ti viene dato pieno controllo su come viene distribuita."
share_what_you_want: "Condividi ciò che vuoi, con chi vuoi"
simplicity: "Semlpicità"
simplicity: "Semplicità"
simplicity_explanation: "Diaspora permette una condivisione facile e veloce - e lo stesso accade per la gestione della privacy. Essendo riservata per natura, Diaspora non ti fa smarrire tra paginate di impostazioni e opzioni solo per tenere il tuo profilo sicuro."
tagline_first_half: "Condividi ciò che desideri,"
tagline_second_half: "with whom you want."
tagline_second_half: "con chi vuoi."
invitations:
check_token:
not_found: "Token di invito non trovato"
@ -147,7 +155,7 @@ it:
to: "A"
layouts:
application:
powered_by: "BASATO SU DIASPORA*"
powered_by: "CREATO CON DIASPORA*"
header:
account_settings: "impostazioni account"
blog: "blog"
@ -172,7 +180,6 @@ it:
try_it_out: "Dovresti veramente provarlo."
request_accepted:
accepted: "ha accettato la tua richiesta di contatto. Adesso sono nella tua"
aspect: "aspetto."
subject: "%{name} ha accettato la tua richiesta di contatto su Diaspora*"
single_admin:
admin: "Il tuo amministratore Diaspora"
@ -333,7 +340,7 @@ it:
dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
invitations_left: "(%{count} rimanenti)"
invite_someone: "Invita qualcuno"
invites: "Invites"
invites: "Inviti"
invites_closed: "Al momento gli inviti sono chiusi su questo pod Diaspora."
notification:
new: "Nuovo %{type} da %{from}"
@ -381,7 +388,7 @@ it:
email_notifications: "Notifiche email "
export_data: "Esporta Dati"
new_password: "Nuova Password"
receive_email_notifications: "Receive email notificaions?"
receive_email_notifications: "Vuoi ricevere notifiche via email?"
your_email: "La tua email"
your_handle: "Il tuo contatto Diaspora"
getting_started:
@ -415,7 +422,7 @@ it:
public:
does_not_exist: "L'utente %{username} non esiste!"
update:
email_notifications_changed: "Language Change Failed"
email_notifications_changed: "Impossibile cambiare la lingua"
language_changed: "Lingua Cambiata"
language_not_changed: "Cambio di lingua fallito"
password_changed: "Password Cambiata"

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

@ -12,10 +12,18 @@ lt:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "jau užimtas"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ lt:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "nežinomas asmuo"
youtube_title:
unknown: "Nežinomas video pavadinimas"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -157,10 +165,10 @@ lt:
logout: "atsijungti"
view_profile: "peržiūrėti profilį"
new_requests:
few: "%{count} new requests!"
one: "new request!"
other: "%{count} new requests!"
zero: "no new requests"
few: "%{count} nuove richieste!"
one: "nuova richiesta!"
other: "%{count} nuove richieste!"
zero: "nessuna nuova richiesta"
notifier:
diaspora: "Diasporos pašto robotas"
hello: "Labas, %{name}!"
@ -172,7 +180,6 @@ lt:
try_it_out: "Pabandyk!"
request_accepted:
accepted: "priėmė tavo prašymą draugauti. Jie dabar yra tavo"
aspect: "aspektas."
subject: "%{name} priėmė tavo pasiūlymą draugauti Diasporoje*"
single_admin:
admin: "Your Diaspora administrator"
@ -364,7 +371,7 @@ lt:
destroy: "Sunaikinti"
permalink: "permalink"
stream_helper:
hide_comments: "hide comments"
hide_comments: "nascondi i commenti"
show_comments: "show comments"
the_world: "pasaulis"
username: "Vartotojo vardas"

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

@ -12,10 +12,18 @@ mk:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "веќе е заземено"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ mk:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "непозната личност"
youtube_title:
unknown: "Непознато име на видео"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ mk:
try_it_out: "Навистина треба да го проверите."
request_accepted:
accepted: "го прифати вашето контакт барање. Сега се во вашиот"
aspect: "аспект."
subject: "%{name} го прифати вашето контакт барање на Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ nb:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is already taken"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ nb:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ nl:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "is al bezet"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -28,10 +36,10 @@ nl:
application:
helper:
aspect_badge:
all_aspects: "All aspects"
all_aspects: "Alle aspecten"
unknown_person: "onbekend persoon"
youtube_title:
unknown: "Onbekende video titel"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Weet je het zeker?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ nl:
try_it_out: "Overweeg eens een kijkje te nemen."
request_accepted:
accepted: "heeft je vriendenverzoek geaccepteerd. Hij/zij staat nu in je"
aspect: "aspect."
subject: "%{name} heeft je vriendenverzoek geaccepteerd op Diaspora*"
single_admin:
admin: "Je Diaspora administrator"

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

@ -12,10 +12,18 @@ pl:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "jest już zajęty"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ pl:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "nieznana osoba"
youtube_title:
unknown: "Nieznany tytuł wideo"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Na pewno?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ pl:
try_it_out: "Przemyśl to, naprawdę warto spróbować."
request_accepted:
accepted: "zaakceptował(-a) Twoje zaproszenie. Jest w aspekcie"
aspect: "."
subject: "%{name} zaakceptował(-a) twoje zaproszenie do znajomych w Diasporze*"
single_admin:
admin: "Twój panel zarządzania Diaspora"

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

@ -12,10 +12,18 @@ pt-BR:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "já está sendo usado"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ pt-BR:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "pessoa desconhecida"
youtube_title:
unknown: "Título de vídeo desconhecido"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ pt-BR:
try_it_out: "Você realmente deveria dar uma olhada."
request_accepted:
accepted: "aceitou seu pedido de contato. Eles estão agora no seu"
aspect: "aspecto."
subject: "%{name} aceitou seu pedido de contato no Diaspora"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ pt-PT:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "já existe"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ pt-PT:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "utilizador(a) desconhecido(a)"
youtube_title:
unknown: "Título do Vídeo Desconhecido"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ pt-PT:
try_it_out: "Devias mesmo pensar em dar-lhe uma vista de olhos."
request_accepted:
accepted: "aceitou(aram) o teu pedido de contacto. Está(ão) agora no teu"
aspect: "grupo."
subject: "%{name} aceitou o teu pedido de contacto no Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ ro:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "este deja luat"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,7 +38,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:
@ -172,7 +180,6 @@ ro:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ ru:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "уже присутствует"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -28,10 +36,10 @@ ru:
application:
helper:
aspect_badge:
all_aspects: "All aspects"
all_aspects: "Все аспекты"
unknown_person: "неизвестная персона"
youtube_title:
unknown: "Неизвестный видео заголовок"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Вы уверены?"
aspects:
add_to_aspect:
@ -90,7 +98,7 @@ ru:
show:
edit_aspect: "редактировать аспект"
update:
failure: "Your aspect, %{name}, had too long name to be saved."
failure: "ваш аспект, %{name}, имеет слишком длинное имя для сохранения."
success: "Аспект, %{name}, отредактирован."
back: "Назад"
cancel: "Отмена"
@ -136,7 +144,7 @@ ru:
edit:
sign_up: "регистрация"
new:
already_invited: "Already invited"
already_invited: "Уже приглашён(а)"
aspect: "Аспект"
comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
@ -172,7 +180,6 @@ ru:
try_it_out: "Вы должны подумать о его проверке.\n"
request_accepted:
accepted: "принял(а) ваш запрос. Сейчас он(а) находятся в вашем\n"
aspect: "аспект."
subject: "%{name} принял(а) ваш запрос для присоединения к Диаспоре*"
single_admin:
admin: "Ваш администратор Диаспоры"
@ -188,7 +195,7 @@ ru:
people:
edit:
allow_search: "Разрешить отображать вас в поиске Диаспоры"
edit_profile: "Edit profile"
edit_profile: "Редактировать профиль"
first_name: "Имя"
info_available_to: "Эта информация будет доступна для всех, кто будет связан с вами в Диаспоре."
last_name: "Фамилия"
@ -203,9 +210,9 @@ ru:
people_on_pod_are_aware_of: "люди на сервере знают о"
results_for: "результаты для %{params}"
index:
couldnt_find_them_send_invite: "Couldn't find them? Send an invite!"
no_one_found: "...and no one was found."
no_results: "Hey! You need to search for something."
couldnt_find_them_send_invite: "Не можете их найти? Отправьте им приглашение!"
no_one_found: "...и не удалось кого либо найти."
no_results: "Эй! Вам надо что то найти."
results_for: "результат поиска для"
person:
add_contact: "добавить контакт"
@ -228,7 +235,7 @@ ru:
no_posts: "новых сообщений нет!"
not_connected: "Вы не связаны с этим человеком"
recent_posts: "Последние сообщения"
recent_public_posts: "Recent Public Posts"
recent_public_posts: "Последние Публичные Посты"
request_people: "Если хотите, вы можете спросить его/ее разрешения добавить в аспекты."
return_to_aspects: "Вернуться на страницу аспектов"
to_accept_or_ignore: "принять или игнорировать."
@ -255,8 +262,8 @@ ru:
invalid_ext: "{file} имеет не допустимое расширение. Разрешены только {extensions}."
size_error: "{file} слишком большой, максимальный размер файла {sizeLimit}."
new_profile_photo:
or_select_one: "or select one from your already existing"
upload: "Upload a new profile photo!"
or_select_one: "или выбрать один из существующих"
upload: "Загрузить новое фото для профиля!"
photo:
view_all: "Посмотреть все фотографии %{name}"
show:
@ -315,7 +322,7 @@ ru:
connect_to_facebook: "Подключение к Facebook"
connect_to_twitter: "Подключение к Twitter"
disconnect: "разъединить"
edit_services: "Edit services"
edit_services: "Редактировать сервисы"
logged_in_as: "Вы вошли как"
really_disconnect: "отключить %{service}?"
settings: "Настройки"
@ -371,17 +378,17 @@ ru:
users:
destroy: "Аккаунт закрыт."
edit:
change: "Change"
change: "Изменение"
change_language: "Сменить язык"
change_password: "Сменить пароль"
close_account: "Закрыть учётную запись"
download_photos: "Скачать мои изображения"
download_xml: "Скачать мою информацию в xml"
edit_account: "Edit account"
email_notifications: "Email notificaions"
edit_account: "Редактировать аккаунт"
email_notifications: "Почтовое уведомление"
export_data: "Экспорт информации"
new_password: "Новый пароль"
receive_email_notifications: "Receive email notificaions?"
receive_email_notifications: "Получили письмо уведомление?"
your_email: "Ваш адрес электронной почты"
your_handle: "Ваше управление Диаспорой"
getting_started:
@ -415,7 +422,7 @@ ru:
public:
does_not_exist: "Пользователя %{username} не существует!"
update:
email_notifications_changed: "Language Change Failed"
email_notifications_changed: "Не удачная смена языка"
language_changed: "Язык изменён"
language_not_changed: "Не удалось изменить язык"
password_changed: "Пароль изменён"

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

@ -12,10 +12,18 @@ sk:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "je už obsadený"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ sk:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "neznáma osoba"
youtube_title:
unknown: "Názov videa neznámy"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ sk:
try_it_out: "Mali by ste to skontrolovať."
request_accepted:
accepted: "prijal Vašu žiadosť. Teraz je vo Vašich"
aspect: "aspekt."
subject: "Užívateľ %{name} prijal Vašu žiadosť a pripojil sa k Diaspore*"
single_admin:
admin: "Your Diaspora administrator"

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

@ -12,10 +12,18 @@ sv:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "är redan taget"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ sv:
aspect_badge:
all_aspects: "Alla sidor"
unknown_person: "okänd person"
youtube_title:
unknown: "Okänd videotitel"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Är du säker?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ sv:
try_it_out: "Du borde verkligen överväga att kolla upp detta."
request_accepted:
accepted: "har accepterat din kontaktförfrågan. Personen finns nu på "
aspect: "sidan."
subject: "%{name} har accepterat din kontaktförfrågan på Diaspora"
single_admin:
admin: "Din Diaspora administratör"

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

@ -12,10 +12,18 @@ tr:
activemodel:
errors:
models:
contact:
attributes:
person_id:
taken: "must be unique among this user's contacts."
person:
attributes:
diaspora_handle:
taken: "zaten alınmış"
request:
attributes:
from_id:
taken: "is a duplicate of a pre-existing request."
user:
attributes:
email:
@ -30,8 +38,8 @@ tr:
aspect_badge:
all_aspects: "All aspects"
unknown_person: "bilinmiyen kişiler"
youtube_title:
unknown: "Bilinmeyen Video Başlığı"
video_title:
unknown: "Unknown Video Title"
are_you_sure: "Are you sure?"
aspects:
add_to_aspect:
@ -172,7 +180,6 @@ tr:
try_it_out: "You should really think about checking it out."
request_accepted:
accepted: "has accepted your friend request. They are now in your"
aspect: "aspect."
subject: "%{name} has accepted your friend request on Diaspora*"
single_admin:
admin: "Your Diaspora administrator"

2
db/seeds.rb
View file

@ -10,5 +10,5 @@
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
# Mayor.create(:name => 'Daley', :city => citie
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
require File.join(File.dirname(__FILE__), "..", "config", "environment")

21
db/seeds/dev.rb
View file

@ -5,7 +5,6 @@
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
def set_app_config username
current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
current_config[Rails.env.to_s] ||= {}
@ -21,6 +20,15 @@ set_app_config username unless File.exists?(Rails.root.join('config', 'app_confi
require Rails.root.join('config', "initializers", "_load_app_config.rb")
include HelperMethods
module Resque
def enqueue(klass, *args)
if $process_queue
klass.send(:perform, *args)
else
true
end
end
end
# Create seed user
user = User.build( :email => "tom@tom.joindiaspora.com",
:username => "tom",
@ -29,8 +37,8 @@ user = User.build( :email => "tom@tom.joindiaspora.com",
:person => {
:profile => { :first_name => "Alexander", :last_name => "Hamiltom",
:image_url => "/images/user/tom.jpg"}})
user.save
user.save!
user.person.save!
user.seed_aspects
@ -42,12 +50,9 @@ user2 = User.build( :email => "korth@tom.joindiaspora.com",
:image_url => "/images/user/korth.jpg"}})
user2.save
user2.save!
user2.person.save!
user2.seed_aspects
# connecting users
aspect = user.aspects.create(:name => "other dudes")
aspect2 = user2.aspects.create(:name => "presidents")
connect_users(user, aspect, user2, aspect2)
user.aspects.create(:name => "Presidents")
connect_users(user, user.aspects.first, user2, user2.aspects.first)

5
public/javascripts/stream.js
View file

@ -109,6 +109,11 @@ var Stream = {
$(".new_comment").live('ajax:failure', function(data, html, xhr) {
alert('failed to post message!');
});
$(".delete").live('ajax:success', function(data, html, xhr) {
$(this).parents(".message").fadeOut(150);
});
},
toggleComments: function(evt) {

76
spec/helpers/application_helper_spec.rb
View file

@ -72,24 +72,30 @@ describe ApplicationHelper do
markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>"
end
it "recognizes youtube links" do
proto="http"
videoid = "0x__dDWdf23"
url="www.youtube.com/watch?v="+videoid+"&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
title = "UP & down & UP & down &amp;"
res = markdownify(proto+'://'+url)
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{videoid}"/
end
it "recognizes youtube links with hyphens" do
proto="http"
videoid = "ABYnqp-bxvg"
url="www.youtube.com/watch?v="+videoid+"&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
title = "UP & down & UP & down &amp;"
res = markdownify(proto+'://'+url)
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{videoid}"/
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"
res = markdownify(url)
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{video_id}"/
end
it "recognizes youtube links with hyphens" do
video_id = "ABYnqp-bxvg"
url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
res = markdownify(url)
res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{video_id}"/
end
end
it "recognizes multiple links of different types" do
@ -174,35 +180,13 @@ describe ApplicationHelper do
markdownify(message).should == "<em>some text</em> *some text<em> **some text</em> <em>some text</em> _some text<em> __some text</em>"
end
describe "options" do
before do
@message = "http://url.com www.url.com www.youtube.com/watch?foo=bar&v=BARFOO&whatever=related *emphasis* __emphasis__ [link](www.url.com) [link](url.com \"title\")"
end
it "can render only autolinks" do
res = markdownify(@message, :youtube => false, :emphasis => false, :links => false)
res.should == "<a target=\"_blank\" href=\"http://url.com\">url.com</a> <a target=\"_blank\" href=\"http://www.url.com\">www.url.com</a> <a target=\"_blank\" href=\"http://www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related\">www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related</a> *emphasis* __emphasis__ [link](www.url.com) [link](url.com &quot;title&quot;)"
end
it "can render only youtube" do
res = markdownify(@message, :autolinks => false, :emphasis => false, :links => false)
res.should_not =~ /a href="http:\/\/url.com"/
res.should_not =~ /a href="http:\/\/www.url.com"/
res.should_not =~ /<strong>emphasis<\/strong>/
end
it "can render only emphasis tags" do
res = markdownify(@message, :autolinks => false, :youtube => false, :links => false)
res.should == "http://url.com www.url.com www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related <em>emphasis</em> <strong>emphasis</strong> [link](www.url.com) [link](url.com &quot;title&quot;)"
end
it "can render only links tags" do
res = markdownify(@message, :autolinks => false, :youtube => false, :emphasis => false)
res.should == "http://url.com www.url.com www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related *emphasis* __emphasis__ <a target=\"_blank\" href=\"www.url.com\">link</a> <a target=\"_blank\" href=\"url.com\" title=\"title\">link</a>"
end
end
describe "newlines" do
it 'skips inserting newlines if you pass the newlines option' do
message = "These\nare\n\some\nnew\lines"
res = markdownify(message, :newlines => false)
res.should == message
end
it 'generates breaklines' do
message = "These\nare\nsome\nnew\nlines"
res = markdownify(message)