From b84b6ea9e43b8f6004d2d12f0de3b543af67935e Mon Sep 17 00:00:00 2001 From: MrZYX <pr0fkill@gmail.com> Date: Fri, 3 Dec 2010 20:20:04 +0100 Subject: [PATCH] some fixes to translations --- app/views/invitations/new.html.haml | 4 ++-- app/views/people/show.html.haml | 4 ++-- app/views/status_messages/show.html.haml | 2 +- config/locales/diaspora/en.yml | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/invitations/new.html.haml b/app/views/invitations/new.html.haml index 98ea0dd1ed..b469db55e2 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 329bb6db40..d4d4647093 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 9c854f1453..94f9327e7f 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 e5ccbe601f..3a0f04da14 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" -- GitLab