diff --git a/Gemfile b/Gemfile
index 7fde201c14d2dbfda380903433800f7b7e4e3544..55e340dec1fe3f5c31d0d6d4bf10c9c0a19202d2 100644
--- a/Gemfile
+++ b/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'
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index b2ce5e813289fc128ea5463ca46c59f57c8f70cd..e8a40a4c2e87d2cbc5b6f4ec000d114415a03ec2 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 260b5b7fa9e967fe963233cb578f22fc17a06b35..dea44993551cd551ae94a54db90d77b5d4eebdb5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 4ae726a4d7de4bb3b34f3ff7649745c5cf1c8379..c33cfa67888cbe958fac58282f8d1c26d3a7fe7e 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -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: "×”× ×—×™×•×ª לשחרור"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 0f9ec4f091456fceec50be0bfbd67e2873b68695..78666424c458e5a7bf3ab765f53cd0371d02cf54 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -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."
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 37657e1f40d3da5b8fee3f1d660ae4a6aced0ddd..f62c204809063ca93175af4686a67e4e56eac3bc 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -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"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 9f7670a970793f224bc244934b8d63f0d3ddb4e7..8b348b3c72f196151323106ee371302f600ab9c0 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -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: "משהו השתבש לגמרי."
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 4730b3cea9382ea8fa73b9c0244b472094498a68..707704d258c6c5102d36bbc0737fbb1f454f932c 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -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:
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index aa7a7af358d87f76a5e5cfb6cc500445c30fa2ea..8e87425e9b1f887c77bcd2e6c7de37c6fb7b3720 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -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."
diff --git a/db/seeds.rb b/db/seeds.rb
index de30154794d47f107e233718615c5a130bac1335..687d2622e5a2b7b754ef89b9eda36dbb0f265884 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -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")
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 0851e7894179143178d031a05641bda06ec5f37d..bc63a81a9d23ba40c3e58a448ea9cba5d2d2b404 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -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",
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index 8a6cf271fb923a689b74167dfe77a85a266e5a4c..f10abec4f67d87fecd371dca3e46a4e54d9d0fb0 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -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')))
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index 1c7f630273b0e21bcde903c486f4d5438111d843..3f8c4810f480475612f78324c0dd93d2613a0d27 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -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')))
diff --git a/spec/controllers/dev_utilities_controller_spec.rb b/spec/controllers/dev_utilities_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..66c07350f41da88a3b474b9295b90b54c8d5b4ac
--- /dev/null
+++ b/spec/controllers/dev_utilities_controller_spec.rb
@@ -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
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index c11d03455302943865d5e5d2c5a183acd4bf8661..6df3ddc1c884ab7b64bec9a0bd48de10ff57f222 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -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