From ab5e7319eef995619ef1b2896ab25bf0cd67cfca Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 11:46:34 -0400 Subject: [PATCH 01/79] Added I18n initializer --- config/initializers/locale.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 config/initializers/locale.rb diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb new file mode 100644 index 000000000..42f34a3a7 --- /dev/null +++ b/config/initializers/locale.rb @@ -0,0 +1,8 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. +I18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] +I18n.default_locale = :en \ No newline at end of file From 53b05e7fb3eb9735ba243bac1b6b550838fd00f7 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 11:47:54 -0400 Subject: [PATCH 02/79] Added devise spanish locale --- config/locales/devise.es.yml | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 config/locales/devise.es.yml diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml new file mode 100644 index 000000000..70209ff79 --- /dev/null +++ b/config/locales/devise.es.yml @@ -0,0 +1,42 @@ +es: + errors: + messages: + not_found: 'no encontrado' + already_confirmed: 'ya ha sido confirmada' + not_locked: 'no está bloqueada' + + devise: + failure: + unauthenticated: 'Necesitas acceder a tu cuenta o registrarte antes de continuar.' + unconfirmed: 'Necesitas confirmar tu cuenta antes de continuar.' + locked: 'Tu cuenta esta bloqueada.' + invalid: 'Contraseña o Email incorrecto.' + invalid_token: 'Token de autenticación incorrecto.' + timeout: 'Tu sesión ha expirado, por favor accede de nuevo para continuar.' + inactive: 'Tu cuenta no ha sido activada.' + sessions: + signed_in: 'Has ingresado correctamente.' + signed_out: 'Has salido correctamente.' + passwords: + send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en poco minutos.' + updated: 'Tu contraseña ha sido modificada. Ya has accedido a tu cuenta.' + confirmations: + send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en poco minutos.' + confirmed: 'Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta.' + registrations: + signed_up: 'Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación.' + updated: 'Has actualizado tu cuenta correctamente.' + destroyed: '!Adiós! Tu cuenta ha sido cancelada. Esperamos verte pronto.' + unlocks: + send_instructions: 'Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos.' + unlocked: 'Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta.' + oauth_callbacks: + success: 'Has sido autorizado satisfactoriamente de la cuenta %{kind}.' + failure: 'No has sido autorizado en la cuenta %{kind} porque "%{reason}".' + mailer: + confirmation_instructions: + subject: 'Instrucciones de confirmación' + reset_password_instructions: + subject: 'Instrucciones para cambiar tu contraseña' + unlock_instructions: + subject: 'Instrucciones para desbloquear tu cuenta' \ No newline at end of file From c940955261b54d877ae8ec52dcba7e7dd54d944f Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 16 Sep 2010 19:03:08 +0200 Subject: [PATCH 03/79] initial german translation --- config/locales/devise.de.yml | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 config/locales/devise.de.yml diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml new file mode 100644 index 000000000..55ad12536 --- /dev/null +++ b/config/locales/devise.de.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +en: + errors: + messages: + not_found: "nicht gefunden" + already_confirmed: "wurde bereits bestätigt" + not_locked: "war nicht gesperrt" + + devise: + failure: + unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.' + unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.' + locked: 'Dein Konto ist gesperrt.' + invalid: 'Ungültige E-Mail-Adresse oder Passwort.' + invalid_token: 'Ungültiger Authentifizierungstoken.' + timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an, um fortzufahren.' + inactive: 'Dein Konto wurde noch nicht aktiviert.' + sessions: + signed_in: 'Erfolgreich angemeldet.' + signed_out: 'Erfolgreich abgemeldet.' + passwords: + 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.' + confirmations: + send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.' + confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.' + registrations: + signed_up: 'Du wurdest erfolgreich registriert. Falls aktiviert, wurde dir eine E-Mail zur Bestätigung geschickt.' + updated: 'Du hast erfolgreich dein Konto aktualisiert.' + destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.' + unlocks: + send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.' + unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.' + mailer: + confirmation_instructions: 'Instruktionen zur Bestätigung' + reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts' + unlock_instructions: 'Instruktionen zum Entsperren' From 61ab7726b5c33c369c69bc36f19911511b7e4e2b Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 16 Sep 2010 19:15:36 +0200 Subject: [PATCH 04/79] change 'en' to 'de' in devise.de.yml --- config/locales/devise.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 55ad12536..516eebfed 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -3,7 +3,7 @@ # the COPYRIGHT file. -en: +de: errors: messages: not_found: "nicht gefunden" From 443b5af4ce60b402c5cb9504137a5f7ac26a2ec6 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 14:57:56 -0400 Subject: [PATCH 05/79] Added localization to aspect views --- app/views/aspects/_new_aspect.haml | 2 +- app/views/aspects/index.html.haml | 2 +- app/views/aspects/manage.html.haml | 8 ++-- app/views/aspects/show.html.haml | 2 +- config/locales/en.yml | 74 ++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 7 deletions(-) diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index b5bc7ace3..68ce56806 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -9,4 +9,4 @@ %p = f.label :name = f.text_field :name - = f.submit 'create', :class => 'button' + = f.submit t('.create'), :class => 'button' diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 5ea9cadb3..47a68ffeb 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -4,7 +4,7 @@ - content_for :page_title do - = link_to "photos", albums_path(:aspect => @aspect) + = link_to t('.photos'), albums_path(:aspect => @aspect) - content_for :left_pane do diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 8a6ed97ac..0e667a8e6 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -25,7 +25,7 @@ %ul - content_for :publish do - = link_to("add a new aspect", "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => "Add a new aspect") + = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect')) @@ -37,9 +37,9 @@ %h1{:contenteditable => true}= aspect.name .tools - = link_to "add a new friend", "#add_request_pane_#{aspect.id}", :class => 'add_request_button' + = link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button' | - = link_to "show", aspect_path(aspect) + = link_to t('.show'), aspect_path(aspect) %ul{:id => aspect.id} @@ -59,6 +59,6 @@ %p %br - = link_to 'Update Aspects', '#', :class => 'button', :id => "move_friends_link" + = link_to t('.update_aspects'), '#', :class => 'button', :id => "move_friends_link" #content_bottom diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index f10ccee74..d4262f838 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -4,7 +4,7 @@ - content_for :page_title do - = link_to "photos", albums_path(:aspect => @aspect) + = link_to t('.photos'), albums_path(:aspect => @aspect) - content_for :left_pane do = render "shared/aspect_friends" diff --git a/config/locales/en.yml b/config/locales/en.yml index 1de275cf9..975e40eef 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -8,3 +8,77 @@ en: hello: "Hello world" + layouts: + application: + edit_profile: "edit profile" + logout: "logout" + shared: + aspect_nav: + all_aspects: "All Aspects" + manage: "Manage" + manage_your_aspects: "Manage your Aspects" + sub_header: + all_aspects: "All Aspects" + manage_aspects: "Manage Aspects" + publisher: + share: "Share" + albums: + album: + you: "you" + new_album: + create: "create" + add_a_new_album: "Add a new album" + show: + edit_album: "Edit Album" + albums: "albums" + updated: "updated" + by: "by" + edit: + editing: "Editing" + updated: "updated" + are_you_sure: "Are you sure?" + delete_album: "Delete Album" + cancel: "Cancel" + index: + home: "home" + new_album: "New Album" + aspects: + index: + photos: "photos" + show: + photos: "photos" + manage: + add_a_new_aspect: "Add a new aspect" + add_a_new_friend: "Add a new friend" + show: "Show" + update_aspects: "Update Aspects" + new_aspect: + create: "Create" + users: + edit: + cancel: "Cancel" + update_profile: "Update Profile" + home: "Home" + diaspora_username: "DIASPORA USERNAME" + info: "Info" + picture: "Picture" + editing_profile: "Editing profile" + albums: "Albums" + comments: + comment: + ago: "ago" + new_comment: + comment: "Comment" + photos: + show: + prev: "prev" + full_size: "full size" + next: "next" + edit_photo: "Edit Photo" + delete_photo: "Delete Photo" + are_you_sure: "Are you sure?" + comments: "comments" + edit: + editing: "Editing" + + From 9bdd11b383bd50e4648d445cfd1e916c3a6288a6 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 14:58:42 -0400 Subject: [PATCH 06/79] Added localization to album views --- app/views/albums/_album.html.haml | 2 +- app/views/albums/_new_album.haml | 4 ++-- app/views/albums/edit.html.haml | 8 ++++---- app/views/albums/index.html.haml | 6 +++--- app/views/albums/show.html.haml | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml index f4893ed8f..a2d2eb46b 100644 --- a/app/views/albums/_album.html.haml +++ b/app/views/albums/_album.html.haml @@ -8,7 +8,7 @@ %div.time by - = link_to ((current_user.person == post.person)? 'you' : post.person.real_name), person_path(post.person) + = link_to ((current_user.person == post.person)? t('.you') : post.person.real_name), person_path(post.person) %br = link_to(how_long_ago(post), object_path(post, :aspect => @aspect)) diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml index 8a37cb2c0..daefe15f3 100644 --- a/app/views/albums/_new_album.haml +++ b/app/views/albums/_new_album.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. -%h1 Add a new album +%h1=t('.add_a_new_album') = form_for Album.new do |f| = f.error_messages @@ -11,4 +11,4 @@ = f.label :name = f.text_field :name = f.hidden_field :to, :value => aspect - = f.submit 'create', :class => 'button' + = f.submit t('.create'), :class => 'button' diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml index a4bf3aef6..4dfb2294c 100644 --- a/app/views/albums/edit.html.haml +++ b/app/views/albums/edit.html.haml @@ -6,10 +6,10 @@ .back= link_to "⇧ #{@album.name}", @album %h1.big_text - = "Editing #{@album.name}" + = "#{t('.editing')} #{@album.name}" .sub_header - ="updated #{how_long_ago(@album)}" + ="#{t('.updated')} #{how_long_ago(@album)}" - form_for @album do |a| = a.error_messages @@ -21,12 +21,12 @@ .photo_edit_block= image_tag photo.url(:thumb_medium) #submit_block - = link_to "Cancel", root_path + = link_to t('.cancel'), root_path or = a.submit .button.delete - = link_to 'Delete Album', @album, :confirm => 'Are you sure?', :method => :delete + = link_to t('.delete_album'), @album, :confirm => t('.are_you_sure'), :method => :delete #content_bottom .back diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index fa4098c18..af83b53eb 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -10,7 +10,7 @@ }); = content_for :page_title do - = link_to "◂ Home", aspects_path, :aspect => params[:aspect] + = link_to "◂ #{t('.home')}", aspects_path, :aspect => params[:aspect] - content_for :left_pane do = render "shared/aspect_friends" @@ -19,7 +19,7 @@ %h1 Albums .right - = link_to 'New Album', '#new_album_pane', {:class => "button", :id => "add_album_button"} + = link_to t('.new_album'), '#new_album_pane', {:class => "button", :id => "add_album_button"} .yo{:style => "display:none;" } #new_album_pane @@ -34,4 +34,4 @@ #content_bottom .back - = link_to "⇧ home", root_path + = link_to "⇧ #{t('.home')}", root_path diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 843523223..56e5c617b 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -11,7 +11,7 @@ }); = content_for :page_title do - = link_to "◂ Albums", albums_path(:aspect => @aspect) + = link_to "◂ #{t('.albums')}", albums_path(:aspect => @aspect) - content_for :left_pane do = render "shared/aspect_friends" @@ -19,13 +19,13 @@ - content_for :publish do %h1 = @album.name - ="updated #{how_long_ago(@album)}" + ="#{t('.updated')} #{how_long_ago(@album)}" .album_id{:id => @album.id, :style => "display:hidden;"} -unless current_user.owns? @album - %h4= "by #{@album.person.real_name}" + %h4= "#{t('.by')} #{@album.person.real_name}" #thumbnails - for photo in @album_photos @@ -36,8 +36,8 @@ #content_bottom .back - = link_to "⇧ albums", albums_path + = link_to "⇧ #{t('.albums')}", albums_path -if current_user.owns? @album .right - = link_to 'Edit Album', edit_album_path(@album), :class => 'button' + = link_to t('.edit_album'), edit_album_path(@album), :class => 'button' From 5078830785926eaa8b368c10224a7b4fa68920ca Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 15:00:21 -0400 Subject: [PATCH 07/79] Added localization to comments views --- app/views/comments/_comment.html.haml | 2 +- app/views/comments/_new_comment.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 56252c83d..4252d9762 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -9,4 +9,4 @@ = link_to post.person.real_name, post.person = auto_link sanitize post.text %div.time - = "#{time_ago_in_words(post.updated_at)} ago" + = "#{time_ago_in_words(post.updated_at)} #{t('.ago')}" diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml index e998d98b7..a4268082d 100644 --- a/app/views/comments/_new_comment.html.haml +++ b/app/views/comments/_new_comment.html.haml @@ -9,4 +9,4 @@ = f.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box" = f.hidden_field :post_id, :value => post.id %p{:style => "text-align:right;"} - = f.submit "Comment", :class => "comment_submit button" + = f.submit t('.comment'), :class => "comment_submit button" From a673257eefda08d93d77c8c1e438376e8c0eaa83 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 15:11:21 -0400 Subject: [PATCH 08/79] Added localization to photos views --- app/views/photos/_photo.haml | 2 +- app/views/photos/edit.html.haml | 4 ++-- app/views/photos/new.html.haml | 6 +++--- app/views/photos/show.html.haml | 12 ++++++------ config/locales/en.yml | 8 ++++++++ 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml index f0a3f2c83..47ddfef3e 100644 --- a/app/views/photos/_photo.haml +++ b/app/views/photos/_photo.haml @@ -21,5 +21,5 @@ .info = link_to(how_long_ago(post), photo_path(post)) \-- - = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" + = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments" = render "comments/comments", :post => post diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml index f695f850d..1f36ae99f 100644 --- a/app/views/photos/edit.html.haml +++ b/app/views/photos/edit.html.haml @@ -6,7 +6,7 @@ %h1.big_text .back = link_to "⇧ #{@album.name}", album_path(@album) - = "Editing #{@photo.image}" + = "#{t('.editing')} #{@photo.image}" %div{:id => @photo.id} @@ -22,5 +22,5 @@ = link_to "⇧ #{@album.name}", album_path(@album) -if current_user.owns? @album .button.right - = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete + = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml index a8814d770..1fdf71a84 100644 --- a/app/views/photos/new.html.haml +++ b/app/views/photos/new.html.haml @@ -3,12 +3,12 @@ -# the COPYRIGHT file. -- title "New Photo" +- title t('.new_photo') = form_for( @photo, :html => {:multipart => true}) do |f| = f.error_messages %p = f.file_field :image - = f.submit 'post it!', :class => 'button' + = f.submit t('.post_it'), :class => 'button' -%p= link_to "Back to List", photos_path +%p= link_to t('.back_to_list'), photos_path diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 654bea892..21ce72181 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -25,15 +25,15 @@ %h1 = @photo.image - = link_to "<< prev", url_to_prev(@photo, @album) + = link_to "<< #{t('.prev')}", url_to_prev(@photo, @album) | - = link_to "full size", @photo.url + = link_to "#{t('.full_size')}", @photo.url | - = link_to "next >>", url_to_next(@photo, @album) + = link_to "#{t('.next')} >>", url_to_next(@photo, @album) .right -if current_user.owns? @album - = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button" + = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button" %div{:id => @photo.id} @@ -48,9 +48,9 @@ -if current_user.owns? @album .right - = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => 'button' + = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete, :class => 'button' %h4{:class => "show_post_comments"} - = "comments (#{@photo.comments.count})" + = "#{t('.comments')} (#{@photo.comments.count})" = render "comments/comments", :post => @photo diff --git a/config/locales/en.yml b/config/locales/en.yml index 975e40eef..bfcf69939 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -80,5 +80,13 @@ en: comments: "comments" edit: editing: "Editing" + are_you_sure: "Are you sure?" + delete_photo: "Delete Photo" + photo: + show_comments: "show comments" + new: + new_photo: "New Photo" + back_to_list: "Back to List" + post_it: "post it!" From 51b6ce9dfbdd6017278704c14420dff657d2eb7b Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 15:11:58 -0400 Subject: [PATCH 09/79] Added localization to layouts and shared views --- app/views/layouts/application.html.haml | 4 ++-- app/views/shared/_aspect_nav.haml | 4 ++-- app/views/shared/_publisher.haml | 2 +- app/views/shared/_sub_header.haml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4a3ec2dbb..7a48d7ed7 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -50,8 +50,8 @@ = text_field_tag 'q' %li= link_to current_user.real_name, current_user.person - %li= link_to "edit profile", edit_user_path(current_user) - %li= link_to "logout", destroy_user_session_path + %li= link_to t('.edit_profile'), edit_user_path(current_user) + %li= link_to t('.logout.'), destroy_user_session_path = render "shared/aspect_nav" = render "shared/sub_header" diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml index b61def9f5..9ba5a5ee4 100644 --- a/app/views/shared/_aspect_nav.haml +++ b/app/views/shared/_aspect_nav.haml @@ -11,10 +11,10 @@ %ul{ :style => "position:absolute;right:0;bottom:0.01em;"} %li{:class => ("selected" if @aspect == :all)} - = link_to "All Aspects", root_url + = link_to t('.all_aspects'), root_url %li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)} - = link_to ( (@request_count == 0)? "manage" : "manage (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => "Manage your Aspects" + = link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects') .yo{ :style => "display:none;"} #add_aspect_pane diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 4645ec65c..9dadf4905 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -19,4 +19,4 @@ = check_box_tag("aspect_ids[]", aspect.id, @aspect == :all || current_aspect?(aspect) ) = aspect.name - = f.submit "Share" + = f.submit t('.share') diff --git a/app/views/shared/_sub_header.haml b/app/views/shared/_sub_header.haml index badf8783d..d8ad6c603 100644 --- a/app/views/shared/_sub_header.haml +++ b/app/views/shared/_sub_header.haml @@ -7,9 +7,9 @@ - else %h1 - if @aspect == :all - = link_to "All Aspects", root_path + = link_to t('.all_aspects'), root_path - elsif @aspect == :manage - = link_to "Manage Aspects", root_path + = link_to t('.manage_aspects'), root_path - else = link_to @aspect.name, @aspect From 9157f72e0139926d69ba261bb5faec7b693a5b3a Mon Sep 17 00:00:00 2001 From: Etienne Membrives Date: Thu, 16 Sep 2010 12:31:24 -0700 Subject: [PATCH 10/79] French localization --- config/locales/devise.fr.yml | 41 ++++++++++++++++++++++++++++++++++++ config/locales/fr.yml | 10 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 config/locales/devise.fr.yml create mode 100644 config/locales/fr.yml diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml new file mode 100644 index 000000000..cc8f470bd --- /dev/null +++ b/config/locales/devise.fr.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +fr: + errors: + messages: + not_found: "inconnu" + already_confirmed: "a déjà été confirmé" + not_locked: "n'est pas vérouillé" + + devise: + failure: + unauthenticated: 'Vous devez vous connecter ou vous enregistrer avant de vous connecter.' + unconfirmed: 'Vous devez vérifier votre compte avant de continuer.' + locked: 'Votre compte est vérouillé.' + invalid: 'Courriel ou mot de passe érronés.' + invalid_token: 'Jeton d'authentification non valide.' + timeout: 'Votre session a expiré, veuillez vous connecter avant de continuer.' + inactive: 'Votre compte n'a pas encore été activé.' + sessions: + signed_in: 'Connexion réussie.' + signed_out: 'Déconnexion réussie.' + passwords: + send_instructions: 'Vous allez recevoir un courriel dans quelques minutes avec les instructions pour changer votre mot de passe.' + updated: 'Votre mot de passe a été changé. Vous êtes maintenant connecté.' + confirmations: + send_instructions: 'Vous allez recevoir un courriel dans quelques minutes avec les instructions pour configurer votre compte.' + confirmed: 'Votre compte a été vérifié. Vous êtes maintenant connecté.' + registrations: + signed_up: 'Vous êtes maintenant enregistré. Si activé, un courriel de confirmation vient de vous être envoyé.' + updated: 'Votre compte a été mis à jour.' + destroyed: 'Au revoir ! Votre compte a été supprimé. Nous espérons vous revoir bientôt.' + unlocks: + send_instructions: 'Vous allez recevoir un courriel dans quelques minutes avec les instructions pour dévérouiller votre compte.' + unlocked: 'Votre compte a été dévérouillé. Vous êtes maintenant connecté.' + mailer: + confirmation_instructions: 'Comment vérifier votre compte ?' + reset_password_instructions: 'Comment changer votre mot de passe ?' + unlock_instructions: 'Comment dévérouiller votre compte ?' diff --git a/config/locales/fr.yml b/config/locales/fr.yml new file mode 100644 index 000000000..e47795485 --- /dev/null +++ b/config/locales/fr.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +fr: + hello: "Bonjour !" From 6a967e7fe9914dbc35ebc76c9350781187a63426 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 15:47:12 -0400 Subject: [PATCH 11/79] Added localization to status message views --- app/views/status_messages/_new_status_message.haml | 4 ++-- app/views/status_messages/_status_message.html.haml | 4 ++-- app/views/status_messages/show.html.haml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml index 329e72d66..b515dadff 100644 --- a/app/views/status_messages/_new_status_message.haml +++ b/app/views/status_messages/_new_status_message.haml @@ -6,5 +6,5 @@ = form_for StatusMessage.new, :remote => true do |f| = f.error_messages %p - = f.text_field :message, :value => "tell me something good" - = f.submit 'oh yeah!', :class => 'button' + = f.text_field :message, :value => t('.tell_me_something_good') + = f.submit t('.oh_yeah'), :class => 'button' diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index a22098afa..f6cac9155 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -15,11 +15,11 @@ .info = link_to(how_long_ago(post), object_path(post)) \-- - = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" + = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments" = render "comments/comments", :post => post - if current_user.owns?(post) .destroy_link - = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete" + = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete" diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index 358c2244b..b27208d2b 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/show.html.haml @@ -3,20 +3,20 @@ -# the COPYRIGHT file. -- title "Status Message" +- title t('.status_message') %p - %strong Message: + %strong="#{t('.message')}:" = @status_message.message %p - %strong Owner: + %strong="#{t('.owner')}:" = @status_message.person.real_name -%h4= "comments (#{@status_message.comments.count})" +%h4= "#{t('.comments')} (#{@status_message.comments.count})" = render "comments/comments", :post => @status_message %p - = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete + = link_to t('.destroy'), @status_message, :confirm => t('.are_you_sure'), :method => :delete | - = link_to "View All", status_messages_path + = link_to t('.view_all'), status_messages_path From be9ae343cc49e3124a6082c17fa8c95960607e37 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 15:55:54 -0400 Subject: [PATCH 12/79] Added localizations that I had missed --- app/views/aspects/manage.html.haml | 6 ++---- app/views/registrations/new.html.haml | 2 +- app/views/shared/_aspect_friends.haml | 2 +- app/views/users/edit.html.haml | 17 ++++++++--------- config/locales/en.yml | 23 +++++++++++++++++++++++ 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 0e667a8e6..c8537d638 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -8,8 +8,7 @@ = javascript_include_tag 'aspect-edit.js' - content_for :left_pane do - %h1 - Requests + %h1=t('.requests') .requests %ul @@ -18,8 +17,7 @@ = person_image_tag(request.person) .name = request.person.real_name - %h1 - Ignore/Remove + %h1=t('.ignore_remove') %li.remove %ul diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml index eefa94519..065a9aa49 100644 --- a/app/views/registrations/new.html.haml +++ b/app/views/registrations/new.html.haml @@ -27,5 +27,5 @@ = pr.label :last_name = pr.text_field :last_name - = f.submit "Sign up" + = f.submit t('.sign_up') = render :partial => "devise/shared/links" diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml index 6ab286a81..5e1dfe213 100644 --- a/app/views/shared/_aspect_friends.haml +++ b/app/views/shared/_aspect_friends.haml @@ -16,5 +16,5 @@ = render "requests/new_request", :aspect => @aspect -else .clear - = link_to "add friends", aspects_manage_path + = link_to t('.add_friends'), aspects_manage_path diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index cddec8d77..406f95499 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -4,8 +4,7 @@ - content_for :publish do - %h1 - Editing profile + %h1="#{t('.editing_profile')}" - content_for :left_pane do \. @@ -15,7 +14,7 @@ = f.fields_for :profile do |p| - %h3 Picture + %h3="#{t('.picture')}" %div#image_picker = p.hidden_field :image_url, :value => (@profile.image_url.sub(@user.url,'/') if @profile.image_url), :id => 'image_url_field' @@ -32,18 +31,18 @@ - else You don't have any photos! Go to the - = link_to "albums", albums_path(:aspect => 'all') + = link_to t('.albums'), albums_path(:aspect => 'all') page to upload some. =will_paginate @photos %br - %h3 Info + %h3="#{t('.info')}" %p %b - DIASPORA USERNAME: + ="#{t('.diaspora_username')}:" = @user.diaspora_handle %p @@ -58,10 +57,10 @@ = f.text_field :email #submit_block - = link_to "Cancel", root_path + = link_to t('.cancel'), root_path or - = f.submit "Update Profile" + = f.submit t('.update_profile') #content_bottom .back - = link_to "⇧ home", root_path + = link_to "⇧ #{t('.home')}", root_path diff --git a/config/locales/en.yml b/config/locales/en.yml index bfcf69939..d9046c00b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,6 +22,8 @@ en: manage_aspects: "Manage Aspects" publisher: share: "Share" + aspect_friends: + add_friends: "add friends" albums: album: you: "you" @@ -52,6 +54,8 @@ en: add_a_new_friend: "Add a new friend" show: "Show" update_aspects: "Update Aspects" + requests: "Requests" + ignore_remove: "Ignore/Remove" new_aspect: create: "Create" users: @@ -88,5 +92,24 @@ en: new_photo: "New Photo" back_to_list: "Back to List" post_it: "post it!" + registrations: + new: + sign_up: "Sign up" + status_messages: + new_status_message: + tell_me_something_good: "tell me something good" + oh_yeah: "oh yeah!" + status_message: + show_comments: "show comments" + delete: "Delete" + are_you_sure: "Are you sure?" + show: + status_message: "Status Message" + comments: "comments" + are_you_sure: "Are you sure?" + destroy: "Destroy" + view_all: "View All" + message: "Message" + owner: "Owner" From f4aeca66f8f5d2502899f1c225def64c69ad0dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Thu, 16 Sep 2010 22:17:00 +0200 Subject: [PATCH 13/79] French localisation. --- config/locales/devise.fr.yml | 41 ++++++++++++++++++++++++++++++++++++ config/locales/fr.yml | 10 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 config/locales/devise.fr.yml create mode 100644 config/locales/fr.yml diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml new file mode 100644 index 000000000..8829de132 --- /dev/null +++ b/config/locales/devise.fr.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +en: + errors: + messages: + not_found: "introuvable" + already_confirmed: "a déjà été confirmé" + not_locked: "n’a pas été verrouillé" + + devise: + failure: + unauthenticated: 'Vous devez vous connecter ou vous inscrire avant de continuer.' + unconfirmed: 'Vous devez confirmer votre compte avant de continuer.' + locked: 'Votre compte est verrouillé.' + invalid: 'E-mail ou mot de passe invalide.' + invalid_token: 'Jeton d’authentification invalide.' + timeout: 'Votre session a expiré, veuillez vous connecter de nouveau afin de continuer.' + inactive: 'Votre compte n’a pas encore été activé.' + sessions: + signed_in: 'Connecté avec succès.' + signed_out: 'Déconnecté avec succès.' + passwords: + send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment réinitialiser votre mot de passe.' + updated: 'Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté.' + confirmations: + send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment confirmer votre compte.' + confirmed: 'Votre compte a été confirmé avec succès. Vous êtes à présent connecté.' + registrations: + signed_up: 'Vous vous êtes inscrit avec succès. Si activée, une confirmation a été envoyée sur votre adresse e-mail.' + updated: 'Vous avez mis à jour votre compte avec succès.' + destroyed: 'Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt.' + unlocks: + send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment déverrouiller votre compte.' + unlocked: 'Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté.' + mailer: + confirmation_instructions: 'Instructions de confirmation' + reset_password_instructions: 'Réinitialiser les instructions du mot de passe' + unlock_instructions: 'Instructions de déverrouillage' diff --git a/config/locales/fr.yml b/config/locales/fr.yml new file mode 100644 index 000000000..641208b2a --- /dev/null +++ b/config/locales/fr.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +en: + hello: "Bonjour tout le monde" From 060ba12376c119134e9a33cbe4603541f1a76aeb Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 16:30:17 -0400 Subject: [PATCH 14/79] Started Spanish Locale --- config/locales/es.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 config/locales/es.yml diff --git a/config/locales/es.yml b/config/locales/es.yml new file mode 100644 index 000000000..11c2effdd --- /dev/null +++ b/config/locales/es.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +es: + hello: "Hello world" \ No newline at end of file From b7cfbd6fd709182222baff9bd4a390f9e1245811 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 17:05:11 -0400 Subject: [PATCH 15/79] Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml --- config/locales/{en.yml => diaspora.en.yml} | 0 config/locales/diaspora.es.yml | 114 +++++++++ config/locales/es.yml | 268 ++++++++++++++++++++- 3 files changed, 375 insertions(+), 7 deletions(-) rename config/locales/{en.yml => diaspora.en.yml} (100%) create mode 100644 config/locales/diaspora.es.yml diff --git a/config/locales/en.yml b/config/locales/diaspora.en.yml similarity index 100% rename from config/locales/en.yml rename to config/locales/diaspora.en.yml diff --git a/config/locales/diaspora.es.yml b/config/locales/diaspora.es.yml new file mode 100644 index 000000000..f77e6f54a --- /dev/null +++ b/config/locales/diaspora.es.yml @@ -0,0 +1,114 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + + +es: + hello: "Hola Mundo" + layouts: + application: + edit_profile: "editar perfil" + logout: "desloguear" + shared: + aspect_nav: + all_aspects: "All Aspects" + manage: "Manejar" + manage_your_aspects: "Manage your Aspects" + sub_header: + all_aspects: "All Aspects" + manage_aspects: "Manage Aspects" + publisher: + share: "Compartir" + aspect_friends: + add_friends: "Añade amigos" + albums: + album: + you: "usted" + new_album: + create: "Crear" + add_a_new_album: "Añade un nuevo álbum" + show: + edit_album: "Editar Álbum" + albums: "álbumes" + updated: "actualizar" + by: "por" + edit: + editing: "Editando" + updated: "actualizado" + are_you_sure: "Esta seguro?" + delete_album: "Eliminar Album" + cancel: "Cancelar" + index: + home: "home" + new_album: "Nuevo Album" + aspects: + index: + photos: "fotos" + show: + photos: "fotos" + manage: + add_a_new_aspect: "Añadir nuevo aspecto" + add_a_new_friend: "Añadir nuevo amigo" + show: "Mostrar" + update_aspects: "Actualizar Aspectos" + requests: "Requests" + ignore_remove: "Ignorar/Remover" + new_aspect: + create: "Crear" + users: + edit: + cancel: "Cancelar" + update_profile: "Actualizar Perfil" + home: "Home" + diaspora_username: "USUARIO DE DIASPORA" + info: "Info" + picture: "Picture" + editing_profile: "Editando perfil" + albums: "Álbums" + comments: + comment: + ago: "atras" + new_comment: + comment: "Commentario" + photos: + show: + prev: "prev" + full_size: "tamaño actual" + next: "prox" + edit_photo: "Editar Foto" + delete_photo: "Eliminar Foto" + are_you_sure: "Esta seguro?" + comments: "comentarios" + edit: + editing: "Editando" + are_you_sure: "Esta seguro?" + delete_photo: "Eliminar Foto" + photo: + show_comments: "mostrar comentarios" + new: + new_photo: "Nueva Foto" + back_to_list: "Devuelta a la lista" + post_it: "post it!" + registrations: + new: + sign_up: "Registrar" + status_messages: + new_status_message: + tell_me_something_good: "dime algo bueno" + oh_yeah: "oh yeah!" + status_message: + show_comments: "mostrar comentarios" + delete: "Eliminar" + are_you_sure: "Esta seguro?" + show: + status_message: "Mensaje de status" + comments: "comentarios" + are_you_sure: "Esta seguro?" + destroy: "Destruir" + view_all: "Ver Todos" + message: "Mensaje" + owner: "Dueño" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 11c2effdd..ad1db8794 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,10 +1,264 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. +# Spanish translations for Rails +# by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) +"es": + # Action View + number: + # Used in number_with_delimiter() + # These are also the defaults for 'currency', 'percentage', 'precision', and 'human' + format: + # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5) + separator: "," + # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three) + delimiter: "." + # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00) + precision: 3 + # If set to true, precision will mean the number of significant digits instead + # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2) + significant: false + # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2) + strip_insignificant_zeros: false -# 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. + # Used in number_to_currency() + currency: + format: + # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00) + format: "%n %u" + unit: "€" + # These three are to override number.format and are optional + separator: "," + delimiter: "." + precision: 2 + significant: false + strip_insignificant_zeros: false -es: - hello: "Hello world" \ No newline at end of file + # Used in number_to_percentage() + percentage: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + + # Used in number_to_precision() + precision: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + # significant: false + # strip_insignificant_zeros: false + + # Used in number_to_human_size() + human: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + precision: 1 + significant: true + strip_insignificant_zeros: true + # Used in number_to_human_size() + storage_units: + format: "%n %u" + units: + byte: + one: "Byte" + other: "Bytes" + kb: "KB" + mb: "MB" + gb: "GB" + tb: "TB" + # Used in number_to_human() + decimal_units: + format: "%n %u" + # Decimal units output formatting + # By default we will only quantify some of the exponents + # but the commented ones might be defined or overridden + # by the user. + units: + # femto: Quadrillionth + # pico: Trillionth + # nano: Billionth + # micro: Millionth + # mili: Thousandth + # centi: Hundredth + # deci: Tenth + unit: "" + # ten: + # one: Ten + # other: Tens + # hundred: Hundred + thousand: "Mil" + million: "Millón" + billion: "Mil millones" + trillion: "Trillón" + quadrillion: "Cuatrillón" + + # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words() + datetime: + distance_in_words: + half_a_minute: "medio minuto" + less_than_x_seconds: + one: "menos de 1 segundo" + other: "menos de %{count} segundos" + x_seconds: + one: "1 segundo" + other: "%{count} segundos" + less_than_x_minutes: + one: "menos de 1 minuto" + other: "menos de %{count} minutos" + x_minutes: + one: "1 minuto" + other: "%{count} minutos" + about_x_hours: + one: "alrededor de 1 hora" + other: "alrededor de %{count} horas" + x_days: + one: "1 día" + other: "%{count} días" + about_x_months: + one: "alrededor de 1 mes" + other: "alrededor de %{count} meses" + x_months: + one: "1 mes" + other: "%{count} meses" + about_x_years: + one: "alrededor de 1 año" + other: "alrededor de %{count} años" + over_x_years: + one: "más de 1 año" + other: "más de %{count} años" + almost_x_years: + one: "casi 1 año" + other: "casi %{count} años" + prompts: + year: "Año" + month: "Mes" + day: "Día" + hour: "Hora" + minute: "Minutos" + second: "Segundos" + + helpers: + select: + # Default value for :prompt => true in FormOptionsHelper + prompt: "Por favor seleccione" + + # Default translation keys for submit FormHelper + submit: + create: 'Guardar %{model}' + update: 'Actualizar %{model}' + submit: 'Guardar %{model}' + + # Attributes names common to most models + #attributes: + #created_at: "Created at" + #updated_at: "Updated at" + + # Active Record models configuration + activerecord: + errors: + messages: + taken: "ya está en uso" + record_invalid: "La validación falló: %{errors}" + # Append your own errors here or at the model/attributes scope. + + # You can define own errors for models or model attributes. + # The values :model, :attribute and :value are always available for interpolation. + # + # For example, + # models: + # user: + # blank: "This is a custom blank message for %{model}: %{attribute}" + # attributes: + # login: + # blank: "This is a custom blank message for User login" + # Will define custom blank validation message for User model and + # custom blank validation message for login attribute of User model. + #models: + + # Translate model names. Used in Model.human_name(). + #models: + # For example, + # user: "Dude" + # will translate User model name to "Dude" + + # Translate model attribute names. Used in Model.human_attribute_name(attribute). + #attributes: + # For example, + # user: + # login: "Handle" + # will translate User attribute "login" as "Handle" + + # Active Model + errors: + # The default format to use in full error messages. + format: "%{attribute} %{message}" + + template: + header: + one: "No se pudo guardar este/a %{model} porque se encontró 1 error" + other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" + # The variable :count is also available + body: "Se encontraron problemas con los siguientes campos:" + + # The values :model, :attribute and :value are always available for interpolation + # The value :count is available when applicable. Can be used for pluralization. + messages: + inclusion: "no está incluido en la lista" + exclusion: "está reservado" + invalid: "no es válido" + confirmation: "no coincide con la confirmación" + accepted: "debe ser aceptado" + empty: "no puede estar vacío" + blank: "no puede estar en blanco" + too_long: "es demasiado largo (%{count} caracteres máximo)" + too_short: "es demasiado corto (%{count} caracteres mínimo)" + wrong_length: "no tiene la longitud correcta (%{count} caracteres exactos)" + not_a_number: "no es un número" + greater_than: "debe ser mayor que %{count}" + greater_than_or_equal_to: "debe ser mayor que o igual a %{count}" + equal_to: "debe ser igual a %{count}" + less_than: "debe ser menor que %{count}" + less_than_or_equal_to: "debe ser menor que o igual a %{count}" + odd: "debe ser impar" + even: "debe ser par" + + # Active Support + date: + formats: + # Use the strftime parameters for formats. + # When no format has been given, it uses default. + # You can provide other formats here if you like! + default: "%e/%m/%Y" + short: "%e de %b" + long: "%e de %B de %Y" + + day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado] + abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab] + + # Don't forget the nil at the beginning; there's no such thing as a 0th month + month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] + abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] + # Used in date_select and datime_select. + order: + - :day + - :month + - :year + + time: + formats: + default: "%A, %e de %B de %Y %H:%M:%S %z" + short: "%e de %b %H:%M" + long: "%e de %B de %Y %H:%M" + am: "am" + pm: "pm" + + # Used in array.to_sentence. + support: + array: + words_connector: ", " + two_words_connector: " y " + last_word_connector: ", y " \ No newline at end of file From d7ca279fa9859bf384274a3a0bba51299e30498b Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 17:27:26 -0400 Subject: [PATCH 16/79] Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml" This reverts commit b7cfbd6fd709182222baff9bd4a390f9e1245811. --- config/locales/diaspora.es.yml | 114 --------- config/locales/{diaspora.en.yml => en.yml} | 0 config/locales/es.yml | 268 +-------------------- 3 files changed, 7 insertions(+), 375 deletions(-) delete mode 100644 config/locales/diaspora.es.yml rename config/locales/{diaspora.en.yml => en.yml} (100%) diff --git a/config/locales/diaspora.es.yml b/config/locales/diaspora.es.yml deleted file mode 100644 index f77e6f54a..000000000 --- a/config/locales/diaspora.es.yml +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. - - -# 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. - - -es: - hello: "Hola Mundo" - layouts: - application: - edit_profile: "editar perfil" - logout: "desloguear" - shared: - aspect_nav: - all_aspects: "All Aspects" - manage: "Manejar" - manage_your_aspects: "Manage your Aspects" - sub_header: - all_aspects: "All Aspects" - manage_aspects: "Manage Aspects" - publisher: - share: "Compartir" - aspect_friends: - add_friends: "Añade amigos" - albums: - album: - you: "usted" - new_album: - create: "Crear" - add_a_new_album: "Añade un nuevo álbum" - show: - edit_album: "Editar Álbum" - albums: "álbumes" - updated: "actualizar" - by: "por" - edit: - editing: "Editando" - updated: "actualizado" - are_you_sure: "Esta seguro?" - delete_album: "Eliminar Album" - cancel: "Cancelar" - index: - home: "home" - new_album: "Nuevo Album" - aspects: - index: - photos: "fotos" - show: - photos: "fotos" - manage: - add_a_new_aspect: "Añadir nuevo aspecto" - add_a_new_friend: "Añadir nuevo amigo" - show: "Mostrar" - update_aspects: "Actualizar Aspectos" - requests: "Requests" - ignore_remove: "Ignorar/Remover" - new_aspect: - create: "Crear" - users: - edit: - cancel: "Cancelar" - update_profile: "Actualizar Perfil" - home: "Home" - diaspora_username: "USUARIO DE DIASPORA" - info: "Info" - picture: "Picture" - editing_profile: "Editando perfil" - albums: "Álbums" - comments: - comment: - ago: "atras" - new_comment: - comment: "Commentario" - photos: - show: - prev: "prev" - full_size: "tamaño actual" - next: "prox" - edit_photo: "Editar Foto" - delete_photo: "Eliminar Foto" - are_you_sure: "Esta seguro?" - comments: "comentarios" - edit: - editing: "Editando" - are_you_sure: "Esta seguro?" - delete_photo: "Eliminar Foto" - photo: - show_comments: "mostrar comentarios" - new: - new_photo: "Nueva Foto" - back_to_list: "Devuelta a la lista" - post_it: "post it!" - registrations: - new: - sign_up: "Registrar" - status_messages: - new_status_message: - tell_me_something_good: "dime algo bueno" - oh_yeah: "oh yeah!" - status_message: - show_comments: "mostrar comentarios" - delete: "Eliminar" - are_you_sure: "Esta seguro?" - show: - status_message: "Mensaje de status" - comments: "comentarios" - are_you_sure: "Esta seguro?" - destroy: "Destruir" - view_all: "Ver Todos" - message: "Mensaje" - owner: "Dueño" \ No newline at end of file diff --git a/config/locales/diaspora.en.yml b/config/locales/en.yml similarity index 100% rename from config/locales/diaspora.en.yml rename to config/locales/en.yml diff --git a/config/locales/es.yml b/config/locales/es.yml index ad1db8794..11c2effdd 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,264 +1,10 @@ -# Spanish translations for Rails -# by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. -"es": - # Action View - number: - # Used in number_with_delimiter() - # These are also the defaults for 'currency', 'percentage', 'precision', and 'human' - format: - # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5) - separator: "," - # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three) - delimiter: "." - # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00) - precision: 3 - # If set to true, precision will mean the number of significant digits instead - # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2) - significant: false - # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2) - strip_insignificant_zeros: false - # Used in number_to_currency() - currency: - format: - # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00) - format: "%n %u" - unit: "€" - # These three are to override number.format and are optional - separator: "," - delimiter: "." - precision: 2 - significant: false - strip_insignificant_zeros: false +# 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. - # Used in number_to_percentage() - percentage: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - # precision: - - # Used in number_to_precision() - precision: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - # precision: - # significant: false - # strip_insignificant_zeros: false - - # Used in number_to_human_size() - human: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - precision: 1 - significant: true - strip_insignificant_zeros: true - # Used in number_to_human_size() - storage_units: - format: "%n %u" - units: - byte: - one: "Byte" - other: "Bytes" - kb: "KB" - mb: "MB" - gb: "GB" - tb: "TB" - # Used in number_to_human() - decimal_units: - format: "%n %u" - # Decimal units output formatting - # By default we will only quantify some of the exponents - # but the commented ones might be defined or overridden - # by the user. - units: - # femto: Quadrillionth - # pico: Trillionth - # nano: Billionth - # micro: Millionth - # mili: Thousandth - # centi: Hundredth - # deci: Tenth - unit: "" - # ten: - # one: Ten - # other: Tens - # hundred: Hundred - thousand: "Mil" - million: "Millón" - billion: "Mil millones" - trillion: "Trillón" - quadrillion: "Cuatrillón" - - # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words() - datetime: - distance_in_words: - half_a_minute: "medio minuto" - less_than_x_seconds: - one: "menos de 1 segundo" - other: "menos de %{count} segundos" - x_seconds: - one: "1 segundo" - other: "%{count} segundos" - less_than_x_minutes: - one: "menos de 1 minuto" - other: "menos de %{count} minutos" - x_minutes: - one: "1 minuto" - other: "%{count} minutos" - about_x_hours: - one: "alrededor de 1 hora" - other: "alrededor de %{count} horas" - x_days: - one: "1 día" - other: "%{count} días" - about_x_months: - one: "alrededor de 1 mes" - other: "alrededor de %{count} meses" - x_months: - one: "1 mes" - other: "%{count} meses" - about_x_years: - one: "alrededor de 1 año" - other: "alrededor de %{count} años" - over_x_years: - one: "más de 1 año" - other: "más de %{count} años" - almost_x_years: - one: "casi 1 año" - other: "casi %{count} años" - prompts: - year: "Año" - month: "Mes" - day: "Día" - hour: "Hora" - minute: "Minutos" - second: "Segundos" - - helpers: - select: - # Default value for :prompt => true in FormOptionsHelper - prompt: "Por favor seleccione" - - # Default translation keys for submit FormHelper - submit: - create: 'Guardar %{model}' - update: 'Actualizar %{model}' - submit: 'Guardar %{model}' - - # Attributes names common to most models - #attributes: - #created_at: "Created at" - #updated_at: "Updated at" - - # Active Record models configuration - activerecord: - errors: - messages: - taken: "ya está en uso" - record_invalid: "La validación falló: %{errors}" - # Append your own errors here or at the model/attributes scope. - - # You can define own errors for models or model attributes. - # The values :model, :attribute and :value are always available for interpolation. - # - # For example, - # models: - # user: - # blank: "This is a custom blank message for %{model}: %{attribute}" - # attributes: - # login: - # blank: "This is a custom blank message for User login" - # Will define custom blank validation message for User model and - # custom blank validation message for login attribute of User model. - #models: - - # Translate model names. Used in Model.human_name(). - #models: - # For example, - # user: "Dude" - # will translate User model name to "Dude" - - # Translate model attribute names. Used in Model.human_attribute_name(attribute). - #attributes: - # For example, - # user: - # login: "Handle" - # will translate User attribute "login" as "Handle" - - # Active Model - errors: - # The default format to use in full error messages. - format: "%{attribute} %{message}" - - template: - header: - one: "No se pudo guardar este/a %{model} porque se encontró 1 error" - other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" - # The variable :count is also available - body: "Se encontraron problemas con los siguientes campos:" - - # The values :model, :attribute and :value are always available for interpolation - # The value :count is available when applicable. Can be used for pluralization. - messages: - inclusion: "no está incluido en la lista" - exclusion: "está reservado" - invalid: "no es válido" - confirmation: "no coincide con la confirmación" - accepted: "debe ser aceptado" - empty: "no puede estar vacío" - blank: "no puede estar en blanco" - too_long: "es demasiado largo (%{count} caracteres máximo)" - too_short: "es demasiado corto (%{count} caracteres mínimo)" - wrong_length: "no tiene la longitud correcta (%{count} caracteres exactos)" - not_a_number: "no es un número" - greater_than: "debe ser mayor que %{count}" - greater_than_or_equal_to: "debe ser mayor que o igual a %{count}" - equal_to: "debe ser igual a %{count}" - less_than: "debe ser menor que %{count}" - less_than_or_equal_to: "debe ser menor que o igual a %{count}" - odd: "debe ser impar" - even: "debe ser par" - - # Active Support - date: - formats: - # Use the strftime parameters for formats. - # When no format has been given, it uses default. - # You can provide other formats here if you like! - default: "%e/%m/%Y" - short: "%e de %b" - long: "%e de %B de %Y" - - day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado] - abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab] - - # Don't forget the nil at the beginning; there's no such thing as a 0th month - month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] - abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] - # Used in date_select and datime_select. - order: - - :day - - :month - - :year - - time: - formats: - default: "%A, %e de %B de %Y %H:%M:%S %z" - short: "%e de %b %H:%M" - long: "%e de %B de %Y %H:%M" - am: "am" - pm: "pm" - - # Used in array.to_sentence. - support: - array: - words_connector: ", " - two_words_connector: " y " - last_word_connector: ", y " \ No newline at end of file +es: + hello: "Hello world" \ No newline at end of file From 8f56178bd2ac468a53561404c1138163c5336a92 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 17:29:25 -0400 Subject: [PATCH 17/79] added diaspora site specific localization files --- config/locales/diaspora.en.yml | 115 ++++++++++++++ config/locales/diaspora.es.yml | 114 ++++++++++++++ config/locales/es.yml | 268 ++++++++++++++++++++++++++++++++- 3 files changed, 490 insertions(+), 7 deletions(-) create mode 100644 config/locales/diaspora.en.yml create mode 100644 config/locales/diaspora.es.yml diff --git a/config/locales/diaspora.en.yml b/config/locales/diaspora.en.yml new file mode 100644 index 000000000..d9046c00b --- /dev/null +++ b/config/locales/diaspora.en.yml @@ -0,0 +1,115 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +en: + hello: "Hello world" + layouts: + application: + edit_profile: "edit profile" + logout: "logout" + shared: + aspect_nav: + all_aspects: "All Aspects" + manage: "Manage" + manage_your_aspects: "Manage your Aspects" + sub_header: + all_aspects: "All Aspects" + manage_aspects: "Manage Aspects" + publisher: + share: "Share" + aspect_friends: + add_friends: "add friends" + albums: + album: + you: "you" + new_album: + create: "create" + add_a_new_album: "Add a new album" + show: + edit_album: "Edit Album" + albums: "albums" + updated: "updated" + by: "by" + edit: + editing: "Editing" + updated: "updated" + are_you_sure: "Are you sure?" + delete_album: "Delete Album" + cancel: "Cancel" + index: + home: "home" + new_album: "New Album" + aspects: + index: + photos: "photos" + show: + photos: "photos" + manage: + add_a_new_aspect: "Add a new aspect" + add_a_new_friend: "Add a new friend" + show: "Show" + update_aspects: "Update Aspects" + requests: "Requests" + ignore_remove: "Ignore/Remove" + new_aspect: + create: "Create" + users: + edit: + cancel: "Cancel" + update_profile: "Update Profile" + home: "Home" + diaspora_username: "DIASPORA USERNAME" + info: "Info" + picture: "Picture" + editing_profile: "Editing profile" + albums: "Albums" + comments: + comment: + ago: "ago" + new_comment: + comment: "Comment" + photos: + show: + prev: "prev" + full_size: "full size" + next: "next" + edit_photo: "Edit Photo" + delete_photo: "Delete Photo" + are_you_sure: "Are you sure?" + comments: "comments" + edit: + editing: "Editing" + are_you_sure: "Are you sure?" + delete_photo: "Delete Photo" + photo: + show_comments: "show comments" + new: + new_photo: "New Photo" + back_to_list: "Back to List" + post_it: "post it!" + registrations: + new: + sign_up: "Sign up" + status_messages: + new_status_message: + tell_me_something_good: "tell me something good" + oh_yeah: "oh yeah!" + status_message: + show_comments: "show comments" + delete: "Delete" + are_you_sure: "Are you sure?" + show: + status_message: "Status Message" + comments: "comments" + are_you_sure: "Are you sure?" + destroy: "Destroy" + view_all: "View All" + message: "Message" + owner: "Owner" + + diff --git a/config/locales/diaspora.es.yml b/config/locales/diaspora.es.yml new file mode 100644 index 000000000..f77e6f54a --- /dev/null +++ b/config/locales/diaspora.es.yml @@ -0,0 +1,114 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + + +es: + hello: "Hola Mundo" + layouts: + application: + edit_profile: "editar perfil" + logout: "desloguear" + shared: + aspect_nav: + all_aspects: "All Aspects" + manage: "Manejar" + manage_your_aspects: "Manage your Aspects" + sub_header: + all_aspects: "All Aspects" + manage_aspects: "Manage Aspects" + publisher: + share: "Compartir" + aspect_friends: + add_friends: "Añade amigos" + albums: + album: + you: "usted" + new_album: + create: "Crear" + add_a_new_album: "Añade un nuevo álbum" + show: + edit_album: "Editar Álbum" + albums: "álbumes" + updated: "actualizar" + by: "por" + edit: + editing: "Editando" + updated: "actualizado" + are_you_sure: "Esta seguro?" + delete_album: "Eliminar Album" + cancel: "Cancelar" + index: + home: "home" + new_album: "Nuevo Album" + aspects: + index: + photos: "fotos" + show: + photos: "fotos" + manage: + add_a_new_aspect: "Añadir nuevo aspecto" + add_a_new_friend: "Añadir nuevo amigo" + show: "Mostrar" + update_aspects: "Actualizar Aspectos" + requests: "Requests" + ignore_remove: "Ignorar/Remover" + new_aspect: + create: "Crear" + users: + edit: + cancel: "Cancelar" + update_profile: "Actualizar Perfil" + home: "Home" + diaspora_username: "USUARIO DE DIASPORA" + info: "Info" + picture: "Picture" + editing_profile: "Editando perfil" + albums: "Álbums" + comments: + comment: + ago: "atras" + new_comment: + comment: "Commentario" + photos: + show: + prev: "prev" + full_size: "tamaño actual" + next: "prox" + edit_photo: "Editar Foto" + delete_photo: "Eliminar Foto" + are_you_sure: "Esta seguro?" + comments: "comentarios" + edit: + editing: "Editando" + are_you_sure: "Esta seguro?" + delete_photo: "Eliminar Foto" + photo: + show_comments: "mostrar comentarios" + new: + new_photo: "Nueva Foto" + back_to_list: "Devuelta a la lista" + post_it: "post it!" + registrations: + new: + sign_up: "Registrar" + status_messages: + new_status_message: + tell_me_something_good: "dime algo bueno" + oh_yeah: "oh yeah!" + status_message: + show_comments: "mostrar comentarios" + delete: "Eliminar" + are_you_sure: "Esta seguro?" + show: + status_message: "Mensaje de status" + comments: "comentarios" + are_you_sure: "Esta seguro?" + destroy: "Destruir" + view_all: "Ver Todos" + message: "Mensaje" + owner: "Dueño" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 11c2effdd..ad1db8794 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,10 +1,264 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. +# Spanish translations for Rails +# by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) +"es": + # Action View + number: + # Used in number_with_delimiter() + # These are also the defaults for 'currency', 'percentage', 'precision', and 'human' + format: + # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5) + separator: "," + # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three) + delimiter: "." + # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00) + precision: 3 + # If set to true, precision will mean the number of significant digits instead + # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2) + significant: false + # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2) + strip_insignificant_zeros: false -# 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. + # Used in number_to_currency() + currency: + format: + # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00) + format: "%n %u" + unit: "€" + # These three are to override number.format and are optional + separator: "," + delimiter: "." + precision: 2 + significant: false + strip_insignificant_zeros: false -es: - hello: "Hello world" \ No newline at end of file + # Used in number_to_percentage() + percentage: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + + # Used in number_to_precision() + precision: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + # significant: false + # strip_insignificant_zeros: false + + # Used in number_to_human_size() + human: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + precision: 1 + significant: true + strip_insignificant_zeros: true + # Used in number_to_human_size() + storage_units: + format: "%n %u" + units: + byte: + one: "Byte" + other: "Bytes" + kb: "KB" + mb: "MB" + gb: "GB" + tb: "TB" + # Used in number_to_human() + decimal_units: + format: "%n %u" + # Decimal units output formatting + # By default we will only quantify some of the exponents + # but the commented ones might be defined or overridden + # by the user. + units: + # femto: Quadrillionth + # pico: Trillionth + # nano: Billionth + # micro: Millionth + # mili: Thousandth + # centi: Hundredth + # deci: Tenth + unit: "" + # ten: + # one: Ten + # other: Tens + # hundred: Hundred + thousand: "Mil" + million: "Millón" + billion: "Mil millones" + trillion: "Trillón" + quadrillion: "Cuatrillón" + + # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words() + datetime: + distance_in_words: + half_a_minute: "medio minuto" + less_than_x_seconds: + one: "menos de 1 segundo" + other: "menos de %{count} segundos" + x_seconds: + one: "1 segundo" + other: "%{count} segundos" + less_than_x_minutes: + one: "menos de 1 minuto" + other: "menos de %{count} minutos" + x_minutes: + one: "1 minuto" + other: "%{count} minutos" + about_x_hours: + one: "alrededor de 1 hora" + other: "alrededor de %{count} horas" + x_days: + one: "1 día" + other: "%{count} días" + about_x_months: + one: "alrededor de 1 mes" + other: "alrededor de %{count} meses" + x_months: + one: "1 mes" + other: "%{count} meses" + about_x_years: + one: "alrededor de 1 año" + other: "alrededor de %{count} años" + over_x_years: + one: "más de 1 año" + other: "más de %{count} años" + almost_x_years: + one: "casi 1 año" + other: "casi %{count} años" + prompts: + year: "Año" + month: "Mes" + day: "Día" + hour: "Hora" + minute: "Minutos" + second: "Segundos" + + helpers: + select: + # Default value for :prompt => true in FormOptionsHelper + prompt: "Por favor seleccione" + + # Default translation keys for submit FormHelper + submit: + create: 'Guardar %{model}' + update: 'Actualizar %{model}' + submit: 'Guardar %{model}' + + # Attributes names common to most models + #attributes: + #created_at: "Created at" + #updated_at: "Updated at" + + # Active Record models configuration + activerecord: + errors: + messages: + taken: "ya está en uso" + record_invalid: "La validación falló: %{errors}" + # Append your own errors here or at the model/attributes scope. + + # You can define own errors for models or model attributes. + # The values :model, :attribute and :value are always available for interpolation. + # + # For example, + # models: + # user: + # blank: "This is a custom blank message for %{model}: %{attribute}" + # attributes: + # login: + # blank: "This is a custom blank message for User login" + # Will define custom blank validation message for User model and + # custom blank validation message for login attribute of User model. + #models: + + # Translate model names. Used in Model.human_name(). + #models: + # For example, + # user: "Dude" + # will translate User model name to "Dude" + + # Translate model attribute names. Used in Model.human_attribute_name(attribute). + #attributes: + # For example, + # user: + # login: "Handle" + # will translate User attribute "login" as "Handle" + + # Active Model + errors: + # The default format to use in full error messages. + format: "%{attribute} %{message}" + + template: + header: + one: "No se pudo guardar este/a %{model} porque se encontró 1 error" + other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" + # The variable :count is also available + body: "Se encontraron problemas con los siguientes campos:" + + # The values :model, :attribute and :value are always available for interpolation + # The value :count is available when applicable. Can be used for pluralization. + messages: + inclusion: "no está incluido en la lista" + exclusion: "está reservado" + invalid: "no es válido" + confirmation: "no coincide con la confirmación" + accepted: "debe ser aceptado" + empty: "no puede estar vacío" + blank: "no puede estar en blanco" + too_long: "es demasiado largo (%{count} caracteres máximo)" + too_short: "es demasiado corto (%{count} caracteres mínimo)" + wrong_length: "no tiene la longitud correcta (%{count} caracteres exactos)" + not_a_number: "no es un número" + greater_than: "debe ser mayor que %{count}" + greater_than_or_equal_to: "debe ser mayor que o igual a %{count}" + equal_to: "debe ser igual a %{count}" + less_than: "debe ser menor que %{count}" + less_than_or_equal_to: "debe ser menor que o igual a %{count}" + odd: "debe ser impar" + even: "debe ser par" + + # Active Support + date: + formats: + # Use the strftime parameters for formats. + # When no format has been given, it uses default. + # You can provide other formats here if you like! + default: "%e/%m/%Y" + short: "%e de %b" + long: "%e de %B de %Y" + + day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado] + abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab] + + # Don't forget the nil at the beginning; there's no such thing as a 0th month + month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] + abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] + # Used in date_select and datime_select. + order: + - :day + - :month + - :year + + time: + formats: + default: "%A, %e de %B de %Y %H:%M:%S %z" + short: "%e de %b %H:%M" + long: "%e de %B de %Y %H:%M" + am: "am" + pm: "pm" + + # Used in array.to_sentence. + support: + array: + words_connector: ", " + two_words_connector: " y " + last_word_connector: ", y " \ No newline at end of file From 541eb5cb956c7ceb1c2270aca49d79390d98a101 Mon Sep 17 00:00:00 2001 From: Etienne Membrives Date: Thu, 16 Sep 2010 14:45:00 -0700 Subject: [PATCH 18/79] Beggining of French localization --- config/locales/fr.yml | 109 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 2 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e47795485..bc13d341d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -3,8 +3,113 @@ # the COPYRIGHT file. -# Sample localization file for English. Add more files in this directory for other locales. +# Localization file for French. Add more files in this directory for other locales. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. fr: - hello: "Bonjour !" + hello: "Bonjour tout le monde" + layouts: + application: + edit_profile: "Éditez votre profil" + logout: "Déconnexion" + shared: + aspect_nav: + all_aspects: "Tous les Aspects" + manage: "Gérez" + manage_your_aspects: "Gérez vos Aspects" + sub_header: + all_aspects: "Tous les Aspects" + manage_aspects: "Gérez vos Aspects" + publisher: + share: "Partager" + aspect_friends: + add_friends: "Ajouter des amis" + albums: + album: + you: "vous" + new_album: + create: "créer" + add_a_new_album: "Ajouter un nouvel album" + show: + edit_album: "Éditer l'album" + albums: "albums" + updated: "mis à jour" + by: "par" + edit: + editing: "Édition" + updated: "mis à jour" + are_you_sure: "Êtes-vous sûr?" + delete_album: "Supprimer l'album" + cancel: "Annuler" + index: + home: "accueil" + new_album: "Nouvel album" + aspects: + index: + photos: "photos" + show: + photos: "photos" + manage: + add_a_new_aspect: "Ajouter un nouvel aspect" + add_a_new_friend: "Ajouter un nouvel amis" + show: "Voir" + update_aspects: "Mettre à jour les aspects" + requests: "Requêtes" + ignore_remove: "Ignorer/Supprimer" + new_aspect: + create: "Créer" + users: + edit: + cancel: "Annuler"" + update_profile: "Mise à jour du profil" + home: "Accueil" + diaspora_username: "NOM D'UTILISATEUR DIASPORA" + info: "Info" + picture: "Photo" + editing_profile: "Édition du profil" + albums: "Albums" + comments: + comment: + ago: "plus tôt" + new_comment: + comment: "Commentaire" + photos: + show: + prev: "précédent + full_size: "taille réelle" + next: "suivant" + edit_photo: "Éditer la photo" + delete_photo: "Supprimer la photo" + are_you_sure: "Êtes-vous sûr?" + comments: "commentaires" + edit: + editing: "Édition" + are_you_sure: "Êtes-vous sûr?" + delete_photo: "Delete Photo" + photo: + show_comments: "show comments" + new: + new_photo: "New Photo" + back_to_list: "Back to List" + post_it: "post it!" + registrations: + new: + sign_up: "Sign up" + status_messages: + new_status_message: + tell_me_something_good: "tell me something good" + oh_yeah: "oh yeah!" + status_message: + show_comments: "show comments" + delete: "Delete" + are_you_sure: "Are you sure?" + show: + status_message: "Status Message" + comments: "comments" + are_you_sure: "Are you sure?" + destroy: "Destroy" + view_all: "View All" + message: "Message" + owner: "Owner" + + From aeedf2fc22058403176375237eb8fdca031b0825 Mon Sep 17 00:00:00 2001 From: Claudius Coenen Date: Thu, 16 Sep 2010 23:55:57 +0200 Subject: [PATCH 19/79] adding german translation --- config/locales/de.yml | 116 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 config/locales/de.yml diff --git a/config/locales/de.yml b/config/locales/de.yml new file mode 100644 index 000000000..23617a3f3 --- /dev/null +++ b/config/locales/de.yml @@ -0,0 +1,116 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +de: + hello: "Hallo Welt" + layouts: + application: + edit_profile: "Profil bearbeiten" + logout: "Ausloggen" + shared: + aspect_nav: + all_aspects: "Alle Aspekte" + manage: "Verwalten" + manage_your_aspects: "Aspekte verwalten" + sub_header: + all_aspects: "Alle Aspekte" + manage_aspects: "Aspekte verwalten" + publisher: + share: "Teilen" + aspect_friends: + add_friends: "Freunde hinzufügen" + albums: + album: + you: "dir" + new_album: + create: "erstellen" + add_a_new_album: "Album hinzufügen" + show: + edit_album: "Album bearbeiten" + albums: "Alben" + updated: "aktualisiert" + by: "von" + edit: + editing: "Bearbeite" + updated: "geändert" + are_you_sure: "Bist du sicher?" + delete_album: "Album löschen" + cancel: "Abbrechen" + index: + home: "Startseite" + new_album: "Neues Album" + aspects: + index: + photos: "Fotos" + show: + photos: "Fotos" + manage: + add_a_new_aspect: "Neuen Aspekt erstellen" + add_a_new_friend: "Freund hinzufügen" + show: "Anzeigen" + update_aspects: "Aspekte aktualisieren" + requests: "Anfragen" + ignore_remove: "Ignorieren/Entfernen" + new_aspect: + create: "Erstellen" + users: + edit: + cancel: "Abbrechen" + update_profile: "Profil aktualisieren" + home: "Startseite" + diaspora_username: "Diaspora Benutzername" + info: "Info" + picture: "Bild" + editing_profile: "Profil bearbeiten" + albums: "Alben" + comments: + comment: + # this won't work in german at all. Needs more thorough I18n + ago: "ago" + new_comment: + comment: "Kommentar" + photos: + show: + prev: "zurück" + full_size: "volle Größe" + next: "vor" + edit_photo: "Foto bearbeiten" + delete_photo: "Foto löschen" + are_you_sure: "Bist du sicher?" + comments: "Kommentare" + edit: + editing: "Bearbeite" + are_you_sure: "Bist du sicher?" + delete_photo: "Foto löschen" + photo: + show_comments: "Kommentare anzeigen" + new: + new_photo: "Foto erstellen" + back_to_list: "Zurück zur Liste" + post_it: "Hochladen" + registrations: + new: + sign_up: "Anmelden" + status_messages: + new_status_message: + tell_me_something_good: "Erzähl' mir was schönes!" + oh_yeah: "Hey, super!" + status_message: + show_comments: "Kommentare anzeigen" + delete: "Löschen" + are_you_sure: "Bist du sicher?" + show: + status_message: "Statusmeldung" + comments: "Kommentare" + are_you_sure: "Bist du sicher?" + destroy: "Löschen" + view_all: "Alle anzeigen" + message: "Nachricht" + owner: "Besitzer" + + From ed54c50f486681b81eaa0aad7a6bd5ce3ec8c580 Mon Sep 17 00:00:00 2001 From: Etienne Membrives Date: Thu, 16 Sep 2010 15:14:05 -0700 Subject: [PATCH 20/79] French localization done --- config/locales/fr.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bc13d341d..72f585409 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -85,31 +85,31 @@ fr: edit: editing: "Édition" are_you_sure: "Êtes-vous sûr?" - delete_photo: "Delete Photo" + delete_photo: "Supprimer la photo" photo: - show_comments: "show comments" + show_comments: "Montrer les commentaires" new: - new_photo: "New Photo" - back_to_list: "Back to List" - post_it: "post it!" + new_photo: "Nouvelle photo" + back_to_list: "Retour à la liste" + post_it: "postez le !" registrations: new: - sign_up: "Sign up" + sign_up: "Enregistrement" status_messages: new_status_message: - tell_me_something_good: "tell me something good" + tell_me_something_good: "Dites quelque-chose de bien" oh_yeah: "oh yeah!" status_message: - show_comments: "show comments" - delete: "Delete" - are_you_sure: "Are you sure?" + show_comments: "Montrer les commentaires" + delete: "Suppression" + are_you_sure: "Êtes-vous sûr ?" show: status_message: "Status Message" - comments: "comments" - are_you_sure: "Are you sure?" - destroy: "Destroy" - view_all: "View All" + comments: "commentaires" + are_you_sure: "Êtes-vous sûr ?" + destroy: "Destruction" + view_all: "Tout voir" message: "Message" - owner: "Owner" + owner: "Propriétaire" From 5197c1b3ec8ea0b9a96d4530a3a551174d158227 Mon Sep 17 00:00:00 2001 From: Claudius Coenen Date: Fri, 17 Sep 2010 00:23:35 +0200 Subject: [PATCH 21/79] adding localisation for controller's flash messages' --- app/controllers/albums_controller.rb | 8 ++++---- config/locales/de.yml | 7 +++++++ config/locales/en.yml | 9 ++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 5a75616d1..1a577f645 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -17,7 +17,7 @@ class AlbumsController < ApplicationController def create aspect = params[:album][:to] @album = current_user.post(:album, params[:album]) - flash[:notice] = "You've created an album called #{@album.name}." + flash[:notice] = I18n.t('albums.create.success', :name => @album.name) redirect_to :action => :show, :id => @album.id, :aspect => aspect end @@ -28,7 +28,7 @@ class AlbumsController < ApplicationController def destroy @album = Album.find_by_id params[:id] @album.destroy - flash[:notice] = "Album #{@album.name} deleted." + flash[:notice] = I18n.t('albums.destroy.success', :name => @album.name) respond_with :location => albums_url end @@ -48,10 +48,10 @@ class AlbumsController < ApplicationController def update @album = Album.find_params_by_id params[:id] if @album.update_attributes params[:album] - flash[:notice] = "Album #{@album.name} successfully edited." + flash[:notice] = I18n.t('albums.update.success', :name => @album.name) respond_with @album else - flash[:error] = "Failed to edit album #{@album.name}." + flash[:error] = I18n.t('albums.update.failure', :name => @album.name) render :action => :edit end end diff --git a/config/locales/de.yml b/config/locales/de.yml index 23617a3f3..c67d87550 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -30,6 +30,8 @@ de: new_album: create: "erstellen" add_a_new_album: "Album hinzufügen" + create: + success: Du hast das Album %{name} erstellt. show: edit_album: "Album bearbeiten" albums: "Alben" @@ -41,9 +43,14 @@ de: are_you_sure: "Bist du sicher?" delete_album: "Album löschen" cancel: "Abbrechen" + update: + success: Album %{name} erfolgreich geändert. + failure: %{name} wurde nicht geändert. index: home: "Startseite" new_album: "Neues Album" + destroy: + success: Album %{name} gelöscht. aspects: index: photos: "Fotos" diff --git a/config/locales/en.yml b/config/locales/en.yml index d9046c00b..87a96b009 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,6 +30,8 @@ en: new_album: create: "create" add_a_new_album: "Add a new album" + create: + success: You've created an album called %{name}. show: edit_album: "Edit Album" albums: "albums" @@ -41,10 +43,15 @@ en: are_you_sure: "Are you sure?" delete_album: "Delete Album" cancel: "Cancel" + update: + success: Album %{name} successfully edited. + failure: Failed to edit album %{name}. index: home: "home" new_album: "New Album" - aspects: + destroy: + success: Album %{name} deleted. + aspects: index: photos: "photos" show: From 07138041b03e3ab674556284e2fe886264ccfd4b Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Thu, 16 Sep 2010 23:35:57 -0400 Subject: [PATCH 22/79] Fixed album controller errors --- app/controllers/albums_controller.rb | 8 +- app/views/users/edit.html.haml | 4 +- config/locales/de.yml | 14 +- config/locales/defaults/es.yml | 264 +++++++++++++++ config/locales/{ => devise}/devise.de.yml | 0 config/locales/{ => devise}/devise.en.yml | 0 config/locales/{ => devise}/devise.es.yml | 0 config/locales/{ => devise}/devise.fr.yml | 0 config/locales/diaspora.en.yml | 115 ------- config/locales/diaspora.es.yml | 114 ------- config/locales/en.yml | 16 +- config/locales/es.yml | 379 +++++++--------------- 12 files changed, 406 insertions(+), 508 deletions(-) create mode 100644 config/locales/defaults/es.yml rename config/locales/{ => devise}/devise.de.yml (100%) rename config/locales/{ => devise}/devise.en.yml (100%) rename config/locales/{ => devise}/devise.es.yml (100%) rename config/locales/{ => devise}/devise.fr.yml (100%) delete mode 100644 config/locales/diaspora.en.yml delete mode 100644 config/locales/diaspora.es.yml diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index a063c0372..117c76afa 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -17,7 +17,7 @@ class AlbumsController < ApplicationController def create aspect = params[:album][:to] @album = current_user.post(:album, params[:album]) - flash[:notice] = I18n.t('albums.create.success', :name => @album.name) + flash[:notice] = I18n.t 'albums.create.success', :name => @album.name redirect_to :action => :show, :id => @album.id, :aspect => aspect end @@ -28,7 +28,7 @@ class AlbumsController < ApplicationController def destroy @album = Album.find_by_id params[:id] @album.destroy - flash[:notice] = I18n.t('albums.destroy.success', :name => @album.name) + flash[:notice] = I18n.t 'albums.destroy.success', :name => @album.name respond_with :location => albums_url end @@ -48,10 +48,10 @@ class AlbumsController < ApplicationController def update @album = Album.find_by_id params[:id] if @album.update_attributes params[:album] - flash[:notice] = I18n.t('albums.update.success', :name => @album.name) + flash[:notice] = I18n.t 'albums.update.success', :name => @album.name respond_with @album else - flash[:error] = I18n.t('albums.update.failure', :name => @album.name) + flash[:error] = I18n.t 'albums.update.failure', :name => @album.name render :action => :edit end end diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 406f95499..42263b230 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -30,9 +30,9 @@ = link_to image_tag(photo.url(:thumb_medium)), "#" - else - You don't have any photos! Go to the + =t('.you_dont_have_any_photos') = link_to t('.albums'), albums_path(:aspect => 'all') - page to upload some. + =t('.page_to_upload_some') =will_paginate @photos diff --git a/config/locales/de.yml b/config/locales/de.yml index c67d87550..5b78d0e68 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -30,8 +30,6 @@ de: new_album: create: "erstellen" add_a_new_album: "Album hinzufügen" - create: - success: Du hast das Album %{name} erstellt. show: edit_album: "Album bearbeiten" albums: "Alben" @@ -43,14 +41,16 @@ de: are_you_sure: "Bist du sicher?" delete_album: "Album löschen" cancel: "Abbrechen" - update: - success: Album %{name} erfolgreich geändert. - failure: %{name} wurde nicht geändert. index: home: "Startseite" new_album: "Neues Album" + create: + success: "Du hast das Album %{name} erstellt." + update: + success: "Album %{name} erfolgreich geändert." + failure: "%{name} wurde nicht geändert." destroy: - success: Album %{name} gelöscht. + success: "Album %{name} gelöscht." aspects: index: photos: "Fotos" @@ -75,6 +75,8 @@ de: picture: "Bild" editing_profile: "Profil bearbeiten" albums: "Alben" + you_dont_have_any_photos: "#TODO" + page_to_upload_some: "#TODO" comments: comment: # this won't work in german at all. Needs more thorough I18n diff --git a/config/locales/defaults/es.yml b/config/locales/defaults/es.yml new file mode 100644 index 000000000..ad1db8794 --- /dev/null +++ b/config/locales/defaults/es.yml @@ -0,0 +1,264 @@ +# Spanish translations for Rails +# by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) + +"es": + # Action View + number: + # Used in number_with_delimiter() + # These are also the defaults for 'currency', 'percentage', 'precision', and 'human' + format: + # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5) + separator: "," + # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three) + delimiter: "." + # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00) + precision: 3 + # If set to true, precision will mean the number of significant digits instead + # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2) + significant: false + # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2) + strip_insignificant_zeros: false + + # Used in number_to_currency() + currency: + format: + # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00) + format: "%n %u" + unit: "€" + # These three are to override number.format and are optional + separator: "," + delimiter: "." + precision: 2 + significant: false + strip_insignificant_zeros: false + + # Used in number_to_percentage() + percentage: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + + # Used in number_to_precision() + precision: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + # precision: + # significant: false + # strip_insignificant_zeros: false + + # Used in number_to_human_size() + human: + format: + # These three are to override number.format and are optional + # separator: + delimiter: "" + precision: 1 + significant: true + strip_insignificant_zeros: true + # Used in number_to_human_size() + storage_units: + format: "%n %u" + units: + byte: + one: "Byte" + other: "Bytes" + kb: "KB" + mb: "MB" + gb: "GB" + tb: "TB" + # Used in number_to_human() + decimal_units: + format: "%n %u" + # Decimal units output formatting + # By default we will only quantify some of the exponents + # but the commented ones might be defined or overridden + # by the user. + units: + # femto: Quadrillionth + # pico: Trillionth + # nano: Billionth + # micro: Millionth + # mili: Thousandth + # centi: Hundredth + # deci: Tenth + unit: "" + # ten: + # one: Ten + # other: Tens + # hundred: Hundred + thousand: "Mil" + million: "Millón" + billion: "Mil millones" + trillion: "Trillón" + quadrillion: "Cuatrillón" + + # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words() + datetime: + distance_in_words: + half_a_minute: "medio minuto" + less_than_x_seconds: + one: "menos de 1 segundo" + other: "menos de %{count} segundos" + x_seconds: + one: "1 segundo" + other: "%{count} segundos" + less_than_x_minutes: + one: "menos de 1 minuto" + other: "menos de %{count} minutos" + x_minutes: + one: "1 minuto" + other: "%{count} minutos" + about_x_hours: + one: "alrededor de 1 hora" + other: "alrededor de %{count} horas" + x_days: + one: "1 día" + other: "%{count} días" + about_x_months: + one: "alrededor de 1 mes" + other: "alrededor de %{count} meses" + x_months: + one: "1 mes" + other: "%{count} meses" + about_x_years: + one: "alrededor de 1 año" + other: "alrededor de %{count} años" + over_x_years: + one: "más de 1 año" + other: "más de %{count} años" + almost_x_years: + one: "casi 1 año" + other: "casi %{count} años" + prompts: + year: "Año" + month: "Mes" + day: "Día" + hour: "Hora" + minute: "Minutos" + second: "Segundos" + + helpers: + select: + # Default value for :prompt => true in FormOptionsHelper + prompt: "Por favor seleccione" + + # Default translation keys for submit FormHelper + submit: + create: 'Guardar %{model}' + update: 'Actualizar %{model}' + submit: 'Guardar %{model}' + + # Attributes names common to most models + #attributes: + #created_at: "Created at" + #updated_at: "Updated at" + + # Active Record models configuration + activerecord: + errors: + messages: + taken: "ya está en uso" + record_invalid: "La validación falló: %{errors}" + # Append your own errors here or at the model/attributes scope. + + # You can define own errors for models or model attributes. + # The values :model, :attribute and :value are always available for interpolation. + # + # For example, + # models: + # user: + # blank: "This is a custom blank message for %{model}: %{attribute}" + # attributes: + # login: + # blank: "This is a custom blank message for User login" + # Will define custom blank validation message for User model and + # custom blank validation message for login attribute of User model. + #models: + + # Translate model names. Used in Model.human_name(). + #models: + # For example, + # user: "Dude" + # will translate User model name to "Dude" + + # Translate model attribute names. Used in Model.human_attribute_name(attribute). + #attributes: + # For example, + # user: + # login: "Handle" + # will translate User attribute "login" as "Handle" + + # Active Model + errors: + # The default format to use in full error messages. + format: "%{attribute} %{message}" + + template: + header: + one: "No se pudo guardar este/a %{model} porque se encontró 1 error" + other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" + # The variable :count is also available + body: "Se encontraron problemas con los siguientes campos:" + + # The values :model, :attribute and :value are always available for interpolation + # The value :count is available when applicable. Can be used for pluralization. + messages: + inclusion: "no está incluido en la lista" + exclusion: "está reservado" + invalid: "no es válido" + confirmation: "no coincide con la confirmación" + accepted: "debe ser aceptado" + empty: "no puede estar vacío" + blank: "no puede estar en blanco" + too_long: "es demasiado largo (%{count} caracteres máximo)" + too_short: "es demasiado corto (%{count} caracteres mínimo)" + wrong_length: "no tiene la longitud correcta (%{count} caracteres exactos)" + not_a_number: "no es un número" + greater_than: "debe ser mayor que %{count}" + greater_than_or_equal_to: "debe ser mayor que o igual a %{count}" + equal_to: "debe ser igual a %{count}" + less_than: "debe ser menor que %{count}" + less_than_or_equal_to: "debe ser menor que o igual a %{count}" + odd: "debe ser impar" + even: "debe ser par" + + # Active Support + date: + formats: + # Use the strftime parameters for formats. + # When no format has been given, it uses default. + # You can provide other formats here if you like! + default: "%e/%m/%Y" + short: "%e de %b" + long: "%e de %B de %Y" + + day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado] + abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab] + + # Don't forget the nil at the beginning; there's no such thing as a 0th month + month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] + abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] + # Used in date_select and datime_select. + order: + - :day + - :month + - :year + + time: + formats: + default: "%A, %e de %B de %Y %H:%M:%S %z" + short: "%e de %b %H:%M" + long: "%e de %B de %Y %H:%M" + am: "am" + pm: "pm" + + # Used in array.to_sentence. + support: + array: + words_connector: ", " + two_words_connector: " y " + last_word_connector: ", y " \ No newline at end of file diff --git a/config/locales/devise.de.yml b/config/locales/devise/devise.de.yml similarity index 100% rename from config/locales/devise.de.yml rename to config/locales/devise/devise.de.yml diff --git a/config/locales/devise.en.yml b/config/locales/devise/devise.en.yml similarity index 100% rename from config/locales/devise.en.yml rename to config/locales/devise/devise.en.yml diff --git a/config/locales/devise.es.yml b/config/locales/devise/devise.es.yml similarity index 100% rename from config/locales/devise.es.yml rename to config/locales/devise/devise.es.yml diff --git a/config/locales/devise.fr.yml b/config/locales/devise/devise.fr.yml similarity index 100% rename from config/locales/devise.fr.yml rename to config/locales/devise/devise.fr.yml diff --git a/config/locales/diaspora.en.yml b/config/locales/diaspora.en.yml deleted file mode 100644 index d9046c00b..000000000 --- a/config/locales/diaspora.en.yml +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. - - -# 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. - -en: - hello: "Hello world" - layouts: - application: - edit_profile: "edit profile" - logout: "logout" - shared: - aspect_nav: - all_aspects: "All Aspects" - manage: "Manage" - manage_your_aspects: "Manage your Aspects" - sub_header: - all_aspects: "All Aspects" - manage_aspects: "Manage Aspects" - publisher: - share: "Share" - aspect_friends: - add_friends: "add friends" - albums: - album: - you: "you" - new_album: - create: "create" - add_a_new_album: "Add a new album" - show: - edit_album: "Edit Album" - albums: "albums" - updated: "updated" - by: "by" - edit: - editing: "Editing" - updated: "updated" - are_you_sure: "Are you sure?" - delete_album: "Delete Album" - cancel: "Cancel" - index: - home: "home" - new_album: "New Album" - aspects: - index: - photos: "photos" - show: - photos: "photos" - manage: - add_a_new_aspect: "Add a new aspect" - add_a_new_friend: "Add a new friend" - show: "Show" - update_aspects: "Update Aspects" - requests: "Requests" - ignore_remove: "Ignore/Remove" - new_aspect: - create: "Create" - users: - edit: - cancel: "Cancel" - update_profile: "Update Profile" - home: "Home" - diaspora_username: "DIASPORA USERNAME" - info: "Info" - picture: "Picture" - editing_profile: "Editing profile" - albums: "Albums" - comments: - comment: - ago: "ago" - new_comment: - comment: "Comment" - photos: - show: - prev: "prev" - full_size: "full size" - next: "next" - edit_photo: "Edit Photo" - delete_photo: "Delete Photo" - are_you_sure: "Are you sure?" - comments: "comments" - edit: - editing: "Editing" - are_you_sure: "Are you sure?" - delete_photo: "Delete Photo" - photo: - show_comments: "show comments" - new: - new_photo: "New Photo" - back_to_list: "Back to List" - post_it: "post it!" - registrations: - new: - sign_up: "Sign up" - status_messages: - new_status_message: - tell_me_something_good: "tell me something good" - oh_yeah: "oh yeah!" - status_message: - show_comments: "show comments" - delete: "Delete" - are_you_sure: "Are you sure?" - show: - status_message: "Status Message" - comments: "comments" - are_you_sure: "Are you sure?" - destroy: "Destroy" - view_all: "View All" - message: "Message" - owner: "Owner" - - diff --git a/config/locales/diaspora.es.yml b/config/locales/diaspora.es.yml deleted file mode 100644 index f77e6f54a..000000000 --- a/config/locales/diaspora.es.yml +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. - - -# 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. - - -es: - hello: "Hola Mundo" - layouts: - application: - edit_profile: "editar perfil" - logout: "desloguear" - shared: - aspect_nav: - all_aspects: "All Aspects" - manage: "Manejar" - manage_your_aspects: "Manage your Aspects" - sub_header: - all_aspects: "All Aspects" - manage_aspects: "Manage Aspects" - publisher: - share: "Compartir" - aspect_friends: - add_friends: "Añade amigos" - albums: - album: - you: "usted" - new_album: - create: "Crear" - add_a_new_album: "Añade un nuevo álbum" - show: - edit_album: "Editar Álbum" - albums: "álbumes" - updated: "actualizar" - by: "por" - edit: - editing: "Editando" - updated: "actualizado" - are_you_sure: "Esta seguro?" - delete_album: "Eliminar Album" - cancel: "Cancelar" - index: - home: "home" - new_album: "Nuevo Album" - aspects: - index: - photos: "fotos" - show: - photos: "fotos" - manage: - add_a_new_aspect: "Añadir nuevo aspecto" - add_a_new_friend: "Añadir nuevo amigo" - show: "Mostrar" - update_aspects: "Actualizar Aspectos" - requests: "Requests" - ignore_remove: "Ignorar/Remover" - new_aspect: - create: "Crear" - users: - edit: - cancel: "Cancelar" - update_profile: "Actualizar Perfil" - home: "Home" - diaspora_username: "USUARIO DE DIASPORA" - info: "Info" - picture: "Picture" - editing_profile: "Editando perfil" - albums: "Álbums" - comments: - comment: - ago: "atras" - new_comment: - comment: "Commentario" - photos: - show: - prev: "prev" - full_size: "tamaño actual" - next: "prox" - edit_photo: "Editar Foto" - delete_photo: "Eliminar Foto" - are_you_sure: "Esta seguro?" - comments: "comentarios" - edit: - editing: "Editando" - are_you_sure: "Esta seguro?" - delete_photo: "Eliminar Foto" - photo: - show_comments: "mostrar comentarios" - new: - new_photo: "Nueva Foto" - back_to_list: "Devuelta a la lista" - post_it: "post it!" - registrations: - new: - sign_up: "Registrar" - status_messages: - new_status_message: - tell_me_something_good: "dime algo bueno" - oh_yeah: "oh yeah!" - status_message: - show_comments: "mostrar comentarios" - delete: "Eliminar" - are_you_sure: "Esta seguro?" - show: - status_message: "Mensaje de status" - comments: "comentarios" - are_you_sure: "Esta seguro?" - destroy: "Destruir" - view_all: "Ver Todos" - message: "Mensaje" - owner: "Dueño" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 87a96b009..ff512afc7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,8 +30,6 @@ en: new_album: create: "create" add_a_new_album: "Add a new album" - create: - success: You've created an album called %{name}. show: edit_album: "Edit Album" albums: "albums" @@ -43,15 +41,17 @@ en: are_you_sure: "Are you sure?" delete_album: "Delete Album" cancel: "Cancel" - update: - success: Album %{name} successfully edited. - failure: Failed to edit album %{name}. index: home: "home" new_album: "New Album" + create: + success: "You've created an album called %{name}." + update: + success: "Album %{name} successfully edited." + failure: "Failed to edit album %{name}." destroy: - success: Album %{name} deleted. - aspects: + success: "Album %{name} deleted." + aspects: index: photos: "photos" show: @@ -75,6 +75,8 @@ en: picture: "Picture" editing_profile: "Editing profile" albums: "Albums" + you_dont_have_any_photos: "You don't have any photos! Go to the" + page_to_upload_some: "page to upload some." comments: comment: ago: "ago" diff --git a/config/locales/es.yml b/config/locales/es.yml index ad1db8794..b56353981 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,264 +1,123 @@ -# Spanish translations for Rails -# by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. -"es": - # Action View - number: - # Used in number_with_delimiter() - # These are also the defaults for 'currency', 'percentage', 'precision', and 'human' - format: - # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5) - separator: "," - # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three) - delimiter: "." - # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00) - precision: 3 - # If set to true, precision will mean the number of significant digits instead - # of the number of decimal digits (1234 with precision 2 becomes 1200, 1.23543 becomes 1.2) - significant: false - # If set, the zeros after the decimal separator will always be stripped (eg.: 1.200 will be 1.2) - strip_insignificant_zeros: false - # Used in number_to_currency() - currency: - format: - # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00) - format: "%n %u" - unit: "€" - # These three are to override number.format and are optional - separator: "," - delimiter: "." - precision: 2 - significant: false - strip_insignificant_zeros: false +# 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. - # Used in number_to_percentage() - percentage: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - # precision: - # Used in number_to_precision() - precision: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - # precision: - # significant: false - # strip_insignificant_zeros: false - - # Used in number_to_human_size() - human: - format: - # These three are to override number.format and are optional - # separator: - delimiter: "" - precision: 1 - significant: true - strip_insignificant_zeros: true - # Used in number_to_human_size() - storage_units: - format: "%n %u" - units: - byte: - one: "Byte" - other: "Bytes" - kb: "KB" - mb: "MB" - gb: "GB" - tb: "TB" - # Used in number_to_human() - decimal_units: - format: "%n %u" - # Decimal units output formatting - # By default we will only quantify some of the exponents - # but the commented ones might be defined or overridden - # by the user. - units: - # femto: Quadrillionth - # pico: Trillionth - # nano: Billionth - # micro: Millionth - # mili: Thousandth - # centi: Hundredth - # deci: Tenth - unit: "" - # ten: - # one: Ten - # other: Tens - # hundred: Hundred - thousand: "Mil" - million: "Millón" - billion: "Mil millones" - trillion: "Trillón" - quadrillion: "Cuatrillón" - - # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words() - datetime: - distance_in_words: - half_a_minute: "medio minuto" - less_than_x_seconds: - one: "menos de 1 segundo" - other: "menos de %{count} segundos" - x_seconds: - one: "1 segundo" - other: "%{count} segundos" - less_than_x_minutes: - one: "menos de 1 minuto" - other: "menos de %{count} minutos" - x_minutes: - one: "1 minuto" - other: "%{count} minutos" - about_x_hours: - one: "alrededor de 1 hora" - other: "alrededor de %{count} horas" - x_days: - one: "1 día" - other: "%{count} días" - about_x_months: - one: "alrededor de 1 mes" - other: "alrededor de %{count} meses" - x_months: - one: "1 mes" - other: "%{count} meses" - about_x_years: - one: "alrededor de 1 año" - other: "alrededor de %{count} años" - over_x_years: - one: "más de 1 año" - other: "más de %{count} años" - almost_x_years: - one: "casi 1 año" - other: "casi %{count} años" - prompts: - year: "Año" - month: "Mes" - day: "Día" - hour: "Hora" - minute: "Minutos" - second: "Segundos" - - helpers: - select: - # Default value for :prompt => true in FormOptionsHelper - prompt: "Por favor seleccione" - - # Default translation keys for submit FormHelper - submit: - create: 'Guardar %{model}' - update: 'Actualizar %{model}' - submit: 'Guardar %{model}' - - # Attributes names common to most models - #attributes: - #created_at: "Created at" - #updated_at: "Updated at" - - # Active Record models configuration - activerecord: - errors: - messages: - taken: "ya está en uso" - record_invalid: "La validación falló: %{errors}" - # Append your own errors here or at the model/attributes scope. - - # You can define own errors for models or model attributes. - # The values :model, :attribute and :value are always available for interpolation. - # - # For example, - # models: - # user: - # blank: "This is a custom blank message for %{model}: %{attribute}" - # attributes: - # login: - # blank: "This is a custom blank message for User login" - # Will define custom blank validation message for User model and - # custom blank validation message for login attribute of User model. - #models: - - # Translate model names. Used in Model.human_name(). - #models: - # For example, - # user: "Dude" - # will translate User model name to "Dude" - - # Translate model attribute names. Used in Model.human_attribute_name(attribute). - #attributes: - # For example, - # user: - # login: "Handle" - # will translate User attribute "login" as "Handle" - - # Active Model - errors: - # The default format to use in full error messages. - format: "%{attribute} %{message}" - - template: - header: - one: "No se pudo guardar este/a %{model} porque se encontró 1 error" - other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" - # The variable :count is also available - body: "Se encontraron problemas con los siguientes campos:" - - # The values :model, :attribute and :value are always available for interpolation - # The value :count is available when applicable. Can be used for pluralization. - messages: - inclusion: "no está incluido en la lista" - exclusion: "está reservado" - invalid: "no es válido" - confirmation: "no coincide con la confirmación" - accepted: "debe ser aceptado" - empty: "no puede estar vacío" - blank: "no puede estar en blanco" - too_long: "es demasiado largo (%{count} caracteres máximo)" - too_short: "es demasiado corto (%{count} caracteres mínimo)" - wrong_length: "no tiene la longitud correcta (%{count} caracteres exactos)" - not_a_number: "no es un número" - greater_than: "debe ser mayor que %{count}" - greater_than_or_equal_to: "debe ser mayor que o igual a %{count}" - equal_to: "debe ser igual a %{count}" - less_than: "debe ser menor que %{count}" - less_than_or_equal_to: "debe ser menor que o igual a %{count}" - odd: "debe ser impar" - even: "debe ser par" - - # Active Support - date: - formats: - # Use the strftime parameters for formats. - # When no format has been given, it uses default. - # You can provide other formats here if you like! - default: "%e/%m/%Y" - short: "%e de %b" - long: "%e de %B de %Y" - - day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado] - abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab] - - # Don't forget the nil at the beginning; there's no such thing as a 0th month - month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre] - abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic] - # Used in date_select and datime_select. - order: - - :day - - :month - - :year - - time: - formats: - default: "%A, %e de %B de %Y %H:%M:%S %z" - short: "%e de %b %H:%M" - long: "%e de %B de %Y %H:%M" - am: "am" - pm: "pm" - - # Used in array.to_sentence. - support: - array: - words_connector: ", " - two_words_connector: " y " - last_word_connector: ", y " \ No newline at end of file +es: + hello: "Hola Mundo" + layouts: + application: + edit_profile: "editar perfil" + logout: "desloguear" + shared: + aspect_nav: + all_aspects: "Todo los Aspectos" + manage: "Manejar" + manage_your_aspects: "Maneja tus Aspectos" + sub_header: + all_aspects: "Todo los Aspectos" + manage_aspects: "Manejar Aspectos" + publisher: + share: "Compartir" + aspect_friends: + add_friends: "Añade amigos" + albums: + album: + you: "usted" + new_album: + create: "Crear" + add_a_new_album: "Añade un nuevo álbum" + show: + edit_album: "Editar Álbum" + albums: "álbumes" + updated: "actualizar" + by: "por" + edit: + editing: "Editando" + updated: "actualizado" + are_you_sure: "Esta seguro?" + delete_album: "Eliminar Album" + cancel: "Cancelar" + index: + home: "home" + new_album: "Nuevo Album" + create: + success: "Creo el album llamado %{name}." + update: + success: "Album %{name} fue exitosamente editado." + failure: "Fallo el editar el album %{name}." + destroy: + success: "Album %{name} fue eliminado." + aspects: + index: + photos: "fotos" + show: + photos: "fotos" + manage: + add_a_new_aspect: "Añadir nuevo aspecto" + add_a_new_friend: "Añadir nuevo amigo" + show: "Mostrar" + update_aspects: "Actualizar Aspectos" + requests: "Requests" + ignore_remove: "Ignorar/Remover" + new_aspect: + create: "Crear" + users: + edit: + cancel: "Cancelar" + update_profile: "Actualizar Perfil" + home: "Home" + diaspora_username: "USUARIO DE DIASPORA" + info: "Info" + picture: "Picture" + editing_profile: "Editando perfil" + albums: "Álbums" + you_dont_have_any_photos: "No tienes ninguna foto! ve a la pagina" + page_to_upload_some: "para subir algunas" + comments: + comment: + ago: "atras" + new_comment: + comment: "Commentario" + photos: + show: + prev: "prev" + full_size: "tamaño actual" + next: "prox" + edit_photo: "Editar Foto" + delete_photo: "Eliminar Foto" + are_you_sure: "Esta seguro?" + comments: "comentarios" + edit: + editing: "Editando" + are_you_sure: "Esta seguro?" + delete_photo: "Eliminar Foto" + photo: + show_comments: "mostrar comentarios" + new: + new_photo: "Nueva Foto" + back_to_list: "Devuelta a la lista" + post_it: "post it!" + registrations: + new: + sign_up: "Registrate" + status_messages: + new_status_message: + tell_me_something_good: "dime algo bueno" + oh_yeah: "oh yeah!" + status_message: + show_comments: "mostrar comentarios" + delete: "Eliminar" + are_you_sure: "Esta seguro?" + show: + status_message: "Mensaje de status" + comments: "comentarios" + are_you_sure: "Esta seguro?" + destroy: "Destruir" + view_all: "Ver Todos" + message: "Mensaje" + owner: "Dueño" \ No newline at end of file From c6cdf65fc8879022e7d0e70f39e1790bc4f84911 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 10:26:57 -0400 Subject: [PATCH 23/79] updated local configuration --- config/initializers/locale.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 42f34a3a7..dd607a273 100644 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -4,5 +4,5 @@ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. -I18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] +I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] I18n.default_locale = :en \ No newline at end of file From 375f4f680802240c22e8c884234b10d8f41cf0e0 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 10:43:59 -0400 Subject: [PATCH 24/79] added more translations missing on views --- app/controllers/aspects_controller.rb | 2 +- app/views/aspects/_new_aspect.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index ab144ad12..82c35b36c 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -16,7 +16,7 @@ class AspectsController < ApplicationController def create @aspect = current_user.aspect params[:aspect] - flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect." + flash[:notice] = I18n.t('aspects.create.success') respond_with :location => aspects_manage_path end diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml index 68ce56806..9f0b662dd 100644 --- a/app/views/aspects/_new_aspect.haml +++ b/app/views/aspects/_new_aspect.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. -%h1 Add a new aspect +%h1=t('.add_a_new_aspect') = form_for Aspect.new do |f| = f.error_messages %p From 1384b65565a6461b8329ba114926469ed1cf0258 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 10:46:03 -0400 Subject: [PATCH 25/79] added more translations missing on views --- config/locales/de.yml | 1 + config/locales/en.yml | 3 +++ config/locales/es.yml | 5 ++++- config/locales/fr.yml | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 5b78d0e68..f7a4f0535 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -64,6 +64,7 @@ de: requests: "Anfragen" ignore_remove: "Ignorieren/Entfernen" new_aspect: + add_a_new_aspect: "Neuen Aspekt erstellen" create: "Erstellen" users: edit: diff --git a/config/locales/en.yml b/config/locales/en.yml index ff512afc7..b1b7e98a7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -64,7 +64,10 @@ en: requests: "Requests" ignore_remove: "Ignore/Remove" new_aspect: + add_a_new_aspect: "Add a new aspect" create: "Create" + create: + success:"Click on the plus on the left side to tell Diaspora who can see your new aspect." users: edit: cancel: "Cancel" diff --git a/config/locales/es.yml b/config/locales/es.yml index b56353981..03fefdca4 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -48,7 +48,7 @@ es: create: success: "Creo el album llamado %{name}." update: - success: "Album %{name} fue exitosamente editado." + success: "Album %{name} fue editado exitosamente." failure: "Fallo el editar el album %{name}." destroy: success: "Album %{name} fue eliminado." @@ -65,7 +65,10 @@ es: requests: "Requests" ignore_remove: "Ignorar/Remover" new_aspect: + add_a_new_aspect: "Añadir nuevo aspecto" create: "Crear" + create: + success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto." users: edit: cancel: "Cancelar" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0054c6a33..052819b65 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -58,6 +58,7 @@ fr: requests: "Requêtes" ignore_remove: "Ignorer/Supprimer" new_aspect: + add_a_new_aspect: "Ajouter un nouvel aspect" create: "Créer" users: edit: From c6b34be63deb801fbdd4967b4eb07143070d6d8a Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 11:27:08 -0400 Subject: [PATCH 26/79] Added people views translations --- app/views/people/index.html.haml | 12 ++++++------ app/views/people/new.html.haml | 4 ++-- app/views/people/show.html.haml | 10 +++++----- config/locales/de.yml | 19 +++++++++++++++++-- config/locales/en.yml | 19 +++++++++++++++++-- config/locales/es.yml | 16 +++++++++++++++- config/locales/fr.yml | 17 +++++++++++++++++ 7 files changed, 79 insertions(+), 18 deletions(-) diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index c18ec5d0a..57e46d6df 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -17,8 +17,8 @@ = (@people.count).to_s + search_or_index %table %tr - %th real name - %th diaspora handle + %th=t('.real_name') + %th=t('.diaspora_handle') %th url - for person in @people %tr @@ -34,18 +34,18 @@ - elsif person.id == current_user.person.id %td - %td that's you! + %td=t('.thats_you') -elsif current_user.pending_requests.find_by_person_id(person.id) %td - %td ^-you have a friend request from this person + %td="^-#{t('.you_have_a_friend_request_from_this_person')}" -elsif current_user.pending_requests.find_by_url(person.receive_url) %td - %td friend request pending + %td=t('.friend_request_pending') -else %td %td = form_for Request.new do |f| = f.select(:aspect_id, @aspects_dropdown_array) = f.hidden_field :destination_url, :value => person.diaspora_handle - = f.submit "add friend" + = f.submit t('.add_friend') = will_paginate @people diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml index b2203eb3f..25821ed37 100644 --- a/app/views/people/new.html.haml +++ b/app/views/people/new.html.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. -- title "New Person" +- title=t('.new_person') = form_for @person do |f| = f.error_messages @@ -29,4 +29,4 @@ = f.submit -%p= link_to "Back to List", people_path +%p= link_to t('.back_to_list'), people_path diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 4f76f18cf..93705f15c 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -13,19 +13,19 @@ %ul -unless @posts.first.nil? %li - %i= "last seen: #{how_long_ago(@posts.first)}" + %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) - if @person != current_user.person && current_user.friends.include?(@person) %li - %i= "friends since: #{how_long_ago(@person)}" + %i= t(".friends_since",:how_long_ago => how_long_ago(@person)) %li = form_tag move_friend_path = select :to, :to, @aspects_dropdown_array, :selected => @aspects_with_person.first.id = hidden_field_tag :from, :from, :value => @aspects_with_person.first.id = hidden_field_tag :friend_id, :friend_id, :value => @person.id - = submit_tag "save" + = submit_tag t('.save') - if @person != current_user.person && current_user.friends.include?(@person) - = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button" + = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button" .span-20.last @@ -36,4 +36,4 @@ = render type_partial(post), :post => post unless post.class == Album = will_paginate @posts - else - %h3 no posts to display! + %h3=t('no posts to display!') diff --git a/config/locales/de.yml b/config/locales/de.yml index f7a4f0535..e44d4b788 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -122,5 +122,20 @@ de: view_all: "Alle anzeigen" message: "Nachricht" owner: "Besitzer" - - + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index b1b7e98a7..e68a27763 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -123,5 +123,20 @@ en: view_all: "View All" message: "Message" owner: "Owner" - - + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 03fefdca4..cb8bef6cd 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -123,4 +123,18 @@ es: destroy: "Destruir" view_all: "Ver Todos" message: "Mensaje" - owner: "Dueño" \ No newline at end of file + owner: "Dueño" + people: + index: + add_friend: "añadir amigo" + 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" + 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" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 052819b65..760993177 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -113,3 +113,20 @@ fr: view_all: "Tout voir" message: "Message" owner: "Propriétaire" + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file From 271925a7f61e742f686274bf60028df83fe8f742 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 11:34:45 -0400 Subject: [PATCH 27/79] added photo view translations --- app/views/photos/_photo.haml | 2 +- config/locales/de.yml | 1 + config/locales/en.yml | 1 + config/locales/es.yml | 1 + config/locales/fr.yml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml index 47ddfef3e..ae8829c61 100644 --- a/app/views/photos/_photo.haml +++ b/app/views/photos/_photo.haml @@ -11,7 +11,7 @@ %span.from = link_to post.person.real_name, post.person %b - posted a new photo to + =t('.posted_a_new_photo_to') = link_to post.album.name, object_path(post.album) %br diff --git a/config/locales/de.yml b/config/locales/de.yml index e44d4b788..76f0e7e04 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -99,6 +99,7 @@ de: delete_photo: "Foto löschen" photo: show_comments: "Kommentare anzeigen" + posted_a_new_photo_to: "posted a new photo to" new: new_photo: "Foto erstellen" back_to_list: "Zurück zur Liste" diff --git a/config/locales/en.yml b/config/locales/en.yml index e68a27763..867b120e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -100,6 +100,7 @@ en: delete_photo: "Delete Photo" photo: show_comments: "show comments" + posted_a_new_photo_to: "posted a new photo to" new: new_photo: "New Photo" back_to_list: "Back to List" diff --git a/config/locales/es.yml b/config/locales/es.yml index cb8bef6cd..09eba0837 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -101,6 +101,7 @@ es: 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" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 760993177..75be18e23 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -90,6 +90,7 @@ fr: delete_photo: "Supprimer la photo" photo: show_comments: "Montrer les commentaires" + posted_a_new_photo_to: "posted a new photo to" new: new_photo: "Nouvelle photo" back_to_list: "Retour à la liste" From 001402487084e7c164a400f3c50841d799272019 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 15:26:31 -0400 Subject: [PATCH 28/79] Added I18n translations to helpers --- app/helpers/albums_helper.rb | 8 +++--- app/helpers/application_helper.rb | 4 +-- app/helpers/aspects_helper.rb | 4 +-- app/helpers/dashboards_helper.rb | 2 +- app/helpers/error_messages_helper.rb | 4 +-- app/helpers/people_helper.rb | 4 +-- app/helpers/status_messages_helper.rb | 2 +- config/locales/de.yml | 25 ++++++++++++++++-- config/locales/en.yml | 25 ++++++++++++++++-- config/locales/es.yml | 37 ++++++++++++++++++++++----- config/locales/fr.yml | 23 +++++++++++++++++ 11 files changed, 113 insertions(+), 25 deletions(-) diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb index 50b7fbaf7..9a1e78fd1 100644 --- a/app/helpers/albums_helper.rb +++ b/app/helpers/albums_helper.rb @@ -6,17 +6,17 @@ module AlbumsHelper def friends_albums_link if params[:friends] - "Friends Albums" + I18n.t('albums.helper.friends_albums') else - link_to 'Friends Albums', albums_path({:friends => true}) + link_to I18n.t('albums.helper.friends_albums'), albums_path({:friends => true}) end end def your_albums_link if params[:friends] - link_to 'Your Albums', albums_path + link_to I18n.t('albums.helper.your_albums'), albums_path else - 'Your Albums' + I18n.t('albums.helper.your_albums') end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f2a0a95fd..018d1da7f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -38,7 +38,7 @@ module ApplicationHelper when "Person" person_path(person) else - "unknown person" + I18n.t('application.helper.unknown_person') end end @@ -62,7 +62,7 @@ module ApplicationHelper end def new_request(request_count) - "new_requests" if request_count > 0 + I18n.t('application.helper.new_requests') if request_count > 0 end def post_yield_tag(post) diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb index 1c8f69b8a..536bb8b0b 100644 --- a/app/helpers/aspects_helper.rb +++ b/app/helpers/aspects_helper.rb @@ -10,9 +10,9 @@ module AspectsHelper def remove_link( aspect ) if aspect.people.size == 0 - link_to "remove", aspect, :method => :delete + link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete else - "remove" + "#{I18n.t('aspects.helper.remove')}" end end end diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb index 542d938ee..5f6abe8e9 100644 --- a/app/helpers/dashboards_helper.rb +++ b/app/helpers/dashboards_helper.rb @@ -6,6 +6,6 @@ module DashboardsHelper def title_for_page - 'home' + I18n.t('dashboards.helper.home') end end diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb index 699070b70..274d60edf 100644 --- a/app/helpers/error_messages_helper.rb +++ b/app/helpers/error_messages_helper.rb @@ -7,8 +7,8 @@ module ErrorMessagesHelper # Render error messages for the given objects. The :message and :header_message options are allowed. def error_messages_for(*objects) options = objects.extract_options! - options[:header_message] ||= "Invalid Fields" - options[:message] ||= "Correct the following errors and try again." + options[:header_message] ||= I18n.t('error_messages.helper.invalid_fields') + options[:message] ||= I18n.t('error_messages.helper.correct_the_following_errors_and_try_again') messages = objects.compact.map { |o| o.errors.full_messages }.flatten unless messages.empty? content_tag(:div, :class => "error_messages") do diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb index 37d18d20f..90ffb517d 100644 --- a/app/helpers/people_helper.rb +++ b/app/helpers/people_helper.rb @@ -7,9 +7,9 @@ module PeopleHelper def search_or_index if params[:q] - " results for #{params[:q]}" + I18n.t 'people.helper.results_for',:params => params[:q] else - " people on pod is aware of" + I18n.t "people.helper.people_on_pod_are_aware_of" end end diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb index ff6c2674a..7c1322762 100644 --- a/app/helpers/status_messages_helper.rb +++ b/app/helpers/status_messages_helper.rb @@ -8,7 +8,7 @@ module StatusMessagesHelper unless @latest_status_message.nil? return @latest_status_message.message else - return "No message to display." + return I18n.t('status_messages.helper.no_message_to_display') end end end diff --git a/config/locales/de.yml b/config/locales/de.yml index f7a4f0535..f5aa4d55c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -8,6 +8,21 @@ de: hello: "Hallo Welt" + application: + helper: + unknown_person: "unknown person" + new_requests: "new requests" + dashboards: + helper: + home: "home" + error_messages: + helper: + invalid_fields: "Invalid Fields" + correct_the_following_errors_and_try_again: "Correct the following errors and try again." + people: + helper: + results_for: " resultados para %{params}" + people_on_pod_are_aware_of: " gente en pod estan al tanto de " layouts: application: edit_profile: "Profil bearbeiten" @@ -51,6 +66,9 @@ de: failure: "%{name} wurde nicht geändert." destroy: success: "Album %{name} gelöscht." + helper: + friends_albums: "Friends Albums" + your_albums: "Your Albums" aspects: index: photos: "Fotos" @@ -66,6 +84,9 @@ de: new_aspect: add_a_new_aspect: "Neuen Aspekt erstellen" create: "Erstellen" + helper: + remove: "remove" + aspect_not_empty: "Aspect not empty" users: edit: cancel: "Abbrechen" @@ -122,5 +143,5 @@ de: view_all: "Alle anzeigen" message: "Nachricht" owner: "Besitzer" - - + helper: + no_message_to_display: "No message to display." \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index b1b7e98a7..9c6fd7f09 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -8,6 +8,21 @@ en: hello: "Hello world" + application: + helper: + unknown_person: "unknown person" + new_requests: "new requests" + dashboards: + helper: + home: "home" + error_messages: + helper: + invalid_fields: "Invalid Fields" + correct_the_following_errors_and_try_again: "Correct the following errors and try again." + people: + helper: + results_for: " results for %{params}" + people_on_pod_are_aware_of: " people on pod are aware of" layouts: application: edit_profile: "edit profile" @@ -51,6 +66,9 @@ en: failure: "Failed to edit album %{name}." destroy: success: "Album %{name} deleted." + helper: + friends_albums: "Friends Albums" + your_albums: "Your Albums" aspects: index: photos: "photos" @@ -68,6 +86,9 @@ en: create: "Create" create: success:"Click on the plus on the left side to tell Diaspora who can see your new aspect." + helper: + remove: "remove" + aspect_not_empty: "Aspect not empty" users: edit: cancel: "Cancel" @@ -123,5 +144,5 @@ en: view_all: "View All" message: "Message" owner: "Owner" - - + helper: + no_message_to_display: "No message to display." \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 03fefdca4..cad5c187e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -9,6 +9,21 @@ es: hello: "Hola Mundo" + application: + helper: + unknown_person: "persona desconocida" + new_requests: "nuevas peticiones" + dashboards: + helper: + home: "home" + error_messages: + helper: + invalid_fields: "Campos Invalidos" + correct_the_following_errors_and_try_again: "Corrija los siguentes errores y trate de nuevo." + people: + helper: + results_for: " resultados para %{params}" + people_on_pod_are_aware_of: " gente en pod estan al tanto de " layouts: application: edit_profile: "editar perfil" @@ -40,18 +55,21 @@ es: editing: "Editando" updated: "actualizado" are_you_sure: "Esta seguro?" - delete_album: "Eliminar Album" + delete_album: "Eliminar Álbum" cancel: "Cancelar" index: home: "home" - new_album: "Nuevo Album" + new_album: "Nuevo Álbum" create: - success: "Creo el album llamado %{name}." + success: "Creo el álbum llamado %{name}." update: - success: "Album %{name} fue editado exitosamente." - failure: "Fallo el editar el album %{name}." + success: "Álbum %{name} fue editado exitosamente." + failure: "Fallo el editar el álbum %{name}." destroy: - success: "Album %{name} fue eliminado." + success: "Álbum %{name} fue eliminado." + helper: + friends_albums: "Álbumes de amigos" + your_albums: "Tus Álbumes" aspects: index: photos: "fotos" @@ -69,6 +87,9 @@ es: create: "Crear" create: success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto." + helper: + remove: "remover" + aspect_not_empty: "Aspecto no esta vacio" users: edit: cancel: "Cancelar" @@ -123,4 +144,6 @@ es: destroy: "Destruir" view_all: "Ver Todos" message: "Mensaje" - owner: "Dueño" \ No newline at end of file + owner: "Dueño" + helper: + no_message_to_display: "No hay mensajes que mostrar." \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 052819b65..600b3f038 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -9,6 +9,21 @@ fr: hello: "Bonjour tout le monde" + application: + helper: + unknown_person: "unknown person" + new_requests: "new requests" + dashboards: + helper: + home: "home" + error_messages: + helper: + invalid_fields: "Invalid Fields" + correct_the_following_errors_and_try_again: "Correct the following errors and try again." + people: + helper: + results_for: " resultados para %{params}" + people_on_pod_are_aware_of: " gente en pod estan al tanto de " layouts: application: edit_profile: "Éditez votre profil" @@ -45,6 +60,9 @@ fr: index: home: "accueil" new_album: "Nouvel album" + helper: + friends_albums: "Friends Albums" + your_albums: "Your Albums" aspects: index: photos: "photos" @@ -60,6 +78,9 @@ fr: new_aspect: add_a_new_aspect: "Ajouter un nouvel aspect" create: "Créer" + helper: + remove: "remove" + aspect_not_empty: "Aspect not empty" users: edit: cancel: "Annuler" @@ -113,3 +134,5 @@ fr: view_all: "Tout voir" message: "Message" owner: "Propriétaire" + helper: + no_message_to_display: "No message to display." \ No newline at end of file From f95cebcb8bbfa3aba5ad4957de166fa94f081486 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 16:38:50 -0400 Subject: [PATCH 29/79] Added translations to new requests view and aspects controller --- app/controllers/aspects_controller.rb | 14 +++++++------- app/views/requests/_new_request.haml | 8 ++++---- config/locales/de.yml | 12 ++++++++++++ config/locales/en.yml | 18 +++++++++++++++++- config/locales/es.yml | 16 ++++++++++++++++ config/locales/fr.yml | 12 ++++++++++++ 6 files changed, 68 insertions(+), 12 deletions(-) diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index 82c35b36c..5d572742a 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -29,7 +29,7 @@ class AspectsController < ApplicationController begin current_user.drop_aspect @aspect - flash[:notice] = "#{@aspect.name} was successfully removed." + flash[:notice] = i18n.t 'aspects.destroy.success',:name => @aspect.name rescue RuntimeError => e flash[:error] = e.message end @@ -53,7 +53,7 @@ class AspectsController < ApplicationController def update @aspect = Aspect.find_by_id(params[:id]) @aspect.update_attributes(params[:aspect]) - flash[:notice] = "Your aspect, #{@aspect.name}, has been successfully edited." + flash[:notice] = i18n.t 'aspects.update.success',:name => @aspect.name respond_with @aspect end @@ -61,25 +61,25 @@ class AspectsController < ApplicationController params[:moves].each{ |move| move = move[1] unless current_user.move_friend(move) - flash[:error] = "Aspect editing failed for friend #{Person.find_by_id( move[:friend_id] ).real_name}." + flash[:error] = i18n.t 'aspects.move_friends.failure', :real_name => Person.find_by_id( move[:friend_id] ).real_name redirect_to Aspect.first, :action => "edit" return end } - flash[:notice] = "Aspects edited successfully." + flash[:notice] = i18n.t 'aspects.move_friends.success' redirect_to Aspect.first, :action => "edit" end def move_friend unless current_user.move_friend( :friend_id => params[:friend_id], :from => params[:from], :to => params[:to][:to]) - flash[:error] = "didn't work #{params.inspect}" + flash[:error] = I18n.t 'aspects.move_friend.error',:inspect => params.inspect end if aspect = Aspect.first(:id => params[:to][:to]) - flash[:notice] = "You are now showing your friend a different aspect of yourself." + flash[:notice] = I18n.t 'aspects.move_friend.notice' respond_with aspect else - flash[:notice] = "You are now showing your friend a different aspect of yourself." + flash[:notice] = I18n.t 'aspects.move_friend.notice' respond_with Person.first(:id => params[:friend_id]) end end diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml index b7e5819f6..70c204e7c 100644 --- a/app/views/requests/_new_request.haml +++ b/app/views/requests/_new_request.haml @@ -4,18 +4,18 @@ %h1 - Add a new friend to + =t('.add_a_new_friend_to') %i= aspect.name = form_for Request.new do |f| = f.error_messages - Enter a Diaspora username: + =t('.enter_a_diaspora_username') %br - %i= "Your Diaspora username is: #{current_user.diaspora_handle}" + %i= t '.your_diaspora_username_is', :diaspora_handle => current_user.diaspora_handle %p - = f.label :destination_url, "Friend's username" + = f.label :destination_url, t(".friends_username") = f.text_field :destination_url = f.hidden_field :aspect_id, :value => aspect.id = f.submit diff --git a/config/locales/de.yml b/config/locales/de.yml index 06fb5e6cb..07ff690d7 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -84,6 +84,18 @@ de: new_aspect: add_a_new_aspect: "Neuen Aspekt erstellen" create: "Erstellen" + create: + success: "Click on the plus on the left side to tell Diaspora who can see your new aspect." + destroy: + success: "%{name} was successfully removed." + update: + success: "Your aspect, %{name}, has been successfully edited." + move_friends: + failure: "Aspect editing failed for friend %{real_name}." + success: "Aspects edited successfully." + move_friend: + error: "didn't work %{inspect}" + notice: "You are now showing your friend a different aspect of yourself." helper: remove: "remove" aspect_not_empty: "Aspect not empty" diff --git a/config/locales/en.yml b/config/locales/en.yml index f4dc9d076..cd8055775 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -85,7 +85,17 @@ en: add_a_new_aspect: "Add a new aspect" create: "Create" create: - success:"Click on the plus on the left side to tell Diaspora who can see your new aspect." + success: "Click on the plus on the left side to tell Diaspora who can see your new aspect." + destroy: + success: "%{name} was successfully removed." + update: + success: "Your aspect, %{name}, has been successfully edited." + move_friends: + failure: "Aspect editing failed for friend %{real_name}." + success: "Aspects edited successfully." + move_friend: + error: "didn't work %{inspect}" + notice: "You are now showing your friend a different aspect of yourself." helper: remove: "remove" aspect_not_empty: "Aspect not empty" @@ -164,3 +174,9 @@ en: save: "save" are_you_sure: "Are you sure?" remove_friend: "remove friend" + requests: + new_request: + add_a_new_friend_to: "Add a new friend to" + enter_a_diaspora_username: "Enter a Diaspora username:" + your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}" + friends_username: "Friend's username" diff --git a/config/locales/es.yml b/config/locales/es.yml index 7243c73a5..b9c11e4a6 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -87,6 +87,16 @@ es: create: "Crear" create: success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto." + destroy: + success: "%{name} fue removido 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." + move_friend: + error: "no funciono %{inspect}" + notice: "Ahora estas mostrando a tu amigo un aspecto diferente de ti." helper: remove: "remover" aspect_not_empty: "Aspecto no esta vacio" @@ -162,3 +172,9 @@ es: save: "guardar" are_you_sure: "Esta seguro?" remove_friend: "remover 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" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0384d4577..7d58cd4aa 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -78,6 +78,18 @@ fr: new_aspect: add_a_new_aspect: "Ajouter un nouvel aspect" create: "Créer" + create: + success: "Click on the plus on the left side to tell Diaspora who can see your new aspect." + destroy: + success: "%{name} was successfully removed." + update: + success: "Your aspect, %{name}, has been successfully edited." + move_friends: + failure: "Aspect editing failed for friend %{real_name}." + success: "Aspects edited successfully." + move_friend: + error: "didn't work %{inspect}" + notice: "You are now showing your friend a different aspect of yourself." helper: remove: "remove" aspect_not_empty: "Aspect not empty" From c1c20e14f7573fc72917570862161b98995c39d4 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 17:05:54 -0400 Subject: [PATCH 30/79] Added translations to requests controller --- app/controllers/requests_controller.rb | 14 +++++++------- config/locales/de.yml | 9 +++++++++ config/locales/en.yml | 9 +++++++++ config/locales/es.yml | 13 +++++++++++-- config/locales/fr.yml | 10 ++++++++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 6087ebe85..2586592c2 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -13,15 +13,15 @@ class RequestsController < ApplicationController if params[:accept] if params[:aspect_id] @friend = current_user.accept_and_respond( params[:id], params[:aspect_id]) - flash[:notice] = "You are now friends." + flash[:notice] = I18n.t 'requests.destroy.success' respond_with :location => current_user.aspect_by_id(params[:aspect_id]) else - flash[:error] = "Please select an aspect!" + flash[:error] = I18n.t 'requests.destroy.error' respond_with :location => requests_url end else current_user.ignore_friend_request params[:id] - flash[:notice] = "Ignored friend request." + flash[:notice] = I18n.t 'requests.destroy.ignore' respond_with :location => requests_url end end @@ -37,7 +37,7 @@ class RequestsController < ApplicationController rel_hash = relationship_flow(params[:request][:destination_url]) rescue Exception => e raise e unless e.message.include? "not found" - flash[:error] = "No diaspora seed found with this email!" + flash[:error] = I18n.t 'requests.create.error' respond_with :location => aspect return end @@ -48,16 +48,16 @@ class RequestsController < ApplicationController @request = current_user.send_friend_request_to(rel_hash[:friend], aspect) rescue Exception => e raise e unless e.message.include? "already friends" - flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!" + flash[:notice] = I18n.t 'requests.create.already_friends', :destination_url => params[:request][:destination_url] respond_with :location => aspect return end if @request - flash[:notice] = "A friend request was sent to #{@request.destination_url}." + flash[:notice] = I18n.t 'requests.create.success',:destination_url => @request.destination_url respond_with :location => aspect else - flash[:error] = "Something went horribly wrong." + flash[:error] = I18n.t 'requests.create.horribly_wrong' respond_with :location => aspect end end diff --git a/config/locales/de.yml b/config/locales/de.yml index 07ff690d7..d34e29fe5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -175,3 +175,12 @@ de: save: "save" are_you_sure: "Are you sure?" remove_friend: "remove friend" + destroy: + success: "You are now friends." + error: "Please select an aspect!" + ignore: "Ignored friend request." + create: + error: "No diaspora seed found with this email!" + already_friends: "You are already friends with %{destination_url}!" + success: "A friend request was sent to %{destination_url}." + horribly_wrong: "Something went horribly wrong." diff --git a/config/locales/en.yml b/config/locales/en.yml index cd8055775..5c9e797ad 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -180,3 +180,12 @@ en: enter_a_diaspora_username: "Enter a Diaspora username:" your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}" friends_username: "Friend's username" + destroy: + success: "You are now friends." + error: "Please select an aspect!" + ignore: "Ignored friend request." + create: + error: "No diaspora seed found with this email!" + already_friends: "You are already friends with %{destination_url}!" + success: "A friend request was sent to %{destination_url}." + horribly_wrong: "Something went horribly wrong." diff --git a/config/locales/es.yml b/config/locales/es.yml index b9c11e4a6..524633310 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -30,11 +30,11 @@ es: logout: "desloguear" shared: aspect_nav: - all_aspects: "Todo los Aspectos" + all_aspects: "Todos los Aspectos" manage: "Manejar" manage_your_aspects: "Maneja tus Aspectos" sub_header: - all_aspects: "Todo los Aspectos" + all_aspects: "Todos los Aspectos" manage_aspects: "Manejar Aspectos" publisher: share: "Compartir" @@ -178,3 +178,12 @@ es: 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" + destroy: + success: "Ahora son amigos." + error: "Seleccione un aspecto!" + ignore: "Ignorar peticion de amistad" + create: + 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" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 7d58cd4aa..383e136e5 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -166,3 +166,13 @@ fr: save: "save" are_you_sure: "Are you sure?" remove_friend: "remove friend" + destroy: + success: "You are now friends." + error: "Please select an aspect!" + ignore: "Ignored friend request." + create: + error: "No diaspora seed found with this email!" + already_friends: "You are already friends with %{destination_url}!" + success: "A friend request was sent to %{destination_url}." + horribly_wrong: "Something went horribly wrong." + From 4558f9901efe2408e49c8e8ae667b2b715da6dff Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Fri, 17 Sep 2010 18:25:36 -0400 Subject: [PATCH 31/79] Added translations to photos and registrations controllers --- app/controllers/photos_controller.rb | 12 ++++++------ app/controllers/registrations_controller.rb | 2 +- config/locales/de.yml | 11 +++++++++++ config/locales/en.yml | 11 +++++++++++ config/locales/es.yml | 11 +++++++++++ config/locales/fr.yml | 11 +++++++++++ 6 files changed, 51 insertions(+), 7 deletions(-) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index cefc8f5d6..203a748f6 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -40,15 +40,15 @@ class PhotosController < ApplicationController end rescue TypeError - message = "Photo upload failed. Are you sure an image was added?" + message = I18n.t 'photos.create.type_error' respond_with :location => album, :error => message rescue CarrierWave::IntegrityError - message = "Photo upload failed. Are you sure that was an image?" + message = I18n.t 'photos.create.integrity_error' respond_with :location => album, :error => message rescue RuntimeError => e - message = "Photo upload failed. Are you sure that your seatbelt is fastened?" + message = I18n.t 'photos.create.runtime_error' respond_with :location => album, :error => message raise e end @@ -63,7 +63,7 @@ class PhotosController < ApplicationController def destroy @photo = Photo.find_by_id params[:id] @photo.destroy - flash[:notice] = "Photo deleted." + flash[:notice] = I18n.t 'photos.destroy.notice' respond_with :location => @photo.album end @@ -84,10 +84,10 @@ class PhotosController < ApplicationController def update @photo = Photo.find_by_id params[:id] if @photo.update_attributes params[:photo] - flash[:notice] = "Photo successfully updated." + flash[:notice] = I18n.t 'photos.update.notice' respond_with @photo else - flash[:error] = "Failed to edit photo." + flash[:error] = I18n.t 'photos.update.error' render :action => :edit end end diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 8241aa294..854f19e1a 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -16,7 +16,7 @@ class RegistrationsController < Devise::RegistrationsController end if user #set_flash_message :notice, :signed_up - flash[:notice] = "You've joined Diaspora!" + flash[:notice] = I18n.t 'registrations.create.success' #redirect_to root_url sign_in_and_redirect(:user, user) else diff --git a/config/locales/de.yml b/config/locales/de.yml index d34e29fe5..aabe057cd 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -137,9 +137,20 @@ de: new_photo: "Foto erstellen" back_to_list: "Zurück zur Liste" post_it: "Hochladen" + 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?" + update: + notice: "Photo successfully updated." + error: "Failed to edit photo." + destroy: + notice: "Photo deleted." registrations: new: sign_up: "Anmelden" + create: + success: "You've joined Diaspora!" status_messages: new_status_message: tell_me_something_good: "Erzähl' mir was schönes!" diff --git a/config/locales/en.yml b/config/locales/en.yml index 5c9e797ad..3a416b54f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -136,9 +136,20 @@ en: new_photo: "New Photo" back_to_list: "Back to List" 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?" + update: + notice: "Photo successfully updated." + error: "Failed to edit photo." + destroy: + notice: "Photo deleted." registrations: new: sign_up: "Sign up" + create: + success: "You've joined Diaspora!" status_messages: new_status_message: tell_me_something_good: "tell me something good" diff --git a/config/locales/es.yml b/config/locales/es.yml index 524633310..de2617886 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -137,9 +137,20 @@ es: new_photo: "Nueva Foto" back_to_list: "Devuelta 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?" + update: + notice: "Photo successfully updated." + error: "Failed to edit photo." + destroy: + notice: "Photo deleted." registrations: new: sign_up: "Registrate" + create: + success: "Esta registrado en Diaspora!" status_messages: new_status_message: tell_me_something_good: "dime algo bueno" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 383e136e5..9a0ac8d22 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -128,9 +128,20 @@ fr: new_photo: "Nouvelle photo" back_to_list: "Retour à la liste" post_it: "postez le !" + 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?" + update: + notice: "Photo successfully updated." + error: "Failed to edit photo." + destroy: + notice: "Photo deleted." registrations: new: sign_up: "Enregistrement" + create: + success: "You've joined Diaspora!" status_messages: new_status_message: tell_me_something_good: "Dites quelque-chose de bien" From 08bdaf7340875cc0539d677da32c0a401672926b Mon Sep 17 00:00:00 2001 From: Mikhail Zubrov Date: Sat, 18 Sep 2010 09:58:29 +0400 Subject: [PATCH 32/79] add a Russian translation --- config/locales/devise.ru.yml | 41 ++++++++++++++++++++++++++++++++++++ config/locales/ru.yml | 10 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 config/locales/devise.ru.yml create mode 100644 config/locales/ru.yml diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml new file mode 100644 index 000000000..0e9b7b92f --- /dev/null +++ b/config/locales/devise.ru.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +en: + errors: + messages: + not_found: "не найден(о)" + already_confirmed: "уже подтвержден(о)" + not_locked: "не заблокирован(о)" + + devise: + failure: + unauthenticated: 'Вам нужно войти либо зарегистрироваться, чтобы продолжить.' + unconfirmed: 'Вам нужно подтвердить вашу учётную запись, чтобы продолжить.' + locked: 'Ваша учётная запись заблокирована.' + invalid: 'Неверный e-mail или пароль.' + invalid_token: 'Неверный ключ аутентификации.' + timeout: 'Срок вашего сеанса истёк, пожалуйста, войдите в систему снова.' + inactive: 'Ваша учётная запись ещё не активирована.' + sessions: + signed_in: 'Вход в систему выполнен успешно.' + signed_out: 'Выход из системы выполнен успешно.' + passwords: + send_instructions: 'Вы получите e-mail с указаниями по сбросу пароля в течение нескольких минут.' + updated: 'Ваш пароль был изменён. Вы вошли в систему.' + confirmations: + send_instructions: 'Вы получите e-mail с указаниями по подтверждению учётной записи в течение нескольких минут.' + confirmed: 'Ваша учётная запись была подтверждена. Вы вошли в систему.' + registrations: + signed_up: 'Регистрация выполнена успешно. В зависимости от настроек, вам может прийти e-mail с подтверждением.' + updated: 'Обновление вашей учётной записи выполнено успешно.' + destroyed: 'До свидания! Ваша учётная запись была удалена. Надеемся, что вскоре вас увидим снова.' + unlocks: + send_instructions: 'Вы получите e-mail с указаниями по разблокированию учётной записи в течение нескольких минут.' + unlocked: 'Ваша учётная запись была разблокирована. Вы вошли в систему.' + mailer: + confirmation_instructions: 'Подтверждение учётной записи' + reset_password_instructions: 'Сброс пароля' + unlock_instructions: 'Разблокирование учётной записи' diff --git a/config/locales/ru.yml b/config/locales/ru.yml new file mode 100644 index 000000000..1a8e7fc4e --- /dev/null +++ b/config/locales/ru.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +en: + hello: "Привет, мир" From 7e20f4242220f25ab987b751334531bd918d22d8 Mon Sep 17 00:00:00 2001 From: MrBison Date: Sat, 18 Sep 2010 02:18:07 -0700 Subject: [PATCH 33/79] oops, a stupid error. --- config/locales/devise.ru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml index 0e9b7b92f..670d57026 100644 --- a/config/locales/devise.ru.yml +++ b/config/locales/devise.ru.yml @@ -3,7 +3,7 @@ # the COPYRIGHT file. -en: +ru: errors: messages: not_found: "не найден(о)" From a049cabc2d15ab853cfb533bfd1b8dc37ad82316 Mon Sep 17 00:00:00 2001 From: MrBison Date: Sat, 18 Sep 2010 02:18:35 -0700 Subject: [PATCH 34/79] oops, a stupid error fixed --- config/locales/ru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 1a8e7fc4e..fe944aa59 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -6,5 +6,5 @@ # 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. -en: +ru: hello: "Привет, мир" From 32957658ba6c3dc443492923c08509cf2e2e846e Mon Sep 17 00:00:00 2001 From: Darkmagister Date: Sat, 18 Sep 2010 12:04:35 +0200 Subject: [PATCH 35/79] adding Italian locale --- config/locales/devise.it.yml | 41 ++++++++++++++++++++++++++++++++++++ config/locales/it.yml | 10 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 config/locales/devise.it.yml create mode 100644 config/locales/it.yml diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml new file mode 100644 index 000000000..9b0fb0957 --- /dev/null +++ b/config/locales/devise.it.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +it: + errors: + messages: + not_found: "non trovato" + already_confirmed: "già confermato" + not_locked: "non bloccato" + + devise: + failure: + unauthenticated: 'È necessario che tu acceda o ti registri prima di continuare.' + unconfirmed: 'Devi confermare il tuo account prima di continuare.' + locked: 'Il tuo account è bloccato.' + invalid: 'Email o password invalida.' + invalid_token: 'Invalido token di autenticazione.' + timeout: 'La tua sessione è scaduta, per favore accedi nuovamente per continuare.' + inactive: 'Il tuo account non è ancora stato attivato.' + sessions: + signed_in: 'Collegamento avvenuto con successo.' + signed_out: 'Uscita avvenuta con successo.' + passwords: + send_instructions: 'Tra quale minuto riceverai una email con le istruzioni per ripristinare la password.' + updated: 'La tua password è stata cambiata con successo. Ora sei collegato.' + confirmations: + send_instructions: 'Tra qualche minuti riceverai una email con le istruzioni per confermare il tuo account.' + confirmed: 'Il tuo account è stato confermato con successo. Ora sei collegato.' + registrations: + signed_up: 'Ti sei registrato con successo. Se abilitato, ti verrà inviata una email di conferma.' + updated: 'Hai aggiornato il tuo account.' + destroyed: 'Addio! Il tuo account è stato cancellato. Speriamo di rivederti presto.' + unlocks: + send_instructions: 'Tra qualche minuti riceverai una email con le istruzioni per sbloccare il tuo account.' + unlocked: 'Il tuo account è stato sbloccato. Ora sei collegato.' + mailer: + confirmation_instructions: 'Istruzioni per la conferma' + reset_password_instructions: 'Istruzioni per il reset della password' + unlock_instructions: 'Istruzioni per lo sblocco' diff --git a/config/locales/it.yml b/config/locales/it.yml new file mode 100644 index 000000000..4cce93d73 --- /dev/null +++ b/config/locales/it.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# Sample localization file for Italian. Add more files in this directory for other locales. +# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. + +it: + hello: "Ciao Mondo" From 99651408740fdffe3952552d00fac8ec915f90ac Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Sat, 18 Sep 2010 13:32:17 +0200 Subject: [PATCH 36/79] Translated devise.en.yml --- config/locales/devise.pl.yml | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 config/locales/devise.pl.yml diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml new file mode 100644 index 000000000..ec9f44220 --- /dev/null +++ b/config/locales/devise.pl.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +en: + errors: + messages: + not_found: "nie znaleziono" + already_confirmed: "potwierdzono wcześniej" + not_locked: "nie był zablokowany" + + devise: + failure: + unauthenticated: 'By kontynuować musisz się zalogować lub zarejestrować.' + unconfirmed: 'Musisz aktywować swoje konto.' + locked: 'Twoje konto jest zablokowane.' + invalid: 'Nieprawidłowy adres email lub hasło.' + invalid_token: 'Nieprawidłowy kod identyfikacyjny.' + timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.' + inactive: 'Twoje konto nie zostało jeszcze aktywowane.' + sessions: + signed_in: 'Zalogowano pomyślnie.' + signed_out: 'Wylogowano.' + passwords: + send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła.' + updated: 'Twoje hasło zostało zmienione, zostałeś zalogowany.' + confirmations: + send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcje dotyczące aktywacji konta.' + confirmed: 'Twoje konto zostało aktywowane, zostałeś zalogowany.' + registrations: + signed_up: 'Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację.' + updated: 'Pomyślnie zaktualizowano informacje o Twoim koncie.' + destroyed: 'Żegnaj! Twoje konto zostało usunięte.' + unlocks: + send_instructions: 'W ciągu kilku minut otrzymasz email z instrukcjami odblokowania konta.' + unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.' + mailer: + confirmation_instructions: 'Instrukcje aktywacji' + reset_password_instructions: 'Instrukcje zmiany hasła' + unlock_instructions: 'Instrukcje odblokowania' From 0ce90b4b714fa836936bf60b705f1d2c364390c7 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Sat, 18 Sep 2010 13:34:02 +0200 Subject: [PATCH 37/79] Translated en.yml --- config/locales/pl.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 config/locales/pl.yml diff --git a/config/locales/pl.yml b/config/locales/pl.yml new file mode 100644 index 000000000..e31046c29 --- /dev/null +++ b/config/locales/pl.yml @@ -0,0 +1,10 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +en: + hello: "Witaj świecie" From ecadeac86c77ea662c63dcdffba686ba6b5e22dc Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Sat, 18 Sep 2010 14:27:52 +0200 Subject: [PATCH 38/79] fixed translation --- config/locales/devise.pl.yml | 2 +- config/locales/pl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml index ec9f44220..a490a1a39 100644 --- a/config/locales/devise.pl.yml +++ b/config/locales/devise.pl.yml @@ -3,7 +3,7 @@ # the COPYRIGHT file. -en: +pl: errors: messages: not_found: "nie znaleziono" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e31046c29..2052779bd 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -6,5 +6,5 @@ # 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. -en: +pl: hello: "Witaj świecie" From bf98ec38d0271775e5e7aad9e8a6199289e9d82c Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Sat, 18 Sep 2010 11:09:21 -0400 Subject: [PATCH 39/79] Moved devise.pl to devise locale folder --- config/locales/{ => devise}/devise.pl.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/locales/{ => devise}/devise.pl.yml (100%) diff --git a/config/locales/devise.pl.yml b/config/locales/devise/devise.pl.yml similarity index 100% rename from config/locales/devise.pl.yml rename to config/locales/devise/devise.pl.yml From 216cf8ccd77b4d6d4f90c2849bd3df5956d010a0 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Sat, 18 Sep 2010 11:14:39 -0400 Subject: [PATCH 40/79] Moved devise.ru to devise locale folder --- config/locales/{ => devise}/devise.ru.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/locales/{ => devise}/devise.ru.yml (100%) diff --git a/config/locales/devise.ru.yml b/config/locales/devise/devise.ru.yml similarity index 100% rename from config/locales/devise.ru.yml rename to config/locales/devise/devise.ru.yml From f48b8a4748565a8333725069661e7de02ca042d7 Mon Sep 17 00:00:00 2001 From: Ariel Zavala Date: Sat, 18 Sep 2010 11:20:57 -0400 Subject: [PATCH 41/79] Moved devise.it to devise locale folder --- config/locales/{ => devise}/devise.it.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/locales/{ => devise}/devise.it.yml (100%) diff --git a/config/locales/devise.it.yml b/config/locales/devise/devise.it.yml similarity index 100% rename from config/locales/devise.it.yml rename to config/locales/devise/devise.it.yml From c4f420ec594304391f9ea5fa0bfc0afeea30a7ca Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 19 Sep 2010 18:15:36 +0200 Subject: [PATCH 42/79] some corrections from sennewood --- config/locales/devise.de.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 516eebfed..9fe2e5a32 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -17,7 +17,7 @@ de: locked: 'Dein Konto ist gesperrt.' invalid: 'Ungültige E-Mail-Adresse oder Passwort.' invalid_token: 'Ungültiger Authentifizierungstoken.' - timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an, um fortzufahren.' + timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an um fortzufahren.' inactive: 'Dein Konto wurde noch nicht aktiviert.' sessions: signed_in: 'Erfolgreich angemeldet.' @@ -30,7 +30,7 @@ de: confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.' registrations: signed_up: 'Du wurdest erfolgreich registriert. Falls aktiviert, wurde dir eine E-Mail zur Bestätigung geschickt.' - updated: 'Du hast erfolgreich dein Konto aktualisiert.' + updated: 'Dein Konto wurde aktualisiert.' destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.' unlocks: send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.' From 0203b9317b22fa4499b8d7afe35be7876b83e7fe Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Mon, 20 Sep 2010 14:04:09 +0200 Subject: [PATCH 43/79] better translation from sennewood --- config/locales/devise.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 9fe2e5a32..34947cbc2 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -29,7 +29,7 @@ de: send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.' confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.' registrations: - signed_up: 'Du wurdest erfolgreich registriert. Falls aktiviert, wurde dir eine E-Mail zur Bestätigung geschickt.' + signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.' updated: 'Dein Konto wurde aktualisiert.' destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.' unlocks: From c8d3ceae612685675cb4ea0ee5a57f255b74567d Mon Sep 17 00:00:00 2001 From: Michael Kaeufl Date: Mon, 20 Sep 2010 19:40:37 +0200 Subject: [PATCH 44/79] de translation: wieder -> erneut --- config/locales/devise.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 34947cbc2..0119a9214 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -17,7 +17,7 @@ de: locked: 'Dein Konto ist gesperrt.' invalid: 'Ungültige E-Mail-Adresse oder Passwort.' invalid_token: 'Ungültiger Authentifizierungstoken.' - timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an um fortzufahren.' + timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren.' inactive: 'Dein Konto wurde noch nicht aktiviert.' sessions: signed_in: 'Erfolgreich angemeldet.' From 5533f308406edf1e366027b17dd44cefd301c475 Mon Sep 17 00:00:00 2001 From: Michael Kaeufl Date: Mon, 20 Sep 2010 19:41:14 +0200 Subject: [PATCH 45/79] =?UTF-8?q?de=20translation:=20abgemeldet=20->=20gek?= =?UTF-8?q?=C3=BCndigt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/devise.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml index 0119a9214..7c0e0e758 100644 --- a/config/locales/devise.de.yml +++ b/config/locales/devise.de.yml @@ -31,7 +31,7 @@ de: registrations: signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.' updated: 'Dein Konto wurde aktualisiert.' - destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.' + destroyed: 'Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen.' unlocks: send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.' unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.' From 1c79677c7c2dacda94b6c807188063408d4cb094 Mon Sep 17 00:00:00 2001 From: Michael Kaeufl Date: Mon, 20 Sep 2010 21:38:13 +0200 Subject: [PATCH 46/79] some more german translations --- config/locales/de.yml | 58 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index aabe057cd..e052637d8 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -10,15 +10,15 @@ de: hello: "Hallo Welt" application: helper: - unknown_person: "unknown person" - new_requests: "new requests" + unknown_person: "unbekannte Person" + new_requests: "neue Anfrage" dashboards: helper: home: "home" error_messages: helper: - invalid_fields: "Invalid Fields" - correct_the_following_errors_and_try_again: "Correct the following errors and try again." + invalid_fields: "Ungültige Felder" + correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probier es erneut." people: helper: results_for: " resultados para %{params}" @@ -67,8 +67,8 @@ de: destroy: success: "Album %{name} gelöscht." helper: - friends_albums: "Friends Albums" - your_albums: "Your Albums" + friends_albums: "Alben von Freunden" + your_albums: "Deine Alben" aspects: index: photos: "Fotos" @@ -85,20 +85,20 @@ de: add_a_new_aspect: "Neuen Aspekt erstellen" create: "Erstellen" create: - success: "Click on the plus on the left side to tell Diaspora who can see your new aspect." + success: "Klicke auf das Plus auf der rechten Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann." destroy: - success: "%{name} was successfully removed." + success: "%{name} wurde erfolgreich gelöscht." update: - success: "Your aspect, %{name}, has been successfully edited." + success: "Dein Aspekt, %{name}, wurde erfolgreich geändert." move_friends: failure: "Aspect editing failed for friend %{real_name}." - success: "Aspects edited successfully." + success: "Aspekt erfolgreich geändert." move_friend: error: "didn't work %{inspect}" notice: "You are now showing your friend a different aspect of yourself." helper: remove: "remove" - aspect_not_empty: "Aspect not empty" + aspect_not_empty: "Aspekt ist nicht leer" users: edit: cancel: "Abbrechen" @@ -142,15 +142,15 @@ de: integrity_error: "Photo upload failed. Are you sure that was an image?" type_error: "Photo upload failed. Are you sure an image was added?" update: - notice: "Photo successfully updated." + notice: "Foto erfolgreich aktualisiert." error: "Failed to edit photo." destroy: - notice: "Photo deleted." + notice: "Foto gelöscht." registrations: new: sign_up: "Anmelden" create: - success: "You've joined Diaspora!" + success: "Du bist Diaspora beigetreten!" status_messages: new_status_message: tell_me_something_good: "Erzähl' mir was schönes!" @@ -171,27 +171,27 @@ de: no_message_to_display: "No message to display." people: index: - add_friend: "add friend" + add_friend: "Freund hinzufügen" real_name: "real name" diaspora_handle: "diaspora handle" - thats_you: "that's you!" - friend_request_pending: "friend request pending" - you_have_a_friend_request_from_this_person: "you have a friend request from this person" + thats_you: "das bist du!" + friend_request_pending: "Freundschaftsanfrage ausstehend" + you_have_a_friend_request_from_this_person: "du hast eine Freundschaftsanfrage von dieser Person" new: - new_person: "New Person" - back_to_list: "Back to List" + new_person: "Neue Person" + back_to_list: "Zurück zur Liste" show: - last_seen: "last seen: %{how_long_ago}" - friends_since: "friends since: %{how_long_ago}" + last_seen: "zuletzt gesehen: %{how_long_ago}" + friends_since: "Freunde seit: %{how_long_ago}" save: "save" - are_you_sure: "Are you sure?" + are_you_sure: "Bist du sicher?" remove_friend: "remove friend" destroy: - success: "You are now friends." - error: "Please select an aspect!" - ignore: "Ignored friend request." + success: "Ihr seid jetzt Freunde." + error: "Bitte wähle einen Aspekt aus!" + ignore: "Freundschaftsanfrage ignorieren." create: error: "No diaspora seed found with this email!" - already_friends: "You are already friends with %{destination_url}!" - success: "A friend request was sent to %{destination_url}." - horribly_wrong: "Something went horribly wrong." + already_friends: "Du bist bereits mit %{destination_url} befreundet!" + success: "Eine Freundschaftsanfrage wurde an %{destination_url} gesendet." + horribly_wrong: "Etwas ging tierisch schief." From ac667e6ec9db87fa37d047290981cbcc44da1c2e Mon Sep 17 00:00:00 2001 From: Michael Kaeufl Date: Mon, 20 Sep 2010 21:39:56 +0200 Subject: [PATCH 47/79] de: Ausloggen -> Abmelden --- config/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index e052637d8..20b75e90c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -26,7 +26,7 @@ de: layouts: application: edit_profile: "Profil bearbeiten" - logout: "Ausloggen" + logout: "Abmelden" shared: aspect_nav: all_aspects: "Alle Aspekte" From f28a96e356073ad18b8fed45e497fdba8a8d3fcd Mon Sep 17 00:00:00 2001 From: Michael Kaeufl Date: Mon, 20 Sep 2010 22:00:44 +0200 Subject: [PATCH 48/79] fix in header --- config/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 20b75e90c..1c4dfb4ad 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3,7 +3,7 @@ # the COPYRIGHT file. -# Sample localization file for English. Add more files in this directory for other locales. +# Localization file for German. Add more files in this directory for other locales. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. de: From 2d7b72e51878cdfc9a126d1b4cb397bfa1c963a9 Mon Sep 17 00:00:00 2001 From: Pistos Date: Mon, 20 Sep 2010 21:18:37 -0400 Subject: [PATCH 49/79] Added a newline after headings where it was missing. --- README.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0ae9faff1..3eade7240 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ## Commit Guidlines + You are welcome to contribute, add and extend Diaspora however you see fit. We will do our best to incorporate everything that meets our guidelines. -We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches. The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered. You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). +We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches. The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered. You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). All commits must be tested, and after each commit, all tests should be green before a pull request is sent. Please write your tests in Rspec. @@ -14,7 +15,7 @@ The privacy aware, personally controlled, do-it-all, open source social network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** **PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN** -Also, we really want to continue to focus on features and improving the code base. When we think it is +Also, we really want to continue to focus on features and improving the code base. When we think it is ready for general use, we will post more detailed instructions. ## Notice @@ -30,6 +31,7 @@ We will try and fully support more webservers later, but that is what works for These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest. ## Preparing your system + In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): - Build Tools - Packages needed to compile the components that follow. @@ -64,7 +66,7 @@ To install Ruby 1.8.7 on **Ubuntu**, run the following command: sudo apt-get install ruby-full -Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. +Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby installation. A semi automated method for doing this is available. It is highly recommended that you review the script before running it so you understand what will occur. The script can be executed by running the following command: @@ -90,11 +92,11 @@ Then run: You can also run the binary directly by doing the following: -If you're running a 32-bit system, run: +If you're running a 32-bit system, run: wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz - -If you're running a 64-bit system, run: + +If you're running a 64-bit system, run: wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz @@ -202,9 +204,11 @@ If you have never used github before, their [help desk](http://help.github.com/) ## Running Diaspora ### Install required gems + To start the app server for the first time, you need to use Bundler to install Diaspora's gem depencencies. Run `bundle install` from Diaspora's root directory. Bundler will also warn you if there is a new dependency and you need to bundle install again. ### Start Mongo + If you installed the Ubuntu package, MongoDB should already be running (if not, run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo. If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where Mongo is installed to start Mongo. @@ -214,19 +218,24 @@ If you installed the OsX package through "brew", MongoDB will need to be started Diaspora will not run unless Mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. ### Run the server + `./script/server` will start both thin and the websocket server. If you want to run a different app server, you will have to run them separately. See below for instructions. ### Run the app server + Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode[.](http://bit.ly/9mwtUw) ### Run the websocket server + run `bundle exec ruby ./script/websocket_server` to start the websocket server on port 8080. Change the port in config/app_config.yml. ### Logging in with a sample user + Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb. ### Testing + Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. ## Resources From fa1e09cadbfb5a1b505398e299e7777d40bf3ff2 Mon Sep 17 00:00:00 2001 From: Pistos Date: Mon, 20 Sep 2010 21:23:20 -0400 Subject: [PATCH 50/79] Hard-wrapped README text to confirm to an 80-character screen width. --- README.md | 185 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 133 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 3eade7240..e7c118631 100644 --- a/README.md +++ b/README.md @@ -1,56 +1,87 @@ ## Commit Guidlines -You are welcome to contribute, add and extend Diaspora however you see fit. We will do our best to incorporate everything that meets our guidelines. +You are welcome to contribute, add and extend Diaspora however you see fit. We +will do our best to incorporate everything that meets our guidelines. -We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches. The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered. You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). +We need you to fill out a +[contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) +before we can accept your patches. The agreement gives Diaspora joint +ownership of the patch so the copyright isn't scattered. You can find it +[here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). -All commits must be tested, and after each commit, all tests should be green before a pull request is sent. Please write your tests in Rspec. +All commits must be tested, and after each commit, all tests should be green +before a pull request is sent. Please write your tests in Rspec. -GEMS: We would like to keep external dependencies unduplicated. We're using Nokogiri, Mongomapper, and EM::HttpRequest as much as possible. We have a few gems in the project we'd rather not use, but if you can, use dependencies we already have. +GEMS: We would like to keep external dependencies unduplicated. We're using +Nokogiri, Mongomapper, and EM::HttpRequest as much as possible. We have a few +gems in the project we'd rather not use, but if you can, use dependencies we +already have. # Diaspora -The privacy aware, personally controlled, do-it-all, open source social network. +The privacy aware, personally controlled, do-it-all, open source social +network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** -**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN** +**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS +TO BE BROKEN** -Also, we really want to continue to focus on features and improving the code base. When we think it is -ready for general use, we will post more detailed instructions. +Also, we really want to continue to focus on features and improving the code +base. When we think it is ready for general use, we will post more detailed +instructions. ## Notice -We currently run Diaspora with the [thin](http://code.macournoyer.com/thin/) as our webserver, behind [nginx](http://wiki.nginx.org/Main). Diaspora uses the asynchronous feature of [EventMachine](http://rubyeventmachine.com/) to send messages between seeds, +We currently run Diaspora with the [thin](http://code.macournoyer.com/thin/) as +our webserver, behind [nginx](http://wiki.nginx.org/Main). Diaspora uses the +asynchronous feature of [EventMachine](http://rubyeventmachine.com/) to send +messages between seeds, using the power of the +[Reactor](http://en.wikipedia.org/wiki/Reactor_pattern) pattern. If you use +mod_rails, mongrel, or another non-eventmachine based application server, +federation and/or websockets may not work. -using the power of the [Reactor](http://en.wikipedia.org/wiki/Reactor_pattern) pattern. If you use mod_rails, mongrel, or another non-eventmachine based application server, federation and/or websockets may not work. +If you don't like thin, you can always try +[Rainbows!](http://rainbows.rubyforge.org/) We will try and fully support more +webservers later, but that is what works for now. -If you don't like thin, you can always try [Rainbows!](http://rainbows.rubyforge.org/) -We will try and fully support more webservers later, but that is what works for now. - - -These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest. +These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), +[Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora +for the latest and greatest browsers, so please update your Firefox, Chrome or +Safari to the latest and greatest. ## Preparing your system -In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): +In order to run Diaspora, you will need to download the following dependencies +(specific instructions follow): - Build Tools - Packages needed to compile the components that follow. -- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. (We're using **1.8.7**. It comes preinstalled on Mac OS X.) +- [Ruby](http://www.ruby-lang.org) - The Ruby programming language. + (We're using **1.8.7**. It comes preinstalled on Mac OS X.) - [MongoDB](http://www.mongodb.org) - A snappy noSQL database. -- [OpenSSL](http://www.openssl.org/) - An encryption library. (It comes preinstalled on Mac OS X and Ubuntu.) -- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used to resize uploaded photos. +- [OpenSSL](http://www.openssl.org/) - An encryption library. + (It comes preinstalled on Mac OS X and Ubuntu.) +- [ImageMagick](http://www.imagemagick.org/) - An Image processing library used + to resize uploaded photos. - [Git](http://git-scm.com/) - The fast version control system. -After you have Ruby installed on your system, you will need to get RubyGems, then install Bundler: +After you have Ruby installed on your system, you will need to get RubyGems, +then install Bundler: - [RubyGems](http://rubygems.org/) - Source for Ruby gems. - [Bundler](http://gembundler.com/) - Gem management tool for Ruby projects. -**We suggest using a package management system to download these dependencies. Trust us, it's going to make your life a lot easier. If you're using Mac OS X, you can use [homebrew](http://mxcl.github.com/homebrew/); if you're using Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes pre-installed); if you're using Fedora simply use [yum](http://yum.baseurl.org/). The instructions below assume you have these installed.** +**We suggest using a package management system to download these dependencies. +Trust us, it's going to make your life a lot easier. If you're using Mac OS X, +you can use [homebrew](http://mxcl.github.com/homebrew/); if you're using +Ubuntu, just use [Synaptic](http://www.nongnu.org/synaptic/) (it comes +pre-installed); if you're using Fedora simply use +[yum](http://yum.baseurl.org/). The instructions below assume you have these +installed.** ### Build Tools -To install build tools on **Ubuntu**, run the following (includes the gcc and xml parsing dependencies): +To install build tools on **Ubuntu**, run the following (includes the gcc and +xml parsing dependencies): sudo apt-get install build-essential libxslt1.1 libxslt1-dev libxml2 @@ -58,7 +89,8 @@ To install build tools on **Fedora**, run the following: sudo yum install libxslt libxslt-devel libxml2 libxml2-devel -To install build tools on **Mac OS X**, you need to download and install [Xcode](http://developer.apple.com/technologies/tools/xcode.html). +To install build tools on **Mac OS X**, you need to download and install +[Xcode](http://developer.apple.com/technologies/tools/xcode.html). ### Ruby @@ -66,22 +98,30 @@ To install Ruby 1.8.7 on **Ubuntu**, run the following command: sudo apt-get install ruby-full -Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. +Please note that you need to have Universe enabled in your +/etc/apt/sources.list file to install ruby using apt-get. -At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby installation. A semi automated method for doing this is available. It is highly recommended that you review the script before running it so you understand what will occur. The script can be executed by running the following command: +At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to +use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby +installation. A semi automated method for doing this is available. It is +highly recommended that you review the script before running it so you +understand what will occur. The script can be executed by running the +following command: ./script/bootstrap-fedora-diaspora.sh -After reviewing and executing the above script you will need to follow the "MongoDB" section and then you should skip all the way down to "Start Mongo". - +After reviewing and executing the above script you will need to follow the +"MongoDB" section and then you should skip all the way down to "Start Mongo". If you're on **Mac OS X**, you already have Ruby on your system. Yay! ### MongoDB -To install MongoDB on **Ubuntu**, add the official MongoDB repository [here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages). +To install MongoDB on **Ubuntu**, add the official MongoDB repository +[here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages). -For Lucid, add the following line to your /etc/apt/sources.list (for other distros, see http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages): +For Lucid, add the following line to your /etc/apt/sources.list (for other +distros, see http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages): deb http://downloads.mongodb.org/distros/ubuntu 10.4 10gen @@ -109,7 +149,10 @@ Then run: sudo chmod -Rv 777 /data/ -To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB repository from MongoDB (http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into /etc/yum.repos.d/10gen.repo: +To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB +repository from MongoDB +(http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into +/etc/yum.repos.d/10gen.repo: [10gen] name=10gen Repository @@ -117,13 +160,14 @@ To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB repos gpgcheck=0 enabled=1 - Then use yum to install the packages: sudo yum install mongo-stable mongo-stable-server - -If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're running a 64-bit system, run `wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`. +If you're running a 32-bit system, run `wget +http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're +running a 64-bit system, run `wget +http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`. # extract tar xzf mongodb-linux-i686-1.4.0.tgz @@ -131,7 +175,6 @@ If you're running a 32-bit system, run `wget http://fastdl.mongodb.org/linux/mon sudo mkdir -p /data/db sudo chmod -Rv 777 /data/ - To install MongoDB on **Mac OS X**, run the following: brew install mongo @@ -140,7 +183,8 @@ To install MongoDB on **Mac OS X**, run the following: ### OpenSSL -If you're running either **Ubuntu**, **Fedora** or **Mac OS X** you already have OpenSSL installed! +If you're running either **Ubuntu**, **Fedora** or **Mac OS X** you already +have OpenSSL installed! ### ImageMagick @@ -180,67 +224,99 @@ On **Ubuntu** 10.04, run the following: sudo apt-get update sudo apt-get install rubygems -This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version of rubygems is in the repositories. +This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version +of rubygems is in the repositories. On **Fedora**, run the following: sudo yum install rubygems -On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update it for use with the latest Bundler. To update RubyGems, run `sudo gem update --system`. +On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update +it for use with the latest Bundler. To update RubyGems, run `sudo gem update +--system`. ### Bundler -After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler. If you're using Ubuntu repository .debs, bundler is found at /var/lib/gems/1.8/bin/bundle +After RubyGems is updated, simply run `sudo gem install bundler` to get +Bundler. If you're using Ubuntu repository .debs, bundler is found at +/var/lib/gems/1.8/bin/bundle ## Getting Diaspora git clone http://github.com/diaspora/diaspora.git -If you have never used github before, their [help desk](http://help.github.com/) has a pretty awesome guide on getting setup. +If you have never used github before, their +[help desk](http://help.github.com/) has a pretty awesome guide on getting +setup. ## Running Diaspora ### Install required gems -To start the app server for the first time, you need to use Bundler to install Diaspora's gem depencencies. Run `bundle install` from Diaspora's root directory. Bundler will also warn you if there is a new dependency and you need to bundle install again. +To start the app server for the first time, you need to use Bundler to install +Diaspora's gem depencencies. Run `bundle install` from Diaspora's root +directory. Bundler will also warn you if there is a new dependency and you +need to bundle install again. ### Start Mongo -If you installed the Ubuntu package, MongoDB should already be running (if not, run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo. +If you installed the Ubuntu package, MongoDB should already be running (if not, +run `service mongodb start`). If you installed the binary manually, run `sudo +mongod` from where mongo is installed to start mongo. -If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where Mongo is installed to start Mongo. +If you installed the Fedora package, MongoDB will need to be started via +`service mongodb start`. If you installed the binary manually, run `sudo +mongod` from where Mongo is installed to start Mongo. -If you installed the OsX package through "brew", MongoDB will need to be started via `sudo launchctl load /Library/LaunchDaemons/org.mongodb.mongod.plist`. (before you have to go to /Library/LaunchDaemons and add a symlink to /usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist) +If you installed the OsX package through "brew", MongoDB will need to be +started via `sudo launchctl load +/Library/LaunchDaemons/org.mongodb.mongod.plist`. (before you have to go to +/Library/LaunchDaemons and add a symlink to +/usr/local/Cellar/mongodb/1.6.2-x86_64/org.mongodb.mongod.plist) -Diaspora will not run unless Mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. +Diaspora will not run unless Mongo is running. Mongo will not run by default, +and will need to be started every time you wish to use or run the test suite +for Diaspora. ### Run the server -`./script/server` will start both thin and the websocket server. If you want to run a different app server, you will have to run them separately. See below for instructions. +`./script/server` will start both thin and the websocket server. If you want +to run a different app server, you will have to run them separately. See below +for instructions. ### Run the app server -Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode[.](http://bit.ly/9mwtUw) +Once mongo is running and bundler has finished, run `bundle exec thin start` +from the root Diaspora directory. This will start the app server in +development mode[.](http://bit.ly/9mwtUw) ### Run the websocket server -run `bundle exec ruby ./script/websocket_server` to start the websocket server on port 8080. Change the port in config/app_config.yml. +run `bundle exec ruby ./script/websocket_server` to start the websocket server +on port 8080. Change the port in config/app_config.yml. ### Logging in with a sample user -Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb. +Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. +More details in db/seeds/tom.rb. ### Testing -Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. +Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven +testing framework. In order to run the tests, run `bundle exec rspec spec`. ## Resources -We are maintaining a [public tracker project](http://www.pivotaltracker.com/projects/61641) and a [roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can file [bug reports](https://github.com/diaspora/diaspora/issues) right here on github. +We are maintaining a +[public tracker project](http://www.pivotaltracker.com/projects/61641) +and a +[roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can +file [bug reports](https://github.com/diaspora/diaspora/issues) right here on +github. Ongoing discussion: - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev) @@ -249,6 +325,11 @@ Ongoing discussion: - [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev) ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev)) -More general info and updates about the project can be found on our [blog](http://joindiaspora.com), [and on Twitter](http://twitter.com/joindiaspora). Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk). +More general info and updates about the project can be found on our +[blog](http://joindiaspora.com), +[and on Twitter](http://twitter.com/joindiaspora). Also, be sure to join the +official [mailing list](http://http://eepurl.com/Vebk). -If you wish to contact us privately about any exploits in Diaspora you may find, you can email [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com). +If you wish to contact us privately about any exploits in Diaspora you may +find, you can email +[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com). From bdd752f07b43dd316b9c87d7d454538ebe69ea00 Mon Sep 17 00:00:00 2001 From: Thomas Krehbiel Date: Mon, 20 Sep 2010 21:49:14 -0400 Subject: [PATCH 51/79] Fix for 'Local variable hides method' --- app/models/person.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 72f4c46b9..8a6b85175 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -104,8 +104,8 @@ class Person return nil unless public_key_entry - public_key = public_key_entry.first.href - new_person.exported_key = Base64.decode64 public_key + pubkey = public_key_entry.first.href + new_person.exported_key = Base64.decode64 pubkey guid = profile.links.select{|x| x.rel == 'http://joindiaspora.com/guid'}.first.href new_person.id = guid From 4c0dc584583d862172e460e036830407ab40fb5e Mon Sep 17 00:00:00 2001 From: danielvincent Date: Tue, 21 Sep 2010 20:02:37 -0700 Subject: [PATCH 52/79] spec cleanup --- spec/models/user_spec.rb | 53 +++++++++++++++------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 2249ae0b1..1608bbe58 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -7,54 +7,41 @@ require File.dirname(__FILE__) + '/../spec_helper' describe User do - before do - @user = Factory.create(:user) - @aspect = @user.aspect(:name => 'heroes') - end + let(:user) { Factory(:user) } + let(:aspect) { user.aspect(:name => 'heroes') } describe '#diaspora_handle' do it 'uses the pod config url to set the diaspora_handle' do - @user.diaspora_handle.should == @user.username + "@example.org" + user.diaspora_handle.should == user.username + "@example.org" end end - - - describe 'profiles' do + context 'profiles' do it 'should be able to update their profile and send it to their friends' do - Factory.create(:person) + updated_profile = { :profile => { + :first_name => 'bob', + :last_name => 'billytown', + :image_url => "http://clown.com"} } - updated_profile = {:profile => {:first_name => 'bob', :last_name => 'billytown', :image_url => "http://clown.com"}} - - @user.update_profile(updated_profile).should == true - @user.profile.image_url.should == "http://clown.com" + user.update_profile(updated_profile).should be true + user.profile.image_url.should == "http://clown.com" end end - describe 'aspects' do - it 'should delete an empty aspect' do - @user.aspects.include?(@aspect).should == true - @user.drop_aspect(@aspect) - @user.reload + context 'aspects' do + let(:user2) { Factory(:user) } + let(:aspect2) { user2.aspect(:name => 'stuff') } - @user.aspects.include?(@aspect).should == false + it 'should delete an empty aspect' do + user.drop_aspect(aspect) + user.aspects.include?(aspect).should == false end it 'should not delete an aspect with friends' do - user2 = Factory.create(:user) - aspect2 = user2.aspect(:name => 'stuff') - user2.reload - aspect2.reload - - friend_users(@user, Aspect.find_by_id(@aspect.id), user2, Aspect.find_by_id(aspect2.id)) - @aspect.reload - - @user.aspects.include?(@aspect).should == true - - proc{@user.drop_aspect(@aspect)}.should raise_error /Aspect not empty/ - - @user.reload - @user.aspects.include?(@aspect).should == true + friend_users(user, Aspect.find_by_id(aspect.id), user2, Aspect.find_by_id(aspect2.id)) + aspect.reload + proc{user.drop_aspect(aspect)}.should raise_error /Aspect not empty/ + user.aspects.include?(aspect).should == true end end From 6dd7911c8c3a07d2757c946dfa39241733a984c7 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 10:52:29 -0700 Subject: [PATCH 53/79] DG IZ; update_or_repost --- app/controllers/albums_controller.rb | 2 +- app/controllers/photos_controller.rb | 2 +- app/models/user.rb | 10 ++++++++++ spec/models/user/posting_spec.rb | 23 +++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index c6cf7a829..14adcebe1 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -52,7 +52,7 @@ class AlbumsController < ApplicationController data = clean_hash(params[:album]) - if @album.update_attributes data + if current_user.update_or_repost( @album, data ) flash[:notice] = "Album #{@album.name} successfully edited." respond_with @album else diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index afc193413..8d383f53a 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -88,7 +88,7 @@ class PhotosController < ApplicationController data = clean_hash(params) - if @photo.update_attributes data[:photo] + if current_user.update_or_repost( @photo, data[:photo] ) flash[:notice] = "Photo successfully updated." respond_with @photo else diff --git a/app/models/user.rb b/app/models/user.rb index 06652a494..45f947807 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -122,6 +122,16 @@ class User post end + def update_or_repost( post, post_hash = {} ) + if self.owns? post + if post_hash[:aspect_ids] + repost(post, post_hash[:aspect_ids]) if validate_aspect_permissions post_hash[:aspect_ids] + else + post.update_attributes!(post_hash) + end + end + end + def validate_aspect_permissions(aspect_ids) aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb index da52ed849..6b939b573 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_spec.rb @@ -64,6 +64,29 @@ describe User do aspect1.posts.count.should be 1 end end + + describe '#update_or_repost' do + let!(:album) { user.post(:album, :name => "Profile Photos", :to => aspect.id) } + + it 'should repost' do + update_hash = { :aspect_ids => aspect1.id } + user.should_receive(:repost).with(album, update_hash[:aspect_ids]).and_return album + user.update_or_repost( album, update_hash ) + end + + it 'should update fields' do + update_hash = { :name => "Other Photos" } + user.update_or_repost( album, update_hash ) + album.name.should == "Other Photos" + end + + it 'should reject posting to an external aspect' do + update_hash = { :aspect_ids => [aspect3.id] } + proc{ + user.update_or_repost( album, update_hash ) + }.should raise_error /Cannot post to an aspect you do not own./ + end + end end context 'dispatching' do From 894197522443eaa5b2989f1e2dbddb5ade9ba630 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 10:59:23 -0700 Subject: [PATCH 54/79] DG IZ; example extension convention for app_config --- config/{app_config_example.yml => app_config.yml.example} | 0 config/initializers/_load_app_config.rb | 6 +++--- db/seeds/backer.rb | 2 +- db/seeds/dev.rb | 2 +- db/seeds/tom.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename config/{app_config_example.yml => app_config.yml.example} (100%) diff --git a/config/app_config_example.yml b/config/app_config.yml.example similarity index 100% rename from config/app_config_example.yml rename to config/app_config.yml.example diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb index 521f9f0a0..e739941e9 100644 --- a/config/initializers/_load_app_config.rb +++ b/config/initializers/_load_app_config.rb @@ -8,10 +8,10 @@ end if File.exist? "#{Rails.root}/config/app_config.yml" all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml" - all_envs = load_config_yaml "#{Rails.root}/config/app_config_example.yml" unless all_envs + all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" unless all_envs else - puts "WARNING: No config/app_config.yml found! Look at config/app_config_example.yml for help." - all_envs = load_config_yaml "#{Rails.root}/config/app_config_example.yml" + puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help." + all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" end if all_envs[Rails.env.to_s] diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index 8fa72f23d..20fe90fdf 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -42,7 +42,7 @@ def create end def set_app_config username - current_config = YAML.load(File.read(Rails.root.join('config', 'app_config_example.yml'))) + current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example'))) current_config[Rails.env.to_s] ||= {} current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com" current_config['default']['pod_url'] = "#{username}.joindiaspora.com" diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 4ffa947e7..e2d8a5495 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -7,7 +7,7 @@ require 'config/environment' def set_app_config username - current_config = YAML.load(File.read(Rails.root.join('config', 'app_config_example.yml'))) + current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example'))) current_config[Rails.env.to_s] ||= {} current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com" current_config['default']['pod_url'] = "#{username}.joindiaspora.com" diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index 50d41eb91..cc3000d0b 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -7,7 +7,7 @@ require 'config/environment' def set_app_config username - current_config = YAML.load(File.read(Rails.root.join('config', 'app_config_example.yml'))) + current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example'))) current_config[Rails.env.to_s] ||= {} current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com" current_config['default']['pod_url'] = "#{username}.joindiaspora.com" From 5ef32b7d55947f745256d98658f717da3f91297c Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 12:03:25 -0700 Subject: [PATCH 55/79] DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial --- app/controllers/application_controller.rb | 9 +++++++++ app/views/status_messages/_status_message.html.haml | 6 ++++++ config/routes.rb | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f0ca5bfc8..ac0d11b1c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -37,4 +37,13 @@ class ApplicationController < ActionController::Base @request_count = Request.for_user(current_user).size if current_user end + def repost + @post = current_user.find_visible_post_by_id params[:id] + if current_user.repost( @post, :to => params[:aspect_ids] ) + flash[:notice] = "Item re-shared." + else + flash[:error] = "Failed to re-share." + end + end + end diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index dcee761d1..ee484f47b 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -22,3 +22,9 @@ - if current_user.owns?(post) .destroy_link = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete" + + %b reshare: + -if @aspects + - for aspect in @aspects + = link_to aspect, repost_path( :id => post.id, :aspect_ids => aspect.id ) + diff --git a/config/routes.rb b/config/routes.rb index ae757499c..1a7a53925 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,12 +7,14 @@ Diaspora::Application.routes.draw do resources :people, :only => [:index, :show, :destroy] resources :users, :except => [:create, :new, :show] - resources :status_messages, :only => [:create, :destroy, :show] + resources :status_messages resources :comments, :except => [:index] resources :requests, :except => [:edit, :update] resources :photos, :except => [:index] resources :albums + match 'repost', :to => 'application#repost', :as => 'repost' + match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends' match 'aspects/move_friend', :to => 'aspects#move_friend', :as => 'move_friend' match 'aspects/manage', :to => 'aspects#manage' From de9092363115adca04879f06961d9bd5d7fd8d63 Mon Sep 17 00:00:00 2001 From: Thomas Krehbiel Date: Wed, 22 Sep 2010 18:05:11 -0400 Subject: [PATCH 56/79] Fix for sending unlimited duplicate friend requests --- lib/diaspora/user/friending.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb index a4dcdd38d..f3b30f9b3 100644 --- a/lib/diaspora/user/friending.rb +++ b/lib/diaspora/user/friending.rb @@ -8,6 +8,9 @@ module Diaspora module UserModules module Friending def send_friend_request_to(desired_friend, aspect) + # should have different exception types for these? + raise "You have already sent a friend request to that person!" if self.pending_requests.detect{ + |x| x.destination_url == desired_friend.receive_url } raise "You are already friends with that person!" if self.friends.detect{ |x| x.receive_url == desired_friend.receive_url} request = Request.instantiate( From 474cf7770815bb1cf87c277cc9727be9e8d627bc Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 15:05:51 -0700 Subject: [PATCH 57/79] DG IZ; reposting now works. redirects to a template missing page, though. --- app/views/shared/_reshare.haml | 27 +++++++++ .../status_messages/_status_message.html.haml | 8 +-- public/stylesheets/application.css | 37 ++++++++++++ public/stylesheets/sass/application.sass | 56 +++++++++++++++++++ 4 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 app/views/shared/_reshare.haml diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml new file mode 100644 index 000000000..61f48e73b --- /dev/null +++ b/app/views/shared/_reshare.haml @@ -0,0 +1,27 @@ +-# Copyright (c) 2010, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3. See +-# the COPYRIGHT file. + + + +:javascript + $(".reshare_button").toggle(function(e){ + e.preventDefault(); + $(this).parent(".reshare_pane").children(".reshare_box").fadeIn(200); + }, function(e) { + e.preventDefault(); + $(this).parent(".reshare_pane").children(".reshare_box").fadeOut(200); + }); + +.reshare_pane + %span.reshare_button + = link_to "Reshare", "#" + + %ul.reshare_box + - for aspect in current_user.aspects_with_post( post.id ) + %li.currently_sharing= aspect.name + + - for aspect in current_user.aspects + - unless aspect.posts.include? post + %li.aspect_to_share= link_to aspect, repost_path( :id => post.id, :aspect_ids => aspect.id ) + diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index ee484f47b..33764453f 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -17,14 +17,10 @@ \-- = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" - = render "comments/comments", :post => post + = render "comments/comments", :post => post - if current_user.owns?(post) .destroy_link = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete" - - %b reshare: - -if @aspects - - for aspect in @aspects - = link_to aspect, repost_path( :id => post.id, :aspect_ids => aspect.id ) + = render "shared/reshare", :post => post, :current_user => current_user diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9e8561cc2..e95107081 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -171,6 +171,40 @@ li.message { li.message .content div.info .time a { color: #666666; } +.reshare_pane { + margin-left: 5px; + margin-right: 5px; + display: inline; + position: relative; } + .reshare_pane ul.reshare_box { + display: none; + z-index: 10; + position: absolute; + margin-top: 5px; + padding: 0; + background-color: #fafafa; + list-style: none; + border: 5px solid #666666; + -webkit-box-shadow: 0 0 5px #666666; + -moz-box-shadow: 0 0 5px #666666; + text-shadow: 0 2px white; + color: black; } + .reshare_pane ul.reshare_box > li { + font-weight: bold; + padding: 8px; + padding-right: 15px; + border-top: 1px solid white; + border-bottom: 1px solid #cccccc; } + .reshare_pane ul.reshare_box > li:first-child { + border-top: none; } + .reshare_pane ul.reshare_box > li:last-child { + border-bottom: none; } + .reshare_pane ul.reshare_box > li a { + display: block; + height: 100%; } + .reshare_pane ul.reshare_box > li a:hover { + background-color: #eeeeee; } + form { position: relative; font-size: 120%; @@ -270,6 +304,9 @@ ul.comment_set { .destroy_link a, .request_button a { color: #999999; font-weight: normal; } + .destroy_link a:hover, .request_button a:hover { + text-decoration: underline; + background: none; } .destroy_link { display: none; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 88145b6df..30f03f8c0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -225,6 +225,58 @@ li.message a :color #666 +.reshare_pane + :margin + :left 5px + :right 5px + :display inline + :position relative + + ul.reshare_box + :display none + :z-index 10 + :position absolute + :margin + :top 5px + :padding 0 + + :background + :color #fafafa + + :list + :style none + + :border 5px solid #666 + :-webkit-box-shadow 0 0 5px #666 + :-moz-box-shadow 0 0 5px #666 + + :text-shadow 0 2px #fff + :color #000 + + > li + :font + :weight bold + + :padding 8px + :right 15px + :border + :top 1px solid #fff + :bottom 1px solid #ccc + + &:first-child + :border + :top none + &:last-child + :border + :bottom none + a + :display block + :height 100% + + &:hover + :background + :color #eee + form :position relative @@ -360,6 +412,10 @@ ul.comment_set :color #999 :font :weight normal + &:hover + :text + :decoration underline + :background none .destroy_link :display none From 10e6ff9df8e3168545d4ba8d074d22e78132d37e Mon Sep 17 00:00:00 2001 From: Thomas Krehbiel Date: Wed, 22 Sep 2010 18:05:11 -0400 Subject: [PATCH 58/79] Fix for sending unlimited duplicate friend requests --- app/controllers/requests_controller.rb | 4 ++-- lib/diaspora/user/friending.rb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 6087ebe85..2a8090c9e 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -47,8 +47,8 @@ class RequestsController < ApplicationController begin @request = current_user.send_friend_request_to(rel_hash[:friend], aspect) rescue Exception => e - raise e unless e.message.include? "already friends" - flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!" + raise e unless e.message.include? "already" + flash[:notice] = "#{e.message} #{params[:request][:destination_url]}" respond_with :location => aspect return end diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb index a4dcdd38d..f3b30f9b3 100644 --- a/lib/diaspora/user/friending.rb +++ b/lib/diaspora/user/friending.rb @@ -8,6 +8,9 @@ module Diaspora module UserModules module Friending def send_friend_request_to(desired_friend, aspect) + # should have different exception types for these? + raise "You have already sent a friend request to that person!" if self.pending_requests.detect{ + |x| x.destination_url == desired_friend.receive_url } raise "You are already friends with that person!" if self.friends.detect{ |x| x.receive_url == desired_friend.receive_url} request = Request.instantiate( From 695e5fe396457b1b894c2ad378f4470574d3e80a Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 15:19:26 -0700 Subject: [PATCH 59/79] Don't log huge encrypted params --- config/application.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/application.rb b/config/application.rb index b409f91d3..bf3b5699a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -51,5 +51,6 @@ module Diaspora # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] + config.filter_parameters += [:xml] end end From b9be543ef6695ee6737b40f9600815247ce7f5dc Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 15:32:11 -0700 Subject: [PATCH 60/79] DG IZ; reshare redirects to specific page --- app/views/shared/_publisher.haml | 2 +- app/views/shared/_reshare.haml | 4 ++-- public/stylesheets/application.css | 1 + public/stylesheets/sass/application.sass | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 4645ec65c..130f136a9 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -10,7 +10,7 @@ = f.error_messages %p %label{:for => "status_message_message"} Message - = f.text_area :message, :rows => 2 + = f.text_area :message, :rows => 2, :value => params[:prefill] %ul.aspect_selector{ :style => "display:none;"} going to... diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml index 61f48e73b..0b4120d52 100644 --- a/app/views/shared/_reshare.haml +++ b/app/views/shared/_reshare.haml @@ -19,9 +19,9 @@ %ul.reshare_box - for aspect in current_user.aspects_with_post( post.id ) + %li.currently_sharing= aspect.name - for aspect in current_user.aspects - unless aspect.posts.include? post - %li.aspect_to_share= link_to aspect, repost_path( :id => post.id, :aspect_ids => aspect.id ) - + %li.aspect_to_share= link_to aspect, :controller => "aspects", :action => "show", :id => aspect.id, :prefill => post.message diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e95107081..82bbd8b6d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -177,6 +177,7 @@ li.message { display: inline; position: relative; } .reshare_pane ul.reshare_box { + width: 150px; display: none; z-index: 10; position: absolute; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 30f03f8c0..7c77a0b79 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -233,6 +233,7 @@ li.message :position relative ul.reshare_box + :width 150px :display none :z-index 10 :position absolute From 955d9130a24fdb700b60cb5c241ebde707f5206f Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 15:35:23 -0700 Subject: [PATCH 61/79] DG IZ; shift+enter in publisher box submits contents --- public/javascripts/view.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 4713c7164..092d69f16 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -41,6 +41,12 @@ $(document).ready(function(){ } ); + $("#publisher textarea").keydown( function(e) { + if (e.shiftKey && e.keyCode == 13) { + $("#publisher form").submit(); + } + }); + });//end document ready From d0dbcd47fc7f76b4faab3e9cbf8166fa1390c666 Mon Sep 17 00:00:00 2001 From: Pistos Date: Tue, 21 Sep 2010 09:18:37 +0800 Subject: [PATCH 62/79] Added a newline after headings where it was missing. --- README.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6e9c40aa0..d20252583 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ## Commit Guidlines + You are welcome to contribute, add and extend Diaspora however you see fit. We will do our best to incorporate everything that meets our guidelines. -We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches. The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered. You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). +We need you to fill out a [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq) before we can accept your patches. The agreement gives Diaspora joint ownership of the patch so the copyright isn't scattered. You can find it [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq). All commits must be tested, and after each commit, all tests should be green before a pull request is sent. Please write your tests in Rspec. @@ -14,7 +15,7 @@ The privacy aware, personally controlled, do-it-all, open source social network. **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.** **PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN** -Also, we really want to continue to focus on features and improving the code base. When we think it is +Also, we really want to continue to focus on features and improving the code base. When we think it is ready for general use, we will post more detailed instructions. ## Notice @@ -30,6 +31,7 @@ We will try and fully support more webservers later, but that is what works for These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), [Fedora](http://www.fedoraproject.org) or Mac OS X. We are developing Diaspora for the latest and greatest browsers, so please update your Firefox, Chrome or Safari to the latest and greatest. ## Preparing your system + In order to run Diaspora, you will need to download the following dependencies (specific instructions follow): - Build Tools - Packages needed to compile the components that follow. @@ -64,7 +66,7 @@ To install Ruby 1.8.7 on **Ubuntu**, run the following command: sudo apt-get install ruby-full -Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. +Please note that you need to have Universe enabled in your /etc/apt/sources.list file to install ruby using apt-get. At this time Fedora does not have Ruby 1.8.7. As a workaround it is possible to use [rvm](http://rvm.beginrescueend.com/) with a locally compiled Ruby installation. A semi automated method for doing this is available. It is highly recommended that you review the script before running it so you understand what will occur. The script can be executed by running the following command: @@ -90,11 +92,11 @@ Then run: You can also run the binary directly by doing the following: -If you're running a 32-bit system, run: +If you're running a 32-bit system, run: wget http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz - -If you're running a 64-bit system, run: + +If you're running a 64-bit system, run: wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz @@ -202,9 +204,11 @@ If you have never used github before, their [help desk](http://help.github.com/) ## Running Diaspora ### Install required gems + To start the app server for the first time, you need to use Bundler to install Diaspora's gem depencencies. Run `bundle install` from Diaspora's root directory. Bundler will also warn you if there is a new dependency and you need to bundle install again. ### Start Mongo + If you installed the Ubuntu package, MongoDB should already be running (if not, run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo. If you installed the Fedora package, MongoDB will need to be started via `service mongodb start`. If you installed the binary manually, run `sudo mongod` from where Mongo is installed to start Mongo. @@ -214,19 +218,24 @@ If you installed the OsX package through "brew", MongoDB will need to be started Diaspora will not run unless Mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. ### Run the server + `./script/server` will start both thin and the websocket server. If you want to run a different app server, you will have to run them separately. See below for instructions. ### Run the app server + Once mongo is running and bundler has finished, run `bundle exec thin start` from the root Diaspora directory. This will start the app server in development mode[.](http://bit.ly/9mwtUw) ### Run the websocket server + run `bundle exec ruby ./script/websocket_server` to start the websocket server on port 8080. Change the port in config/app_config.yml. ### Logging in with a sample user + Run `rake db:seed:tom`, then login with user `tom` and password `evankorth`. More details in db/seeds/tom.rb. ### Testing + Diaspora's test suite uses [rspec](http://rspec.info/), a behavior driven testing framework. In order to run the tests, run `bundle exec rspec spec`. ## Resources From e9d16cc09b5c6dd2ae256658e0ec8b30fb56f882 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 22 Sep 2010 15:48:50 -0700 Subject: [PATCH 63/79] DG IZ; cleanup --- app/controllers/albums_controller.rb | 2 +- app/controllers/application_controller.rb | 9 --------- app/controllers/photos_controller.rb | 2 +- app/models/user.rb | 8 ++------ config/routes.rb | 2 -- spec/models/user/posting_spec.rb | 17 ++--------------- 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb index 14adcebe1..d3cad54e2 100644 --- a/app/controllers/albums_controller.rb +++ b/app/controllers/albums_controller.rb @@ -52,7 +52,7 @@ class AlbumsController < ApplicationController data = clean_hash(params[:album]) - if current_user.update_or_repost( @album, data ) + if current_user.update_post( @album, data ) flash[:notice] = "Album #{@album.name} successfully edited." respond_with @album else diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ac0d11b1c..f0ca5bfc8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -37,13 +37,4 @@ class ApplicationController < ActionController::Base @request_count = Request.for_user(current_user).size if current_user end - def repost - @post = current_user.find_visible_post_by_id params[:id] - if current_user.repost( @post, :to => params[:aspect_ids] ) - flash[:notice] = "Item re-shared." - else - flash[:error] = "Failed to re-share." - end - end - end diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 8d383f53a..d0cb1871e 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -88,7 +88,7 @@ class PhotosController < ApplicationController data = clean_hash(params) - if current_user.update_or_repost( @photo, data[:photo] ) + if current_user.update_post( @photo, data[:photo] ) flash[:notice] = "Photo successfully updated." respond_with @photo else diff --git a/app/models/user.rb b/app/models/user.rb index 45f947807..8f74e2233 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -122,13 +122,9 @@ class User post end - def update_or_repost( post, post_hash = {} ) + def update_post( post, post_hash = {} ) if self.owns? post - if post_hash[:aspect_ids] - repost(post, post_hash[:aspect_ids]) if validate_aspect_permissions post_hash[:aspect_ids] - else - post.update_attributes!(post_hash) - end + post.update_attributes(post_hash) end end diff --git a/config/routes.rb b/config/routes.rb index 1a7a53925..0ac115b76 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,8 +13,6 @@ Diaspora::Application.routes.draw do resources :photos, :except => [:index] resources :albums - match 'repost', :to => 'application#repost', :as => 'repost' - match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends' match 'aspects/move_friend', :to => 'aspects#move_friend', :as => 'move_friend' match 'aspects/manage', :to => 'aspects#manage' diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb index 6b939b573..d307e7a43 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_spec.rb @@ -65,27 +65,14 @@ describe User do end end - describe '#update_or_repost' do + describe '#update_post' do let!(:album) { user.post(:album, :name => "Profile Photos", :to => aspect.id) } - it 'should repost' do - update_hash = { :aspect_ids => aspect1.id } - user.should_receive(:repost).with(album, update_hash[:aspect_ids]).and_return album - user.update_or_repost( album, update_hash ) - end - it 'should update fields' do update_hash = { :name => "Other Photos" } - user.update_or_repost( album, update_hash ) + user.update_post( album, update_hash ) album.name.should == "Other Photos" end - - it 'should reject posting to an external aspect' do - update_hash = { :aspect_ids => [aspect3.id] } - proc{ - user.update_or_repost( album, update_hash ) - }.should raise_error /Cannot post to an aspect you do not own./ - end end end From 5fad23c63245301d3bbc71274d9788f6077b6c67 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 15:53:40 -0700 Subject: [PATCH 64/79] Adjust readme wording --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2aeba0670..4e5152fbf 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ network. **PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN** -Also, we really want to continue to focus on features and improving the code -base. When we think it is ready for general use, we will post more detailed +We are continuing to build features and improve the code base. +When we think it is ready for general use, we will post more detailed instructions. ## Notice From bfd39b01b6549deb8e7ecee1207c82d713453eaf Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 20:50:01 -0700 Subject: [PATCH 65/79] Readme wording adjustment --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4e5152fbf..c02b369e7 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,13 @@ instructions. ## Notice We currently run Diaspora with the [thin](http://code.macournoyer.com/thin/) as -our webserver, behind [nginx](http://wiki.nginx.org/Main). Diaspora uses the -asynchronous feature of [EventMachine](http://rubyeventmachine.com/) to send -messages between seeds, using the power of the -[Reactor](http://en.wikipedia.org/wiki/Reactor_pattern) pattern. If you use -mod_rails, mongrel, or another non-eventmachine based application server, -federation and/or websockets may not work. +our webserver, behind [nginx](http://wiki.nginx.org/Main). Diaspora uses an +asynchronous [EventMachine](http://rubyeventmachine.com/) queue inside the appserver +to send messages between seeds. If you use mod_rails, mongrel, or another +non-eventmachine based application server, federation may not work. If you don't like thin, you can always try -[Rainbows!](http://rainbows.rubyforge.org/) We will try and fully support more +[Rainbows!](http://rainbows.rubyforge.org/) We will try to fully support more webservers later, but that is what works for now. These instructions are for machines running [Ubuntu](http://www.ubuntu.com/), From e179ae5b55aa181d5e7cfdcd23cbc58f8474adfc Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 20:52:44 -0700 Subject: [PATCH 66/79] Add mention of app_config.yml to readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index c02b369e7..0d5cee400 100644 --- a/README.md +++ b/README.md @@ -279,6 +279,12 @@ Diaspora will not run unless Mongo is running. Mongo will not run by default, and will need to be started every time you wish to use or run the test suite for Diaspora. +### Configure Diaspora + +Diaspora needs to know where on the internet it is. Copy config/app_config_example.yml +to config/app_config.yml, put your url into the url field, and make any other +needed configuration changes. + ### Run the server `./script/server` will start both thin and the websocket server. If you want From cc3819c256a0db250fe70e832d17f64e5e9b4fce Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 21:39:22 -0700 Subject: [PATCH 67/79] Forgot a merge conflict --- app/views/aspects/manage.html.haml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml index 251a8d9a6..af64fcc23 100644 --- a/app/views/aspects/manage.html.haml +++ b/app/views/aspects/manage.html.haml @@ -61,11 +61,4 @@ %div{:id => "add_request_pane_#{aspect.id}"} = render "requests/new_request", :aspect => aspect -<<<<<<< HEAD -%p - %br - = link_to t('.update_aspects'), '#', :class => 'button', :id => "move_friends_link" - -======= ->>>>>>> master #content_bottom From 1964bd5ecfc6fa26995067ea4f04b2e4ba44b105 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 21:57:00 -0700 Subject: [PATCH 68/79] Hit the right thing in aspects move friend --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index d25c04591..8e6542639 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,8 +94,8 @@ en: failure: "Aspect editing failed for friend %{real_name}." success: "Aspects edited successfully." move_friend: - error: "didn't work %{inspect}" - notice: "You are now showing your friend a different aspect of yourself." + failure: "didn't work %{inspect}" + success: "You are now showing your friend a different aspect of yourself." helper: remove: "remove" aspect_not_empty: "Aspect not empty" From 5edd054ac78a00057d74d61ffb8d8bf8c19a358a Mon Sep 17 00:00:00 2001 From: Steve Conover Date: Wed, 22 Sep 2010 22:22:18 -0700 Subject: [PATCH 69/79] MS Use class_eval because of some sort of load ordering issue --- spec/controllers/sockets_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb index 4104d0d51..799d37500 100644 --- a/spec/controllers/sockets_controller_spec.rb +++ b/spec/controllers/sockets_controller_spec.rb @@ -6,11 +6,11 @@ require File.dirname(__FILE__) + '/../spec_helper' -class SocketsController +SocketsController.class_eval <<-EOT def url_options {:host => ""} end -end +EOT describe SocketsController do render_views From 494f765066204e92c685f990a41f988bc1b53ab0 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 22:57:53 -0700 Subject: [PATCH 70/79] fix_diaspora_handle rake task --- lib/tasks/db.rake | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 80e3bafe5..32aabc0db 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -58,19 +58,12 @@ namespace :db do task :fix_diaspora_handle do puts "fixing the people in this seed" require 'config/environment' - - people = Person.all( '$where' => "function(){ - return this.diaspora_handle.charAt(this.diaspora_handle.length-1) == '@' - }") - - puts "Found #{people.count} people with broken diaspora_handle fields" - people.each do |person| + Person.where(:url => 'example.org').all.each{|person| if person.owner - puts "Resetting diaspora handle for #{person.owner.username}" + person.url = APP_CONFIG[:pod_url] person.diaspora_handle = person.owner.diaspora_handle - person.save end - end + } puts "everything should be peachy" end end From f11a481ed7f3c57f6fc73525e8892ed1828264c0 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 22 Sep 2010 22:59:17 -0700 Subject: [PATCH 71/79] Actually do something --- lib/tasks/db.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 32aabc0db..c0d289cda 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -62,6 +62,7 @@ namespace :db do if person.owner person.url = APP_CONFIG[:pod_url] person.diaspora_handle = person.owner.diaspora_handle + person.save end } puts "everything should be peachy" From c711e85c89a887bec7d8cbd7e2f8298dcc2359be Mon Sep 17 00:00:00 2001 From: uiri Date: Wed, 22 Sep 2010 09:33:37 +0800 Subject: [PATCH 72/79] adding gif support --- app/views/photos/_new_photo.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index 0f1e423fb..abb8cf528 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -8,7 +8,7 @@ var uploader = new qq.FileUploader({ element: document.getElementById('file-upload'), params: {'album_id' : "#{@album.id}"}, - allowedExtensions: ['jpg', 'jpeg', 'png'], + allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'], action: "#{photos_path}" }); } From 1625f6b1314dc5bd3d0dc12ad1cfb7484896b563 Mon Sep 17 00:00:00 2001 From: mousey Date: Tue, 21 Sep 2010 07:02:12 +0800 Subject: [PATCH 73/79] Welsh Language Localization. --- config/locales/devise.cy.yml | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 config/locales/devise.cy.yml diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml new file mode 100644 index 000000000..4f89f9b34 --- /dev/null +++ b/config/locales/devise.cy.yml @@ -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. + + +cy: + errors: + messages: + not_found: "ni chanfuwyd" + already_confirmed: "cadarnhawyd eisioes" + not_locked: "heb ei gloi" + + devise: + failure: + unauthenticated: 'Mae angen i chi arwyddo i mewn neu ymuno cyn parhau.' + unconfirmed: 'Rhaid i chi gadarnhau eich cyfrif cyn parhau.' + locked: 'Mae eich cyfrif wedi'i gloi.' + invalid: 'E-bost neu gyfrinair annilys.' + invalid_token: 'Tocyn dilysu annilys.' + timeout: 'Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau.' + inactive: 'Nid yw eich cyfrif wedi'i actifadu.' + sessions: + signed_in: 'Arwyddwyd i fewn yn llwyddiannus.' + signed_out: 'Arwyddwyd allan yn llwyddiannus.' + passwords: + send_instructions: 'Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau.' + updated: 'Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn.' + confirmations: + send_instructions: 'Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau.' + confirmed: 'Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn.' + registrations: + signed_up: 'Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi.' + updated: 'Diweddarwyd eich cyfrif yn llwyddiannus.' + destroyed: 'Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan.' + unlocks: + send_instructions: 'Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau.' + unlocked: 'Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn.' + mailer: + confirmation_instructions: 'Cyfarwyddiadau cadarnhad.' + reset_password_instructions: 'Ailosod cyfarwyddiadau cyfrinair' + unlock_instructions: 'Cyfarwyddiadau Datgloi' + \ No newline at end of file From b1dd054fdb4454d4d5cb1b313619ee5876b3d0f6 Mon Sep 17 00:00:00 2001 From: mousey Date: Wed, 22 Sep 2010 01:25:15 +0800 Subject: [PATCH 74/79] More Welsh Localization --- config/locales/cy.yml | 143 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 config/locales/cy.yml diff --git a/config/locales/cy.yml b/config/locales/cy.yml new file mode 100644 index 000000000..b7d9c9af4 --- /dev/null +++ b/config/locales/cy.yml @@ -0,0 +1,143 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +cy: + hello: "Helo byd" + layouts: + application: + edit_profile: "golygu proffil" + logout: "arwyddo allan" + shared: + aspect_nav: + all_aspects: "Pob agwedd" + manage: "Rheoli" + manage_your_aspects: "Rheoli eich agweddau" + sub_header: + all_aspects: "Pob agwedd" + manage_aspects: "Rheloi agweddau" + publisher: + share: "Rhannu" + aspect_friends: + add_friends: "ychwanegu ffrindiau" + albums: + album: + you: "chi" + new_album: + create: "creu" + add_a_new_album: "Ychwanegu albwm newydd" + show: + edit_album: "Golygu Albwm" + albums: "albymau" + updated: "diweddarwyd" + by: "gan" + edit: + editing: "Wrthi'n golygu" + updated: "diweddarwyd" + are_you_sure: "Ydych chi'n sicr?" + delete_album: "Dileu Albwm" + cancel: "Cancel" + index: + home: "adref" + new_album: "Albwm Newydd" + create: + success: "Chi wedi creu albwm a'i enwi'n %{name}." + update: + success: "Mae albwm %{name} wedi'i olygu yn llwyddiannus." + failure: "Wedi methu golygu albwm %{name}." + destroy: + success: "Wedi dileu albwm %{name}." + aspects: + index: + photos: "lluniau" + show: + photos: "lluniau" + manage: + add_a_new_aspect: "Ychwanegwch agwedd" + add_a_new_friend: "Ychwanegwch ffrind newydd" + show: "Dangos" + update_aspects: "Diweddaru Agweddau" + requests: "Ceisiadau" + ignore_remove: "Anwybyddu/Tynnu" + new_aspect: + add_a_new_aspect: "Ychwanegwch agwedd newydd" + create: "Creu" + create: + success:"Cliciwch ar y plus ar y chwith i ddweud wrth Diaspora pwy all weld eich agwedd newydd." + users: + edit: + cancel: "Cancel" + update_profile: "Diweddaru Proffil" + home: "Adref" + diaspora_username: "FFUGENW DIASPORA" + info: "Gwybodaeth" + picture: "Llun" + editing_profile: "Golygu proffil" + albums: "Albymau" + you_dont_have_any_photos: "Does gennych chi ddim lluniau! Ewch i'r" + page_to_upload_some: "dudalen i uwchlwytho rhai." + comments: + comment: + ago: "yn ol" + new_comment: + comment: "Sylw" + photos: + show: + prev: "blaenorol" + full_size: "maint llawn" + next: "neasf" + edit_photo: "Golygu Llun" + delete_photo: "Dileu Llun" + are_you_sure: "Ydych chi'n sicr?" + comments: "sylwadau" + edit: + editing: "Golygu" + are_you_sure: "Ydych chi'n sicr?" + delete_photo: "Dileu Llun" + photo: + show_comments: "dangos sylwadau" + posted_a_new_photo_to: "postiwyd llun newydd i" + new: + new_photo: "Llun Newydd" + back_to_list: "Nol i'r Rhestr" + post_it: "postiwch e!" + registrations: + new: + sign_up: "Cofrestrwch" + status_messages: + new_status_message: + tell_me_something_good: "Dwi eisiau clywed rhwbeth da" + oh_yeah: "oh yeah!" + status_message: + show_comments: "dangos sylwadau" + delete: "Dileu" + are_you_sure: "Ydych chi'n sicr?" + show: + status_message: "Neges Statws" + comments: "sylwadau" + are_you_sure: "Ydych chi'n sicr?" + destroy: "Dinistrio" + view_all: "Gweld Pob Un" + message: "Neges" + owner: "Perchennog" + people: + index: + add_friend: "ychwanegu ffrind" + real_name: "enw llawn" + diaspora_handle: "bachyn diaspora" + thats_you: "dyna chi!" + friend_request_pending: "cais ffrind dan ystyriaeth" + you_have_a_friend_request_from_this_person: "mae'r person yma eisiau bod yn ffrind i chi" + new: + new_person: "Person Newydd" + back_to_list: "Nol i'r Rhestr" + show: + last_seen: "gwelwyd diwethaf: %{how_long_ago}" + friends_since: "yn ffrindiau ers: %{how_long_ago}" + save: "arbed" + are_you_sure: "Ydych chi'n sicr?" + remove_friend: "dileu ffrind" \ No newline at end of file From d55c0ae5511d5839fe1abb27dc470370f87c4d4c Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Thu, 23 Sep 2010 22:50:28 +0800 Subject: [PATCH 75/79] mongodb now in Fedora repos. --- README.md | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 0d5cee400..d215f5e98 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,14 @@ If you're on **Mac OS X**, you already have Ruby on your system. Yay! ### MongoDB +To install MongoDB on **Fedora**, use the official repositories + + sudo yum install mongodb-server + +Ensure that the server is started at system reboot: + + sudo chkconfig mongod on + To install MongoDB on **Ubuntu**, add the official MongoDB repository [here](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages). @@ -147,32 +155,6 @@ Then run: sudo chmod -Rv 777 /data/ -To install MongoDB on a x86_64 **Fedora** system, add the official MongoDB -repository from MongoDB -(http://www.mongodb.org/display/DOCS/CentOS+and+Fedora+Packages) into -/etc/yum.repos.d/10gen.repo: - - [10gen] - name=10gen Repository - baseurl=http://downloads.mongodb.org/distros/fedora/13/os/x86_64/ - gpgcheck=0 - enabled=1 - -Then use yum to install the packages: - - sudo yum install mongo-stable mongo-stable-server - -If you're running a 32-bit system, run `wget -http://fastdl.mongodb.org/linux/mongodb-linux-i686-1.6.2.tgz`. If you're -running a 64-bit system, run `wget -http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-1.6.2.tgz`. - - # extract - tar xzf mongodb-linux-i686-1.4.0.tgz - # create the required data directory - sudo mkdir -p /data/db - sudo chmod -Rv 777 /data/ - To install MongoDB on **Mac OS X**, run the following: brew install mongo @@ -266,7 +248,7 @@ run `service mongodb start`). If you installed the binary manually, run `sudo mongod` from where mongo is installed to start mongo. If you installed the Fedora package, MongoDB will need to be started via -`service mongodb start`. If you installed the binary manually, run `sudo +`service mongod start`. If you installed the binary manually, run `sudo mongod` from where Mongo is installed to start Mongo. If you installed the OsX package through "brew", MongoDB will need to be From c1242a0984da81e707872504590c861ef93f3e61 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Thu, 23 Sep 2010 23:00:35 +0800 Subject: [PATCH 76/79] typo fix --- config/app_config.yml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app_config.yml.example b/config/app_config.yml.example index 5ee07c405..75568dd11 100644 --- a/config/app_config.yml.example +++ b/config/app_config.yml.example @@ -12,7 +12,7 @@ default: socket_collection_name: 'websocket' pubsub_server: 'https://pubsubhubbub.appspot.com/' mongo_host: 'localhost' - mongo_post: 27017 + mongo_port: 27017 development: From ed6df7d1bf9fbf04e720fb1dd2ba30ff7fa03723 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 23 Sep 2010 10:24:10 -0700 Subject: [PATCH 77/79] Delete user.terse_url --- app/models/user.rb | 7 +------ spec/models/person_spec.rb | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 8f74e2233..2b74f437b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -259,14 +259,9 @@ class User aspect(:name => "Work") end - def terse_url - terse = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '') - terse = terse.chop! if terse[-1, 1] == '/' - terse - end def diaspora_handle - "#{self.username}@#{self.terse_url}" + "#{self.username}@#{APP_CONFIG[:terse_pod_url]}" end def downcase_username diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 3275d9245..721310409 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -24,7 +24,7 @@ describe Person do context 'remote people' do it 'stores the diaspora_handle in the database' do - @person.diaspora_handle.include?(@user.terse_url).should be false + @person.diaspora_handle.include?(APP_CONFIG[:terse_pod_url]).should be false end end end From 3d1ca6adc84d1b60bf8aa58421cc3e021af400db Mon Sep 17 00:00:00 2001 From: Dan Cirnat Date: Thu, 23 Sep 2010 00:35:46 +0800 Subject: [PATCH 78/79] Romanian locale added --- config/locales/devise.ro.yml | 41 ++++++++++ config/locales/ro.yml | 143 +++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 config/locales/devise.ro.yml create mode 100644 config/locales/ro.yml diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml new file mode 100644 index 000000000..63501ea7b --- /dev/null +++ b/config/locales/devise.ro.yml @@ -0,0 +1,41 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +ro: + errors: + messages: + not_found: "inexistent" + already_confirmed: "a fost deja confirmat" + not_locked: "nu a fost blocat" + + devise: + failure: + unauthenticated: 'Pentru a continuna, înregistrați-vă.' + unconfirmed: 'Pentru a continua, confirmați contul dvs.' + locked: 'Contul dvs. este blocat.' + invalid: 'Email sau parolă incorectă.' + invalid_token: 'Cheie de autentificare invalidă.' + timeout: 'Sesiunea dvs. a expirat, autentificați-vă din nou pentru a continua.' + inactive: 'Contul dvs. încă nu a fost activat.' + sessions: + signed_in: 'Autentificare cu succes.' + signed_out: 'Deconectare cu succes.' + passwords: + send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei.' + updated: 'Parolă schimbată cu success. Sunteți acum autentificat(ă).' + confirmations: + send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru confirmarea contului.' + confirmed: 'Contul dvs. a fost confirmat cu succes. Sunteți acum autentificat(ă).' + registrations: + signed_up: 'Sunteți autentificat(ă). Dacă este cazul, un mesaj de confirmare a fost trimis pe email-ul dvs.' + updated: 'Cont actualizat cu succes.' + destroyed: 'Pa! Contul dvs. a fost dezactivat cu succes. Sperăm să vă revedem în curând.' + unlocks: + send_instructions: 'În scurt timp veți primi un email cu instrucțiuni pentru deblocarea contului.' + unlocked: 'Cont deblocat cu succes. Sunteți acum autentificat(ă).' + mailer: + confirmation_instructions: 'Instrucțiuni pentru confirmarea contului.' + reset_password_instructions: 'Instrucțiuni pentru resetarea parolei.' + unlock_instructions: 'Instrucțiuni pentru deblocare contului.' diff --git a/config/locales/ro.yml b/config/locales/ro.yml new file mode 100644 index 000000000..8878a8fc7 --- /dev/null +++ b/config/locales/ro.yml @@ -0,0 +1,143 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + + +# 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. + +ro: + hello: "Bună, lume!" + layouts: + application: + edit_profile: "editare profil" + logout: "deconectare" + shared: + aspect_nav: + all_aspects: "Toate Aspectele" + manage: "Administrare" + manage_your_aspects: "Administrare Aspecte" + sub_header: + all_aspects: "Toate Aspectele" + manage_aspects: "Administrare Aspecte" + publisher: + share: "Distribuie" + aspect_friends: + add_friends: "adăugare prieteni" + albums: + album: + you: "tu" + new_album: + create: "crează" + add_a_new_album: "Album nou" + show: + edit_album: "Editare Album" + albums: "albume" + updated: "actualizat" + by: "de" + edit: + editing: "Editare" + updated: "actualizat" + are_you_sure: "Sunteți sigur(ă)?" + delete_album: "Șterge Album" + cancel: "Renuță" + index: + home: "acasă" + new_album: "Album Nou" + create: + success: "Ați creat un album numit %{name}." + update: + success: "Albumul %{name} a fost modificat cu succes." + failure: "Eroare la editarea albumului %{name}." + destroy: + success: "Albumul %{name} a fost șters." + aspects: + index: + photos: "poze" + show: + photos: "poze" + manage: + add_a_new_aspect: "Adaugă aspect" + add_a_new_friend: "Adadugă prieten" + show: "Arată" + update_aspects: "Actualizează Aspecte" + requests: "Cereri" + ignore_remove: "Ignoră/Șterge" + new_aspect: + add_a_new_aspect: "Adaugă aspect" + create: "Crează" + create: + success:"Click pe semnul plus în partea stângă pentru a indica cine poate accesa noul aspect." + users: + edit: + cancel: "Renunță" + update_profile: "Actualizează Profil" + home: "Home" + diaspora_username: "DIASPORA USERNAME" + info: "Info" + picture: "Poză" + editing_profile: "Editare profil" + albums: "Albume" + you_dont_have_any_photos: "Nu ai nici o fotografie! Mergi la" + page_to_upload_some: "pentru a încărca câteva." + comments: + comment: + ago: "în urmă" + new_comment: + comment: "Comentariu" + photos: + show: + prev: "precedent" + full_size: "mărime deplină" + next: "următor" + edit_photo: "Modifică Poză" + delete_photo: "Șterge Poză" + are_you_sure: "Sunteți sigur(ă)?" + comments: "comments" + edit: + editing: "Modificare" + are_you_sure: "Sunteți sigur(ă)?" + delete_photo: "Șterge poză" + photo: + show_comments: "arată comentarii" + posted_a_new_photo_to: "a postat o nouă poză în" + new: + new_photo: "Poză nouă" + back_to_list: "Înapoi la Listă" + post_it: "postează!" + registrations: + new: + sign_up: "Înregistrare" + status_messages: + new_status_message: + tell_me_something_good: "spune-mi ceva bun" + oh_yeah: "o, da!" + status_message: + show_comments: "arată comentarii" + delete: "Șterge" + are_you_sure: "Sunteți sigur(ă)?" + show: + status_message: "Mesaj Stare" + comments: "comentarii" + are_you_sure: "Sunteți sigur(ă)?" + destroy: "Distruge" + view_all: "Vezi Toate" + message: "Mesaj" + owner: "Proprietar" + people: + index: + add_friend: "adaugă prieten" + real_name: "nume real" + diaspora_handle: "diaspora id" + thats_you: "acesta ești tu!" + friend_request_pending: "cerere de prietenie nerezolvată" + you_have_a_friend_request_from_this_person: "aveți o cerere de prietenie din partea acestei persoane" + new: + new_person: "Persoană Nouă" + back_to_list: "Înapoi la Listă" + show: + last_seen: "văzut: %{how_long_ago}" + friends_since: "prieteni: %{how_long_ago}" + save: "salvează" + are_you_sure: "Sunteți sigur(ă)?" + remove_friend: "șterge prieten" From 4be2fdef8f95a1ef1b4af1d452305f7801041163 Mon Sep 17 00:00:00 2001 From: Dan Cirnat Date: Thu, 23 Sep 2010 01:03:25 +0800 Subject: [PATCH 79/79] Removed "sample" message from Romanian locale --- config/locales/ro.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 8878a8fc7..c99bd2a85 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -2,10 +2,6 @@ # licensed under the Affero General Public License version 3. See # the COPYRIGHT file. - -# 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. - ro: hello: "Bună, lume!" layouts: