From c3a79f7298e9f64c63f511620d1116b4870e0757 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 18 Dec 2010 14:52:17 +0100
Subject: [PATCH] some fixes to translations

---
 app/controllers/users_controller.rb   | 2 +-
 app/views/people/_aspect_list.haml    | 4 ++--
 app/views/people/share_with.html.haml | 4 ++--
 config/locales/diaspora/en.yml        | 7 ++++++-
 lib/youtube_titles.rb                 | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5d2179531..34a895578 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -25,7 +25,7 @@ class UsersController < ApplicationController
     # change email notifications
     if params[:user][:disable_mail]
       @user.update_attributes(:disable_mail => params[:user][:disable_mail])
-      flash[:notice] = I18n.t 'users.update.email_notification_changed'
+      flash[:notice] = I18n.t 'users.update.email_notifications_changed'
     # change passowrd
     elsif params[:user][:password] && params[:user][:password_confirmation]
       if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
diff --git a/app/views/people/_aspect_list.haml b/app/views/people/_aspect_list.haml
index 06150e1b5..01250c312 100644
--- a/app/views/people/_aspect_list.haml
+++ b/app/views/people/_aspect_list.haml
@@ -34,7 +34,7 @@
     - for aspect in aspects_with_person
       = render :partial => 'aspects/aspect_badge', :locals => {:aspect => aspect}
     .right
-      = link_to "edit aspect membership", "#", :id=> "edit_contact_aspects"
+      = link_to t('.edit_membership'), "#", :id=> "edit_contact_aspects"
 
   .edit{:class => ("hidden" if contact)}
 
@@ -46,5 +46,5 @@
 
     - if contact
       .right
-        = link_to "done editing", "#", :id => "done_contact_aspects"
+        = link_to t('aspects.aspect_contacts.done_editing'), "#", :id => "done_contact_aspects"
       = link_to t('people.profile_sidebar.remove_contact'), person, :confirm => t('are_you_sure'), :method => :delete
diff --git a/app/views/people/share_with.html.haml b/app/views/people/share_with.html.haml
index 9d535847e..b6fc5d144 100644
--- a/app/views/people/share_with.html.haml
+++ b/app/views/people/share_with.html.haml
@@ -6,9 +6,9 @@
   .share_with_header
     = person_image_link(@person, :size => :thumb_medium)
     %h3
-      = "Start sharing with #{@person.name}"
+      = t('.share_with', :name => @person.name)
     %p
-      = "Once #{@person.first_name} accepts, you'll start seeing each other's posts on Diaspora"
+      = t('.accepts', :name => @person.first_name)
 
   = render :partial => 'share_with_pane',
     :locals => {:person => @person,
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index f7306f509..f8c60f5c5 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -233,7 +233,7 @@ en:
           password_not_changed: "Password Change Failed"
           language_changed: "Language Changed"
           language_not_changed: "Language Change Failed"
-          email_notifications_changed: "Language Change Failed"
+          email_notifications_changed: "Email notifications changed"
       public:
           does_not_exist: "User %{username} does not exist!"
   comments:
@@ -373,6 +373,11 @@ en:
       helper:
            results_for: " results for %{params}"
            people_on_pod_are_aware_of: " people on pod are aware of"
+      share_with:
+           share_with: "Start sharing with %{name}"
+           accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
+      aspect_list:
+           edit_membership: "edit aspect membership"
   requests:
       manage_aspect_contacts:
           manage_within: "Manage contacts within"
diff --git a/lib/youtube_titles.rb b/lib/youtube_titles.rb
index c17a8c948..55ecab4cf 100644
--- a/lib/youtube_titles.rb
+++ b/lib/youtube_titles.rb
@@ -7,7 +7,7 @@ module YoutubeTitles
     unless title.nil?
       title = title.to_s[7..-9]
     end
-    title || I18n.t('application.helper.youtube_title.unknown')
+    title || I18n.t('application.helper.video_title.unknown')
   end
   def get_youtube_title text
     self[:youtube_titles] ||= {}