diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml index 10a418741..a86807c22 100644 --- a/app/views/shared/_author_info.html.haml +++ b/app/views/shared/_author_info.html.haml @@ -8,12 +8,12 @@ ➔ %ul - if post.public? - the world + =t('the_world') - else - for aspect in current_user.aspects_with_post( post.id ) %li= link_to aspect.name, aspect #person_nav_links = link_to t('.view_profile'), person_path(person) = link_to t('_photos'), person_photos_path(person) - = link_to 'status messages', person_status_messages_path(person) - = "viewing: #{@post_type.to_s.titleize}" if defined?(@post_type) + = link_to t('.status messages'), person_status_messages_path(person) + = "#{t('.viewing')}: #{@post_type.to_s.titleize}" if defined?(@post_type) diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml index 85fd62688..0b2f75347 100644 --- a/app/views/status_messages/_status_message.haml +++ b/app/views/status_messages/_status_message.haml @@ -3,3 +3,4 @@ -# the COPYRIGHT file. = markdownify(post.message) + diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c6ec8a830..b8d6fcc0b 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -81,6 +81,8 @@ en: reshare: "Reshare" author_info: view_profile: "View profile" + status_messages: "status messages" + viewing: "viewing" add_friend_dropdown: add_to: "add to %{aspect}" public_explain: @@ -204,10 +206,15 @@ en: new_status_message: tell_me_something_good: "tell me something good" oh_yeah: "oh yeah!" + status_message: + show_comments: "show comments" + the_world: "the world" show: destroy: "Destroy" helper: no_message_to_display: "No message to display." + index: + status_messages: "status messages" people: person: add_friend: "add friend" @@ -224,6 +231,9 @@ en: request_people: "If you'd like, you can request to place him/her in one of your aspects." already_requested: "You have already sent a request to %{name}." does_not_exist: "Person does not exist!" + bio_epic: "bio-epic" + gender: "gender" + born: "born" edit: info_available_to: "This info will be available to whomever you connect with on Diaspora." your_profile: "Your profile"