From 8085a7bcd7ce5c872f578bd551e61f78f900e320 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 6 Nov 2010 14:04:18 +0100
Subject: [PATCH] fixes to be in sync with latest commits

---
 app/views/photos/_photo.haml                 | 2 +-
 app/views/shared/_notification.haml          | 2 +-
 app/views/shared/_stream_element.html.haml   | 2 +-
 app/views/shared/_stream_element.mobile.haml | 2 +-
 config/locales/diaspora/en.yml               | 7 ++++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index b5079fba0..385d85314 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -7,5 +7,5 @@
 %p.photo_description
   = post.caption
 
-= link_to "view all of #{post.person.real_name}'s photos", person_photos_path(post.person), :class => "small_text"
+= link_to t('.view_all', :name => post.person.real_name), person_photos_path(post.person), :class => "small_text"
 
diff --git a/app/views/shared/_notification.haml b/app/views/shared/_notification.haml
index 89bc610fb..153f78c2d 100644
--- a/app/views/shared/_notification.haml
+++ b/app/views/shared/_notification.haml
@@ -2,4 +2,4 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= link_to "New #{object.class.to_s} from #{object.person.real_name}", object_path(object.post)
+= link_to t('.new', :type => object.class.to_s, :from => object.person.real_name), object_path(object.post)
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index ed0dd2575..1f53a1047 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -13,7 +13,7 @@
         ➔
         %ul
           - if post.public?
-            %li= t('.the_world')
+            %li= t('the_world')
           - else
             - for aspect in current_user.aspects_with_post( post.id )
               %li= link_to aspect.name, aspect
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index e211e2edb..617861a7e 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -11,7 +11,7 @@
       .aspect
         ➔
         - if post.public?
-          = t('.the_world')
+          = t('the_world')
         - else
           = current_user.aspects_with_post( post.id ).join(', ')
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 2dad3e965..d2b7ad52c 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -58,7 +58,6 @@ en:
   shared:
       stream_element:
           show_comments: "show comments"
-          the_world: "the world"
       aspect_nav:
           manage: "Manage"
           manage_your_aspects: "Manage your Aspects"
@@ -92,6 +91,8 @@ en:
           outside: "Public messages will be available for others outside of Diaspora to see."
           logged_in: "logged in to %{service}"
           manage: "manage connected services"
+      notification:
+          new: "New %{type} from %{from}"
   aspects:
       no_friends_message:
           nobody: "We know you have friends — bring them to Diaspora!"
@@ -212,6 +213,8 @@ en:
           update_photo: "Update Photo"
       edit:
           editing: "Editing"
+      photo:
+          view_all: "view all of %{name}'s photos"
       new:
           new_photo: "New Photo"
           back_to_list: "Back to List"
@@ -250,8 +253,6 @@ en:
       new_status_message:
           tell_me_something_good: "tell me something good"
           oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "show comments"
       show:
           destroy: "Destroy"
       helper: