Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
ilya
commit
8f55852ea9
15 changed files with 506 additions and 182 deletions
4
Gemfile
4
Gemfile
|
|
@ -38,7 +38,7 @@ gem 'mini_magick'
|
|||
|
||||
group :test, :development do
|
||||
gem 'factory_girl_rails'
|
||||
gem 'ruby-debug'
|
||||
gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -47,7 +47,7 @@ group :test do
|
|||
gem 'rspec', '>= 2.0.0.beta.17'
|
||||
gem 'rspec-rails', '2.0.0.beta.17'
|
||||
gem 'mocha'
|
||||
gem 'redgreen'
|
||||
gem 'redgreen' if RUBY_VERSION.include? "1.8"
|
||||
gem 'autotest'
|
||||
gem 'database_cleaner'
|
||||
gem 'webmock'
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class DevUtilitiesController < ApplicationController
|
|||
bkr_info.each do |backer|
|
||||
backer_email = "#{backer['username']}@#{backer['username']}.joindiaspora.com"
|
||||
rel_hash = relationship_flow(backer_email)
|
||||
logger.info "Zombefriending #{backer['given_name']} #{backer['family_name']}"
|
||||
logger.info "Zombiefriending #{backer['given_name']} #{backer['family_name']}"
|
||||
logger.info "Calling send_friend_request with #{rel_hash[:friend]} and #{current_user.aspects.first}"
|
||||
current_user.send_friend_request_to(rel_hash[:friend], current_user.aspects.first)
|
||||
end
|
||||
|
|
@ -29,11 +29,6 @@ class DevUtilitiesController < ApplicationController
|
|||
}
|
||||
end
|
||||
|
||||
def backer_info
|
||||
config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
|
||||
config['servers']['backer']
|
||||
end
|
||||
|
||||
def set_backer_number
|
||||
render :nothing => true
|
||||
seed_num_hash = {:seed_number => params[:number]}
|
||||
|
|
@ -43,7 +38,6 @@ class DevUtilitiesController < ApplicationController
|
|||
end
|
||||
|
||||
def set_profile_photo
|
||||
|
||||
render :nothing => true
|
||||
album = Album.create(:person => current_user.person, :name => "Profile Photos")
|
||||
current_user.raw_visible_posts << album
|
||||
|
|
@ -52,7 +46,7 @@ class DevUtilitiesController < ApplicationController
|
|||
backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
|
||||
username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
|
||||
|
||||
@fixture_name = File.dirname(__FILE__) + "/../../public/images/user/#{username}.jpg"
|
||||
@fixture_name = File.join(File.dirname(__FILE__), "..", "..", "public", "images", "user", "#{username}.jpg")
|
||||
|
||||
photo = Photo.new(:person => current_user.person, :album => album)
|
||||
photo.image.store! File.open(@fixture_name)
|
||||
|
|
@ -71,4 +65,11 @@ class DevUtilitiesController < ApplicationController
|
|||
|
||||
render "shared/log"
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def backer_info
|
||||
config = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "config", "deploy_config.yml"))
|
||||
config['servers']['backer']
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class UsersController < ApplicationController
|
|||
def edit
|
||||
@user = current_user
|
||||
@person = @user.person
|
||||
@profile = @user.profile
|
||||
@profile = @user.person.profile
|
||||
@photos = Photo.find_all_by_person_id(@person.id).paginate :page => params[:page], :order => 'created_at DESC'
|
||||
end
|
||||
|
||||
|
|
@ -26,11 +26,15 @@ class UsersController < ApplicationController
|
|||
|
||||
private
|
||||
def prep_image_url(params)
|
||||
url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'
|
||||
if params[:profile][:image_url].empty?
|
||||
params[:profile].delete(:image_url)
|
||||
else
|
||||
url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'
|
||||
params[:profile][:image_url] = url + params[:profile][:image_url]
|
||||
if /^http:\/\// =~ params[:profile][:image_url]
|
||||
params[:profile][:image_url] = params[:profile][:image_url]
|
||||
else
|
||||
params[:profile][:image_url] = url + params[:profile][:image_url]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
# Copyright (c) 2010, Diaspora Inc. This file is
|
||||
# licensed under the Affero General Public License version 3. See
|
||||
# the COPYRIGHT file.
|
||||
# Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
|
||||
|
||||
en:
|
||||
he:
|
||||
errors:
|
||||
messages:
|
||||
not_found: "לא נמצא"
|
||||
|
|
@ -11,30 +12,30 @@ en:
|
|||
|
||||
devise:
|
||||
failure:
|
||||
unauthenticated: "צריך להתחבר או להירשם לפני שאפשר להמשיך."
|
||||
unconfirmed: "צריך לאשר את החשבון לפני שאפשר להמשיך."
|
||||
locked: "החשבון שלך נעול."
|
||||
invalid: "אימייל או סיסמה לא נכונים."
|
||||
invalid_token: "מספר אימות לא נכון."
|
||||
timeout: "פג תוקפו של החיבור. נא להתחבר מחדש על מנת להמשיך."
|
||||
inactive: "החשבון לא אומת עדיין."
|
||||
unauthenticated: "עליך להיכנס או להירשם לפני המשך הפעילות."
|
||||
unconfirmed: "עליך לאמת את חשבונך לפי המשך הפעילות."
|
||||
locked: "חשבונך נעול."
|
||||
invalid: "הססמה או הדוא״ל שגויים."
|
||||
invalid_token: "אסימון האימות שגוי."
|
||||
timeout: "ההפעלה שלך פגה, נא להיכנס שוב כדי להמשיך."
|
||||
inactive: "חשבונך לא הופעל עדין."
|
||||
sessions:
|
||||
signed_in: "התחברות עברה בהצלחה."
|
||||
signed_out: "התנתקות עברה בהצלחה."
|
||||
signed_in: "נכנסת בהצלחה."
|
||||
signed_out: "יצאת בהצלחה."
|
||||
passwords:
|
||||
send_instructions: "אימייל עם הוראות עיצד לאפס סיסמה יתקבל בקרוב."
|
||||
updated: "סיסמה הוחלפה בהצלחה, את/ה כעת מחובר/ת."
|
||||
send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאפס את ססמתך."
|
||||
updated: "ססמתך הוחלפה בהצלחה. נכנסת כעת."
|
||||
confirmations:
|
||||
send_instructions: "אימייל עם הוראות כיצד לאמת את החשבון יתקבל בקרוב."
|
||||
confirmed: "חשבון אומת בהצלחה. את/ה כעת מחובר/ת."
|
||||
send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאמת את חשבונך."
|
||||
confirmed: "חשבונך אומת בהצלחה. נכנסת כעת."
|
||||
registrations:
|
||||
signed_up: "התחברת בהצלחה, אם הדבר מאופשר, יתקבל אימייל אישור בקרוב.."
|
||||
signed_up: "נרשמת בהצלחה. הודעת אימות תישלח אליך לדוא״ל במידה שהוגדרה."
|
||||
updated: "חשבונך עודכן בהצלחה."
|
||||
destroyed: "להתראות! חשבונך נמחק בהצלחה. מקווים לראותך שוב בקרוב!"
|
||||
destroyed: "להתראות! חשבונך בוטל בהצלחה. מקווים לראותך שוב בקרוב."
|
||||
unlocks:
|
||||
send_instructions: "אימייל עם הוראות כיצד להסיר את הנעילה מחשבונך יתקבל בקרוב."
|
||||
unlocked: "חשבונך נפתח בהצלחה. את/ה כעת מחובר/ת."
|
||||
send_instructions: "בעוד מספר דקות תתקבל לתיבת הודא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
|
||||
unlocked: "חשבונך שוחרר בהצלחה. נכנסת כעת."
|
||||
mailer:
|
||||
confirmation_instructions: "הוראות אישור"
|
||||
reset_password_instructions: "הוראות איפוס סיסמה"
|
||||
unlock_instructions: "הוראות הסרת נעילה"
|
||||
confirmation_instructions: "הנחיות לאימות"
|
||||
reset_password_instructions: "הנחיות לאיפוס הססמה"
|
||||
unlock_instructions: "הנחיות לשחרור"
|
||||
|
|
|
|||
|
|
@ -7,3 +7,211 @@
|
|||
|
||||
cs:
|
||||
hello: "Dobrý Den"
|
||||
application:
|
||||
helper:
|
||||
unknown_person: "neznámá osoba"
|
||||
new_requests: "nové žádosti"
|
||||
dashboards:
|
||||
helper:
|
||||
home: "domů"
|
||||
datetime:
|
||||
distance_in_words:
|
||||
less_than_x_seconds: "méně než %{count} sekund"
|
||||
half_a_minute: "půl minuty"
|
||||
less_than_x_minutes: "méně než %{count} minut"
|
||||
x_minutes: "%{count} minuty"
|
||||
about_x_hours: "zhruba %{count} hodin"
|
||||
x_days: "%{count} dní"
|
||||
about_x_months: "zhruba %{count} měsíců"
|
||||
x_months: "%{count} měsíců"
|
||||
about_x_years: "zhruba %{count} let"
|
||||
over_x_years: "přez %{count} let"
|
||||
almost_x_years: "skoro %{count} let"
|
||||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "Neplatná pole"
|
||||
correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
|
||||
people:
|
||||
helper:
|
||||
results_for: " vysledky vyhledávání %{params}"
|
||||
people_on_pod_are_aware_of: " people on pod are aware of"
|
||||
layouts:
|
||||
application:
|
||||
edit_profile: "upravit profil"
|
||||
logout: "odhlásit se"
|
||||
shared:
|
||||
aspect_nav:
|
||||
all_aspects: "Všechny aspekty"
|
||||
manage: "Spravovat"
|
||||
manage_your_aspects: "Spravovat vaše aspekty"
|
||||
sub_header:
|
||||
all_aspects: "Všechny aspekty"
|
||||
manage_aspects: "Spravovat aspekty"
|
||||
publisher:
|
||||
share: "Sdělit"
|
||||
aspect_friends:
|
||||
add_friends: "přidat přátele"
|
||||
albums:
|
||||
album:
|
||||
you: "vy"
|
||||
new_album:
|
||||
create: "vytvořit"
|
||||
add_a_new_album: "Přidat nové album"
|
||||
show:
|
||||
edit_album: "Upravit album"
|
||||
albums: "alba"
|
||||
updated: "aktualizované"
|
||||
by: "uživatelem"
|
||||
edit:
|
||||
editing: "Upravuje se"
|
||||
updated: "aktualizováno"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
delete_album: "Smazat Album"
|
||||
cancel: "Zrušit"
|
||||
index:
|
||||
home: "doma"
|
||||
new_album: "Nové Album"
|
||||
create:
|
||||
success: "Vytvořili jste nové album nazvané %{name}."
|
||||
update:
|
||||
success: "Album %{name} úspěšně upraveno."
|
||||
failure: "Nepodařilo se upravit album %{name}."
|
||||
destroy:
|
||||
success: "Album %{name} smazáno."
|
||||
helper:
|
||||
friends_albums: "Alba přátel"
|
||||
your_albums: "Vaše Alba"
|
||||
aspects:
|
||||
index:
|
||||
photos: "fotografie"
|
||||
show:
|
||||
photos: "fotografie"
|
||||
manage:
|
||||
add_a_new_aspect: "Přidat aspekt"
|
||||
add_a_new_friend: "Přidat nového přítele"
|
||||
show: "Show"
|
||||
update_aspects: "Aktualizovat aspekty"
|
||||
requests: "Žádosti"
|
||||
ignore_remove: "Ignorovat/Odebrat"
|
||||
new_aspect:
|
||||
add_a_new_aspect: "Přidat nový aspekt"
|
||||
create: "Vytvořit"
|
||||
create:
|
||||
success: "Řekněte Diaspoře kdo může vidět váš nový aspekt kliknutím na plus na levé straně."
|
||||
destroy:
|
||||
success: "%{name} byl úspěšně odebrán."
|
||||
update:
|
||||
success: "Váš aspekt, %{name}, byl úspěšně upraven."
|
||||
move_friends:
|
||||
failure: "Úprava aspektu přítelem %{real_name} selhala."
|
||||
success: "Aspekty úspěšně upraveny."
|
||||
move_friend:
|
||||
failure: "nepodařilo se %{inspect}"
|
||||
success: "Nyní svému příteli ukazujete jiný ze svých aspektů."
|
||||
helper:
|
||||
remove: "odebrat"
|
||||
aspect_not_empty: "Aspekt není prázdný"
|
||||
users:
|
||||
edit:
|
||||
cancel: "Zrušit"
|
||||
update_profile: "Aktualizovat profil"
|
||||
home: "Domů"
|
||||
diaspora_username: "UŽIVATELSKÉ JMÉNO V DIASPOŘE"
|
||||
info: "Info"
|
||||
picture: "Obrázek"
|
||||
editing_profile: "Upravit profil"
|
||||
albums: "Alba"
|
||||
you_dont_have_any_photos: "Nemáte žádné fotky. Jděte na stránku"
|
||||
page_to_upload_some: "a nějaké nahrajte."
|
||||
comments:
|
||||
comment:
|
||||
ago: "nazpět"
|
||||
new_comment:
|
||||
comment: "Komentář"
|
||||
photos:
|
||||
show:
|
||||
prev: "předchozí"
|
||||
full_size: "plná velkost"
|
||||
next: "další"
|
||||
edit_photo: "Upravit fotku"
|
||||
delete_photo: "Smazat fotku"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
comments: "komentáře"
|
||||
edit:
|
||||
editing: "Uprait"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
delete_photo: "Smazat fotku"
|
||||
photo:
|
||||
show_comments: "zobrazit komentáře"
|
||||
posted_a_new_photo_to: "poslal novou fotku do"
|
||||
new:
|
||||
new_photo: "Nová fotka"
|
||||
back_to_list: "Zpět na seznam"
|
||||
post_it: "poslat!"
|
||||
create:
|
||||
runtime_error: "Poslání fotky selhalo. Jste si jisti, že máte zapnuté pásy?"
|
||||
integrity_error: "Poslání fotky selhalo. Jste si jisti že to byl obrázek?"
|
||||
type_error: "Poslání fotky selhalo. Jste si jisti zě byl přidán obrázek?"
|
||||
update:
|
||||
notice: "Fotka úspěšně aktualizována."
|
||||
error: "Nepodařilo se upravit fotku."
|
||||
destroy:
|
||||
notice: "Fotka smazána."
|
||||
registrations:
|
||||
new:
|
||||
sign_up: "Zapsat se"
|
||||
create:
|
||||
success: "Připojili jste se k Diaspoře!"
|
||||
status_messages:
|
||||
new_status_message:
|
||||
tell_me_something_good: "pověz mi něco dobrého"
|
||||
oh_yeah: "ó ano!"
|
||||
status_message:
|
||||
show_comments: "zobrazit komentáře"
|
||||
delete: "Smazat"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
show:
|
||||
status_message: "Zpráva o stavu"
|
||||
comments: "komentáře"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
destroy: "Zničit"
|
||||
view_all: "Zobrazit Vše"
|
||||
message: "Zpráva"
|
||||
owner: "Vlastník"
|
||||
helper:
|
||||
no_message_to_display: "Není k zobrazení žádná zpráva."
|
||||
people:
|
||||
person:
|
||||
add_friend: "přidat přítele"
|
||||
pending_request: "nevyřízené žádosti"
|
||||
index:
|
||||
add_friend: "přidat přítele"
|
||||
real_name: "pravé jméno"
|
||||
diaspora_handle: "adresa v diaspoře"
|
||||
thats_you: "to jste vy!"
|
||||
friend_request_pending: "nevyřízená žádost o přátelství"
|
||||
you_have_a_friend_request_from_this_person: "od této osoby máte žádost o přátelství"
|
||||
new:
|
||||
new_person: "Nová Osoba"
|
||||
back_to_list: "Zpět na Seznam"
|
||||
show:
|
||||
last_seen: "naposledy viděni: %{how_long_ago}"
|
||||
friends_since: "přáteli od: %{how_long_ago}"
|
||||
save: "save"
|
||||
are_you_sure: "Jste si jisti?"
|
||||
remove_friend: "odebrat přítele"
|
||||
requests:
|
||||
new_request:
|
||||
add_a_new_friend_to: "Pridat nového přítele do"
|
||||
enter_a_diaspora_username: "Vložte uživatelské jméno v diaspoře:"
|
||||
your_diaspora_username_is: "Vaše uživatelské jméno v diaspoře je: %{diaspora_handle}"
|
||||
friends_username: "Uživatelské jméno přítele"
|
||||
destroy:
|
||||
success: "Nyní jste přáteli."
|
||||
error: "Prosím vyberte aspekt!"
|
||||
ignore: "Ignorovat žádost o přátelství."
|
||||
create:
|
||||
error: "Semínko diaspory s touto adresou nenalezeno!"
|
||||
already_friends: "S %{destination_url} už jste přáteli!"
|
||||
success: "byla poslána žádost o přátelství na %{destination_url}"
|
||||
horribly_wrong: "Něco se ošklivě pokazilo."
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
|
||||
|
||||
es:
|
||||
hello: "Hola Mundo"
|
||||
hello: "Hola mundo"
|
||||
application:
|
||||
helper:
|
||||
unknown_person: "persona desconocida"
|
||||
|
|
@ -17,15 +17,15 @@ es:
|
|||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "Campos Invalidos"
|
||||
correct_the_following_errors_and_try_again: "Corrija los siguentes errores y trate de nuevo."
|
||||
correct_the_following_errors_and_try_again: "Corrija los siguentes errores e intente de nuevo."
|
||||
people:
|
||||
helper:
|
||||
results_for: " resultados para %{params}"
|
||||
people_on_pod_are_aware_of: " gente en pod estan al tanto de "
|
||||
people_on_pod_are_aware_of: " personas en pod estan al tanto de"
|
||||
layouts:
|
||||
application:
|
||||
edit_profile: "editar perfil"
|
||||
logout: "desloguear"
|
||||
logout: "cerrar sesión"
|
||||
shared:
|
||||
aspect_nav:
|
||||
all_aspects: "Todos los Aspectos"
|
||||
|
|
@ -42,29 +42,29 @@ es:
|
|||
album:
|
||||
you: "usted"
|
||||
new_album:
|
||||
create: "Crear"
|
||||
create: "crear"
|
||||
add_a_new_album: "Añade un nuevo álbum"
|
||||
show:
|
||||
edit_album: "Editar Álbum"
|
||||
albums: "álbumes"
|
||||
updated: "actualizar"
|
||||
updated: "actualizado"
|
||||
by: "por"
|
||||
edit:
|
||||
editing: "Editando"
|
||||
updated: "actualizado"
|
||||
are_you_sure: "Esta seguro?"
|
||||
are_you_sure: "¿Está seguro?"
|
||||
delete_album: "Eliminar Álbum"
|
||||
cancel: "Cancelar"
|
||||
index:
|
||||
home: "home"
|
||||
new_album: "Nuevo Álbum"
|
||||
create:
|
||||
success: "Creo el álbum llamado %{name}."
|
||||
success: "Has creado el álbum llamado %{name}."
|
||||
update:
|
||||
success: "Álbum %{name} fue editado exitosamente."
|
||||
failure: "Fallo el editar el álbum %{name}."
|
||||
success: "El álbum %{name} fue editado exitosamente."
|
||||
failure: "Fallo al editar el álbum %{name}."
|
||||
destroy:
|
||||
success: "Álbum %{name} fue eliminado."
|
||||
success: "El álbum %{name} fue eliminado."
|
||||
helper:
|
||||
friends_albums: "Álbumes de amigos"
|
||||
your_albums: "Tus Álbumes"
|
||||
|
|
@ -74,38 +74,39 @@ es:
|
|||
show:
|
||||
photos: "fotos"
|
||||
manage:
|
||||
add_a_new_aspect: "Añadir nuevo aspecto"
|
||||
add_a_new_friend: "Añadir nuevo amigo"
|
||||
add_a_new_aspect: "Añadir un nuevo aspecto"
|
||||
add_a_new_friend: "Añadir un nuevo amigo"
|
||||
show: "Mostrar"
|
||||
update_aspects: "Actualizar Aspectos"
|
||||
requests: "Requests"
|
||||
requests: "Peticiones"
|
||||
ignore_remove: "Ignorar/Remover"
|
||||
new_aspect:
|
||||
add_a_new_aspect: "Añadir nuevo aspecto"
|
||||
add_a_new_aspect: "Añadir un nuevo aspecto"
|
||||
create: "Crear"
|
||||
create:
|
||||
success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
|
||||
success:"Pulsa el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
|
||||
failure: "La creación del Aspecto falló."
|
||||
destroy:
|
||||
success: "%{name} fue removido exitosamente."
|
||||
success: "%{name} fue eliminado exitosamente."
|
||||
update:
|
||||
success: "Su aspecto, %{name}, fue editado exitosamente."
|
||||
move_friends:
|
||||
failure: "Fallo el editar aspecto para el amigo %{real_name}."
|
||||
success: "Los aspectos fueron editados exitosamente."
|
||||
success: "Aspectos editados exitosamente."
|
||||
move_friend:
|
||||
error: "no funciono %{inspect}"
|
||||
error: "no funcionó %{inspect}"
|
||||
notice: "Ahora estas mostrando a tu amigo un aspecto diferente de ti."
|
||||
helper:
|
||||
remove: "remover"
|
||||
aspect_not_empty: "Aspecto no esta vacio"
|
||||
remove: "eliminar"
|
||||
aspect_not_empty: "Aspecto no vacio"
|
||||
users:
|
||||
edit:
|
||||
cancel: "Cancelar"
|
||||
update_profile: "Actualizar Perfil"
|
||||
home: "Home"
|
||||
diaspora_username: "USUARIO DE DIASPORA"
|
||||
diaspora_username: "NOMBRE DE USUARIO DE DIASPORA"
|
||||
info: "Info"
|
||||
picture: "Picture"
|
||||
picture: "Foto"
|
||||
editing_profile: "Editando perfil"
|
||||
albums: "Álbums"
|
||||
you_dont_have_any_photos: "No tienes ninguna foto! ve a la pagina"
|
||||
|
|
@ -114,41 +115,41 @@ es:
|
|||
comment:
|
||||
ago: "atras"
|
||||
new_comment:
|
||||
comment: "Commentario"
|
||||
comment: "Comentario"
|
||||
photos:
|
||||
show:
|
||||
prev: "prev"
|
||||
full_size: "tamaño actual"
|
||||
full_size: "tamaño completo"
|
||||
next: "prox"
|
||||
edit_photo: "Editar Foto"
|
||||
delete_photo: "Eliminar Foto"
|
||||
are_you_sure: "Esta seguro?"
|
||||
are_you_sure: "¿Está seguro?"
|
||||
comments: "comentarios"
|
||||
edit:
|
||||
editing: "Editando"
|
||||
are_you_sure: "Esta seguro?"
|
||||
are_you_sure: "¿Está seguro?"
|
||||
delete_photo: "Eliminar Foto"
|
||||
photo:
|
||||
show_comments: "mostrar comentarios"
|
||||
posted_a_new_photo_to: "a puesto una nueva foto en"
|
||||
new:
|
||||
new_photo: "Nueva Foto"
|
||||
back_to_list: "Devuelta a la lista"
|
||||
back_to_list: "Volver a la lista"
|
||||
post_it: "post it!"
|
||||
create:
|
||||
runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
|
||||
integrity_error: "Photo upload failed. Are you sure that was an image?"
|
||||
type_error: "Photo upload failed. Are you sure an image was added?"
|
||||
integrity_error: "Falló carga de la foto. ¿Está seguro de que era una imagen?"
|
||||
type_error: "Falló carga de la foto. ¿Está seguro de que una imagen fue añadida?"
|
||||
update:
|
||||
notice: "Photo successfully updated."
|
||||
error: "Failed to edit photo."
|
||||
notice: "Foto actualizada satisfactoriamente."
|
||||
error: "Falló la edición de la foto."
|
||||
destroy:
|
||||
notice: "Photo deleted."
|
||||
notice: "Foto eliminada."
|
||||
registrations:
|
||||
new:
|
||||
sign_up: "Registrate"
|
||||
sign_up: "Regístrate"
|
||||
create:
|
||||
success: "Esta registrado en Diaspora!"
|
||||
success: "Se ha unido a Diaspora!"
|
||||
status_messages:
|
||||
new_status_message:
|
||||
tell_me_something_good: "dime algo bueno"
|
||||
|
|
@ -160,8 +161,8 @@ es:
|
|||
show:
|
||||
status_message: "Mensaje de status"
|
||||
comments: "comentarios"
|
||||
are_you_sure: "Esta seguro?"
|
||||
destroy: "Destruir"
|
||||
are_you_sure: "¿Está seguro?"
|
||||
destroy: "Borrar"
|
||||
view_all: "Ver Todos"
|
||||
message: "Mensaje"
|
||||
owner: "Dueño"
|
||||
|
|
@ -176,20 +177,20 @@ es:
|
|||
real_name: "nombre real"
|
||||
diaspora_handle: "usuario en diaspora"
|
||||
thats_you: "ese eres tu!"
|
||||
friend_request_pending: "friend request pending"
|
||||
you_have_a_friend_request_from_this_person: "you have a friend request from this person"
|
||||
friend_request_pending: "petición de amistad pendiente"
|
||||
you_have_a_friend_request_from_this_person: "tienes una petición de amistad de esta persona"
|
||||
show:
|
||||
last_seen: "ultima vez visto: %{how_long_ago}"
|
||||
friends_since: "amigos desde: %{how_long_ago}"
|
||||
save: "guardar"
|
||||
are_you_sure: "Esta seguro?"
|
||||
remove_friend: "remover amigo"
|
||||
are_you_sure: "¿Está seguro?"
|
||||
remove_friend: "eliminar amigo"
|
||||
requests:
|
||||
new_request:
|
||||
add_a_new_friend_to: "Añade un nuevo amigo a "
|
||||
enter_a_diaspora_username: "Escribe el usuario de Diaspora:"
|
||||
your_diaspora_username_is: "Tu usuario de Diaspora es: %{diaspora_handle}"
|
||||
friends_username: "Usuario de amigo"
|
||||
friends_username: "Nombre de usuario de amigo"
|
||||
destroy:
|
||||
success: "Ahora son amigos."
|
||||
error: "Seleccione un aspecto!"
|
||||
|
|
@ -198,4 +199,4 @@ es:
|
|||
error: "No diaspora seed found with this email!"
|
||||
already_friends: "Ya eres amigo de %{destination_url}!"
|
||||
success: "Una peticion de amistad se envio a %{destination_url}."
|
||||
horribly_wrong: "Algo horriblemente mal sucedio"
|
||||
horribly_wrong: "Algo horriblemente incorrecto ha sucedido"
|
||||
|
|
|
|||
|
|
@ -1,67 +1,72 @@
|
|||
# Copyright (c) 2010, Diaspora Inc. This file is
|
||||
# licensed under the Affero General Public License version 3. See
|
||||
# the COPYRIGHT file.
|
||||
# Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
|
||||
|
||||
|
||||
# Sample localization file for English. Add more files in this directory for other locales.
|
||||
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
|
||||
|
||||
he:
|
||||
hello: "שלום עולם"
|
||||
application:
|
||||
helper:
|
||||
unknown_person: "אדם לא מוכר"
|
||||
unknown_person: "אדם לא ידוע"
|
||||
new_requests: "בקשות חדשות"
|
||||
dashboards:
|
||||
helper:
|
||||
home: "בית"
|
||||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "שדות לא חוקיים"
|
||||
correct_the_following_errors_and_try_again: "נא לתקן את השגיאות הבאות ולנסות שוב."
|
||||
invalid_fields: "שדות שגויים"
|
||||
correct_the_following_errors_and_try_again: "יש לתקן את השגיאות הבאות ולנסות שוב."
|
||||
people:
|
||||
helper:
|
||||
results_for: " תוצאות עבור %{params}"
|
||||
people_on_pod_are_aware_of: " אנשים בפוד מכירים את"
|
||||
people_on_pod_are_aware_of: " אנשים בפוד מודעים לכך"
|
||||
layouts:
|
||||
application:
|
||||
edit_profile: "ערוך פרופיל"
|
||||
logout: "התנתק"
|
||||
edit_profile: "עריכת הפרופיל"
|
||||
logout: "יציאה"
|
||||
shared:
|
||||
aspect_nav:
|
||||
all_aspects: "כל האספקטים"
|
||||
manage: "נהל"
|
||||
manage_your_aspects: "נהל אספקטים"
|
||||
all_aspects: "כל ההיבטים"
|
||||
manage: "ניהול"
|
||||
manage_your_aspects: "ניהול ההיבטים שלך"
|
||||
sub_header:
|
||||
all_aspects: "כל האספקטים"
|
||||
manage_aspects: "נהל אספקטים"
|
||||
all_aspects: "כל ההיבטים"
|
||||
manage_aspects: "ניהול ההיבטים"
|
||||
publisher:
|
||||
share: "שתף"
|
||||
share: "שיתוף"
|
||||
aspect_friends:
|
||||
add_friends: "הוסף חברים"
|
||||
add_friends: "הוספת חברים"
|
||||
albums:
|
||||
album:
|
||||
you: "אתה"
|
||||
you: "את/ה"
|
||||
new_album:
|
||||
create: "צור"
|
||||
add_a_new_album: "הוסף אלבום חדש"
|
||||
show:
|
||||
edit_album: "ערוך אלבום"
|
||||
create: "יצירה"
|
||||
add_a_new_album: "הוספת אלבום חדש"
|
||||
show:
|
||||
edit_album: "עריכת אלבום"
|
||||
albums: "אלבומים"
|
||||
updated: "עדכן"
|
||||
updated: "תאריך העדכון"
|
||||
by: "על ידי"
|
||||
edit:
|
||||
editing: "עריכה"
|
||||
updated: "עודכן"
|
||||
are_you_sure: "האם את/ה בטוח/ה?"
|
||||
delete_album: "מחק אלבום"
|
||||
cancel: "בטל"
|
||||
updated: "תאריך העדכון"
|
||||
are_you_sure: "בבטחה?"
|
||||
delete_album: "מחיקת אלבום"
|
||||
cancel: "ביטול"
|
||||
index:
|
||||
home: "בית"
|
||||
new_album: "אלבום חדש"
|
||||
create:
|
||||
success: "יצרת אלבום בשם %{name}."
|
||||
update:
|
||||
success: "אלבום %{name} עודכן בהצלחה."
|
||||
failure: "עריכת אלבום %{name} נכשלה."
|
||||
success: "האלבום %{name} נערך בהצלחה."
|
||||
failure: "אירע כשל בעריכת האלבום %{name}."
|
||||
destroy:
|
||||
success: "אלבום %{name} נמחק."
|
||||
success: "האלבום %{name} נמחק."
|
||||
helper:
|
||||
friends_albums: "אלבומים של חברים"
|
||||
your_albums: "האלבומים שלך"
|
||||
|
|
@ -71,42 +76,42 @@ he:
|
|||
show:
|
||||
photos: "תמונות"
|
||||
manage:
|
||||
add_a_new_aspect: "הוסף אספקט"
|
||||
add_a_new_friend: "הוסף חבר"
|
||||
show: "הצג"
|
||||
update_aspects: "עדכן אספקטים"
|
||||
add_a_new_aspect: "הוספת היבט חדש"
|
||||
add_a_new_friend: "הוספת חבר חדש"
|
||||
show: "הצגה"
|
||||
update_aspects: "עדכון ההיבטים"
|
||||
requests: "בקשות"
|
||||
ignore_remove: "התעלם/מחק"
|
||||
ignore_remove: "התעלמות/הסרה"
|
||||
new_aspect:
|
||||
add_a_new_aspect: "הוסף אספקט"
|
||||
create: "צור"
|
||||
add_a_new_aspect: "הוספת היבט חדש"
|
||||
create: "יציאה"
|
||||
create:
|
||||
success: "לחץ על הפלוס בצד ימין על מנת לקבוע מי רשאי לצפות באספקט."
|
||||
success: "יש ללחוץ על סמל הפלוס שמימין כדי לומר לדיאספורה מי יעול לצפות בהיבט החדש שלך."
|
||||
destroy:
|
||||
success: "%{name} הוסר בהצלחה."
|
||||
update:
|
||||
success: "האספקט שלך, %{name}, נערך בהצלחה."
|
||||
success: "ההיבט שלך, %{name}, נערך בהצלחה."
|
||||
move_friends:
|
||||
failure: "עריכת אספקט נכשלה עבור %{real_name}."
|
||||
success: "אספקטים נערכו בהצלחה."
|
||||
failure: "עריכת ההיבט נכשלה עבור החבר %{real_name}."
|
||||
success: "ההיבטים נערכו בהצלחה."
|
||||
move_friend:
|
||||
failure: "לא עבד %{inspect}"
|
||||
success: "אתה כעת מציג לחברך אספקט שונה שלך."
|
||||
success: "כעת יופיע בפני החברים שלך היבט אחר שלך."
|
||||
helper:
|
||||
remove: "מחק"
|
||||
aspect_not_empty: "אספקט לא ריק"
|
||||
remove: "הסרה"
|
||||
aspect_not_empty: "ההיסט אינו ריק"
|
||||
users:
|
||||
edit:
|
||||
cancel: "בטל"
|
||||
update_profile: "עדכן פרופיל"
|
||||
cancel: "ביטול"
|
||||
update_profile: "עדכון הפרופיל"
|
||||
home: "בית"
|
||||
diaspora_username: "שם משתמש בדיאספורה"
|
||||
info: "מידע"
|
||||
diaspora_username: "שם המשתמש בדיאספורה"
|
||||
info: "פרטים"
|
||||
picture: "תמונה"
|
||||
editing_profile: "עורך פרופיל"
|
||||
editing_profile: "עריכת הפרופיל"
|
||||
albums: "אלבומים"
|
||||
you_dont_have_any_photos: "אין לך תמונות! עבור ל-"
|
||||
page_to_upload_some: "דף להעלאה."
|
||||
you_dont_have_any_photos: "אין לך תמונות! באפשרותך לגשת לעמוד"
|
||||
page_to_upload_some: "כדי להעלות כמה."
|
||||
comments:
|
||||
comment:
|
||||
ago: "לפני"
|
||||
|
|
@ -114,88 +119,88 @@ he:
|
|||
comment: "הערה"
|
||||
photos:
|
||||
show:
|
||||
prev: "קודם"
|
||||
prev: "הקודמת"
|
||||
full_size: "גודל מלא"
|
||||
next: "הבא"
|
||||
edit_photo: "ערוך תמונה"
|
||||
delete_photo: "מחק תמונה"
|
||||
are_you_sure: "האם אתה בטוח?"
|
||||
next: "הבאה"
|
||||
edit_photo: "עריכת תמונה"
|
||||
delete_photo: "מחיקת תמונה"
|
||||
are_you_sure: "בבטחה?"
|
||||
comments: "הערות"
|
||||
edit:
|
||||
editing: "עריכה"
|
||||
are_you_sure: "האם אתה בטוח?"
|
||||
delete_photo: "מחק תמונה"
|
||||
are_you_sure: "בבטחה?"
|
||||
delete_photo: "מחיקת תמונה"
|
||||
photo:
|
||||
show_comments: "הצג הערות"
|
||||
posted_a_new_photo_to: "הועלתה תמונה חדשה ל-"
|
||||
show_comments: "הצגת הערות"
|
||||
posted_a_new_photo_to: "פורסמה תמונה חדשה אל"
|
||||
new:
|
||||
new_photo: "תמונה חדשה"
|
||||
back_to_list: "חרה לרשימה"
|
||||
post_it: "שתף!"
|
||||
back_to_list: "חזרה לרשימה"
|
||||
post_it: "פרסום!"
|
||||
create:
|
||||
runtime_error: "העלאת תמונה נכשלה. האם אתה חוגר חגורת בטיחות?"
|
||||
integrity_error: "העלאת תמונה נכשלה. האם זו אכן הייתה תמונה?"
|
||||
type_error: "העלאת תמונה נכשלה. האם אכן נוספה תמונה?"
|
||||
runtime_error: "העלאת התמונה נכשלה. האם החגורה שלך מהודקת?"
|
||||
integrity_error: "העלאת התמונה נכשלה. האם זו באמת הייתה תמונה?"
|
||||
type_error: "העלאת התמונה נכשלה. האם באמת נוספה תמונה?"
|
||||
update:
|
||||
notice: "תמונה עודכנה בהצלחה."
|
||||
error: "עריכת תמונה נכשלה."
|
||||
notice: "התמונה עודכנה בהצלחה."
|
||||
error: "אירע כשל בעריכת התמונה."
|
||||
destroy:
|
||||
notice: "תמונה נמחקה."
|
||||
notice: "התמונה נמחקה."
|
||||
registrations:
|
||||
new:
|
||||
sign_up: "הצטרפות"
|
||||
sign_up: "הרשמה"
|
||||
create:
|
||||
success: "הצטרפת לדיאספורה!"
|
||||
status_messages:
|
||||
new_status_message:
|
||||
tell_me_something_good: "ספר לי משהו נחמד"
|
||||
tell_me_something_good: "בא לי לשמוע סיפור טוב"
|
||||
oh_yeah: "אחלה!"
|
||||
status_message:
|
||||
show_comments: "הצג תגובות"
|
||||
delete: "מחק"
|
||||
are_you_sure: "האם אתה בטוח?"
|
||||
show_comments: "הצגת הערות"
|
||||
delete: "מחיקה"
|
||||
are_you_sure: "בבטחה?"
|
||||
show:
|
||||
status_message: "הודעת סטטוס"
|
||||
status_message: "הודעת מצב"
|
||||
comments: "הערות"
|
||||
are_you_sure: "האם אתה בטוח?"
|
||||
destroy: "השמד"
|
||||
view_all: "הצג הכל"
|
||||
are_you_sure: "בבטחה?"
|
||||
destroy: "הריבה"
|
||||
view_all: "צפייה בכול"
|
||||
message: "הודעה"
|
||||
owner: "בעלים"
|
||||
helper:
|
||||
no_message_to_display: "אין הודעה להציג."
|
||||
no_message_to_display: "אין הודעה להצגה."
|
||||
people:
|
||||
person:
|
||||
add_friend: "הוסף חבר"
|
||||
pending_request: "בקשה על תנאי"
|
||||
add_friend: "הוספת חבר"
|
||||
pending_request: "בקשה ממתינה"
|
||||
index:
|
||||
add_friend: "הוסף חבר"
|
||||
real_name: "שם אמיתי"
|
||||
add_friend: "הוספת חבר"
|
||||
real_name: "שם אמתי"
|
||||
diaspora_handle: "כינוי בדיאספורה"
|
||||
thats_you: "זה אתה!"
|
||||
friend_request_pending: "בקשת חברות ממתינה"
|
||||
thats_you: "מדובר בך!"
|
||||
friend_request_pending: "בקשת החברות ממתינה"
|
||||
you_have_a_friend_request_from_this_person: "יש לך בקשת חברות מאדם זה"
|
||||
new:
|
||||
new_person: "אדם חדש"
|
||||
back_to_list: "חזרה לרשימה"
|
||||
show:
|
||||
last_seen: "נראה לאחרונה: %{how_long_ago}"
|
||||
last_seen: "פעילות אחרונה: %{how_long_ago}"
|
||||
friends_since: "חברים מאז: %{how_long_ago}"
|
||||
save: "שמור"
|
||||
are_you_sure: "האם אתה בטוח?"
|
||||
remove_friend: "מחק חבר"
|
||||
save: "שמירה"
|
||||
are_you_sure: "בבטחה?"
|
||||
remove_friend: "הסרת חבר"
|
||||
requests:
|
||||
new_request:
|
||||
add_a_new_friend_to: "הוסף חבר חדש ל-"
|
||||
enter_a_diaspora_username: "הכנס שם משתמש בדיאספורה:"
|
||||
your_diaspora_username_is: "שם המשתמש שלך בדיאספורה: %{diaspora_handle}"
|
||||
friends_username: "שם המשתמש של חבר"
|
||||
add_a_new_friend_to: "הוספת חבר חדש אל"
|
||||
enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"
|
||||
your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
|
||||
friends_username: "שם המשתמש של החבר"
|
||||
destroy:
|
||||
success: "אתם כעת חברים."
|
||||
error: "נא לבחור אספקט!"
|
||||
ignore: "התעלמת מבקשת חברות."
|
||||
success: "אתם חברים כעת."
|
||||
error: "נא לבחור בהיבט!"
|
||||
ignore: "בקשות חברות מהן התעלמת."
|
||||
create:
|
||||
error: "לא נמצא זרע דיאספורה עם אימייל זה!"
|
||||
already_friends: "את/ה כבר חבר של %{destination_url}!"
|
||||
success: "בקשת חברות נשלחה ל%{destination_url}."
|
||||
horribly_wrong: "משהו רע מאוד קרה."
|
||||
error: "לא נמצא זרע של דיאספורה בכתובת דוא״ל זו!"
|
||||
already_friends: "את/ה ו%{destination_url} כבר חברים!"
|
||||
success: "בקשת חברות נשלחה אל %{destination_url}."
|
||||
horribly_wrong: "משהו השתבש לגמרי."
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ it:
|
|||
people:
|
||||
helper:
|
||||
results_for: " risultati per %{params}"
|
||||
people_on_pod_are_aware_of: " people on pod are aware of"
|
||||
people_on_pod_are_aware_of: " persone su pod sono consapevoli di"
|
||||
layouts:
|
||||
application:
|
||||
edit_profile: "modifica profilo"
|
||||
|
|
@ -136,7 +136,7 @@ it:
|
|||
back_to_list: "Torna all'elenco"
|
||||
post_it: "inseriscila!"
|
||||
create:
|
||||
runtime_error: "Caricamento della foto fallito. Sei sicuro che la tua cintura di sicurezza è allacciata?"
|
||||
runtime_error: "Caricamento della foto fallito. Hai allacciato le cinture?"
|
||||
integrity_error: "Caricamento della foto fallito. Sei sicuro che era un'immagine?"
|
||||
type_error: "Caricamento della foto fallito. Sei sicuro di aver aggiunto un'immagine?"
|
||||
update:
|
||||
|
|
|
|||
|
|
@ -7,6 +7,21 @@
|
|||
|
||||
pt-BR:
|
||||
hello: "Olá mundo"
|
||||
application:
|
||||
helper:
|
||||
unknown_person: "pessoa desconhecida"
|
||||
new_requests: "nova requisição"
|
||||
dashboards:
|
||||
helper:
|
||||
home: "casa"
|
||||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "Campos inválidos"
|
||||
correct_the_following_errors_and_try_again: "Corrija os erros a seguir e tente novamente."
|
||||
people:
|
||||
helper:
|
||||
results_for: " resultados para %{params}"
|
||||
people_on_pod_are_aware_of: " pessoas no pod estão conscientes de"
|
||||
layouts:
|
||||
application:
|
||||
edit_profile: "editar perfil"
|
||||
|
|
@ -50,6 +65,9 @@ pt-BR:
|
|||
failure: "Erro ao editar o álbum %{name}."
|
||||
destroy:
|
||||
success: "O álbum %{name} foi excluído com sucesso."
|
||||
helper:
|
||||
friends_albums: "Álbum de amigos"
|
||||
your_albums: "Seus álbuns"
|
||||
aspects:
|
||||
index:
|
||||
photos: "photos"
|
||||
|
|
@ -67,12 +85,25 @@ pt-BR:
|
|||
create: "Criar"
|
||||
create:
|
||||
success:"Clique no mais(+) do lado esquerdo para dizer ao Diaspora quem pode ver seu novo aspecto."
|
||||
destroy:
|
||||
success: "%{name} foi removido com sucesso."
|
||||
update:
|
||||
success: "Seu aspecto, %{name}, foi editado com sucesso."
|
||||
move_friends:
|
||||
failure: "Falha ao editar aspecto para o amigo(a) %{real_name}."
|
||||
success: "Aspectos editados com sucesso."
|
||||
move_friend:
|
||||
failure: "não funcionou %{inspect}"
|
||||
success: "Você está agora mostrando um diferente aspecto seu a um amigo(a)."
|
||||
helper:
|
||||
remove: "remover"
|
||||
aspect_not_empty: "Aspecto não está vazio"
|
||||
users:
|
||||
edit:
|
||||
cancel: "Cancelar"
|
||||
update_profile: "Atualizar Perfil"
|
||||
home: "Home"
|
||||
diaspora_username: "USUÁRIO DIASPORA"
|
||||
diaspora_username: "NOME DE USUÁRIO DIASPORA"
|
||||
info: "Informações"
|
||||
picture: "Imagem"
|
||||
editing_profile: "Editando perfil"
|
||||
|
|
@ -104,9 +135,20 @@ pt-BR:
|
|||
new_photo: "Nova Foto"
|
||||
back_to_list: "Voltar para a Lista"
|
||||
post_it: "enviar!"
|
||||
create:
|
||||
runtime_error: "Envio de foto falhou. Você tem tem certeza que seu sinto de segurança está preso?"
|
||||
integrity_error: "Envio de foto falhou. Você tem certeza que é uma imagem?"
|
||||
type_error: "Envio de foto falhou. Você tem certeza que adicionou uma imagem?"
|
||||
update:
|
||||
notice: "Foto enviada com sucesso."
|
||||
error: "Falha ao editar foto."
|
||||
destroy:
|
||||
notice: "Foto removida."
|
||||
registrations:
|
||||
new:
|
||||
sign_up: "Cadastro"
|
||||
create:
|
||||
success: "Vocé entrou na Diaspora!"
|
||||
status_messages:
|
||||
new_status_message:
|
||||
tell_me_something_good: "diga-me qualquer coisa legal"
|
||||
|
|
@ -123,7 +165,12 @@ pt-BR:
|
|||
view_all: "Exibir Todas"
|
||||
message: "Mensagem"
|
||||
owner: "Pertence a"
|
||||
helper:
|
||||
no_message_to_display: "Nenhuma mensagem para ser mostrada."
|
||||
people:
|
||||
person:
|
||||
add_friend: "adicionar amigo(a)"
|
||||
pending_request: "requisições pendentes"
|
||||
index:
|
||||
add_friend: "adicionar amigo(a)"
|
||||
real_name: "nome real"
|
||||
|
|
@ -140,3 +187,18 @@ pt-BR:
|
|||
save: "salvar"
|
||||
are_you_sure: "Tem certeza?"
|
||||
remove_friend: "excluir amigo"
|
||||
requests:
|
||||
new_request:
|
||||
add_a_new_friend_to: "Adicionar novo amigo(a) em"
|
||||
enter_a_diaspora_username: "Digite seu nome de usuário Diaspora:"
|
||||
your_diaspora_username_is: "Seu nome de usuário Diaspora é: %{diaspora_handle}"
|
||||
friends_username: "Nome de usuário do Amigo(a)"
|
||||
destroy:
|
||||
success: "Vocês agora são amigos."
|
||||
error: "Favor selecionar um aspecto!"
|
||||
ignore: "Requisições de amigos ignoradas."
|
||||
create:
|
||||
error: "Nenhum semente Diaspora encontrado com esse email."
|
||||
already_friends: "Você já é amigo(a) de %{destination_url}!"
|
||||
success: "Uma requisição de amizade foi enviada para %{destination_url}."
|
||||
horribly_wrong: "Algo horrível aconteceu."
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
|
||||
# Mayor.create(:name => 'Daley', :city => citie
|
||||
|
||||
require File.dirname(__FILE__) + '/../../config/environment'
|
||||
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
|
||||
# Mayor.create(:name => 'Daley', :city => citie
|
||||
|
||||
require File.dirname(__FILE__) + '/../../config/environment'
|
||||
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
|
||||
|
||||
def create
|
||||
|
||||
config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
|
||||
config = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "config", "deploy_config.yml"))
|
||||
backer_info = config['servers']['backer']
|
||||
|
||||
backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
|
||||
|
|
@ -22,7 +22,7 @@ def create
|
|||
#set pod url
|
||||
username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
|
||||
set_app_config username
|
||||
require File.dirname(__FILE__) + '/../../config/initializers/_load_app_config.rb'
|
||||
require File.join(File.dirname(__FILE__), "..", "..", "config", "initializers", "_load_app_config.rb")
|
||||
|
||||
# Create seed user
|
||||
user = User.instantiate!(:email => "#{username}@#{username}.joindiaspora.com",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# licensed under the Affero General Public License version 3. See
|
||||
# the COPYRIGHT file.
|
||||
|
||||
require File.dirname(__FILE__) + '/../../config/environment'
|
||||
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
|
||||
|
||||
def set_app_config username
|
||||
current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# licensed under the Affero General Public License version 3. See
|
||||
# the COPYRIGHT file.
|
||||
|
||||
require File.dirname(__FILE__) + '/../../config/environment'
|
||||
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
|
||||
|
||||
def set_app_config username
|
||||
current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
|
||||
|
|
|
|||
42
spec/controllers/dev_utilities_controller_spec.rb
Normal file
42
spec/controllers/dev_utilities_controller_spec.rb
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
# Copyright (c) 2010, Diaspora Inc. This file is
|
||||
# licensed under the Affero General Public License version 3. See
|
||||
# the COPYRIGHT file.
|
||||
|
||||
require File.join(File.dirname(__FILE__), "..", "spec_helper")
|
||||
|
||||
describe DevUtilitiesController do
|
||||
render_views
|
||||
|
||||
before do
|
||||
@tom = Factory.create(:user, :email => "tom@tom.joindiaspora.org")
|
||||
sign_in :user, @tom
|
||||
end
|
||||
|
||||
describe "#zombiefriends" do
|
||||
it "succeeds" do
|
||||
get :zombiefriends
|
||||
response.should be_success
|
||||
end
|
||||
end
|
||||
|
||||
describe "#set_profile_photo" do
|
||||
# In case anyone wants their config/backer_number.yml to still exist after running specs
|
||||
before do
|
||||
@backer_number_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml")
|
||||
@temp_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml-tmp")
|
||||
FileUtils.mv(@backer_number_file, @temp_file, :force => true)
|
||||
end
|
||||
after do
|
||||
if File.exists?(@temp_file)
|
||||
FileUtils.mv(@temp_file, @backer_number_file, :force => true)
|
||||
else
|
||||
FileUtils.rm_rf(@backer_number_file)
|
||||
end
|
||||
end
|
||||
it "succeeds" do
|
||||
get :set_backer_number, 'number' => '3'
|
||||
get :set_profile_photo
|
||||
response.should be_success
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -16,7 +16,7 @@ describe Person do
|
|||
describe '#diaspora_handle' do
|
||||
context 'local people' do
|
||||
it 'uses the pod config url to set the diaspora_handle' do
|
||||
@user.person.diaspora_handle.should == @user.username + "@example.org"
|
||||
@user.person.diaspora_handle.should == @user.username + "@" + APP_CONFIG[:terse_pod_url]
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue