diff --git a/app/views/invitations/new.html.haml b/app/views/invitations/new.html.haml index 98ea0dd1ed59003eb7613754aefd748e53d5391b..b469db55e2e48e83bd6558e9b3de801fe99a74c8 100644 --- a/app/views/invitations/new.html.haml +++ b/app/views/invitations/new.html.haml @@ -16,12 +16,12 @@ = form_for User.new, :url => invitation_path(User) do |invite| %h4 - Email + = t('email') = invite.text_field :email, :title => t('.comma_seperated_plz') %br %h4 - Aspect + = t('.aspect') - unless @aspect.is_a? Aspect = invite.select(:aspects, @aspects_dropdown_array) - else diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 329bb6db4025f3ddad37926f4cbaa549dd1107df..d4d4647093705277ac43cd73e99730c13a976026 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -24,11 +24,11 @@ - if @posts.count > 0 -if @post_type == :photos %h4 - Photos + = t('_photos') = render 'photos/index', :photos => @posts - else %h4 - Recent Posts + = t('.recent_posts') = render 'shared/stream', :posts => @post_hashes = will_paginate @posts diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index 9c854f1453e0529f922c31f258deb51e21794866..94f9327e7f32ba54551fe2bfc060b413eb0be2d0 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/show.html.haml @@ -18,7 +18,7 @@ %hr - = link_to "permalink", post_path(@status_message) + = link_to t('.permalink'), post_path(@status_message) %br - if current_user.owns? @status_message = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index e5ccbe601f1d996076b00fa08a9a0ffd35ed558f..3a0f04da1495668c9f88691b3e3d9aeb0b3765bf 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -286,6 +286,7 @@ en: personal_message: "Personal message" send_an_invitation: "Send an invitation" send_invitation: "Send invitation" + aspect: "Aspect" check_token: not_found: "Invitation token not found" edit: @@ -318,6 +319,7 @@ en: already_requested: "You have already sent a request to %{name}." does_not_exist: "Person does not exist!" not_connected: "You are not connected with this person" + recent_posts: "Recent Posts" edit: info_available_to: "This info will be available to whomever you connect with on Diaspora." your_profile: "Your profile"