Common translations are used without the namespace

app/helpers/application_helper.rb

@@ -34,7 +34,7 @@ module ApplicationHelper
   end
 
   def how_long_ago(obj)
-    "#{time_ago_in_words(obj.created_at)} #{t('.ago')}"
+    "#{time_ago_in_words(obj.created_at)} #{t('ago')}"
   end
 
   def person_url(person)

app/views/albums/edit.html.haml

@@ -16,10 +16,10 @@
     .photo_edit_block= image_tag photo.url(:thumb_medium)
 
   .submit_block
-    = link_to t('.cancel'), root_path
+    = link_to t('cancel'), root_path
     or
     = album.submit t('.update_album')
 
 .button.delete
-  = link_to t('.delete_album'), @album, :confirm => t('.are_you_sure'), :method => :delete
+  = link_to t('.delete_album'), @album, :confirm => t('are_you_sure'), :method => :delete
 

app/views/albums/show.html.haml

@@ -42,5 +42,5 @@
   .album_id{:id => @album_id, :style => "display:hidden;"}
 
   -unless current_user.person.id == @person.id
-    %h4= "#{t('.by')} #{@person.real_name}"
+    %h4= "#{t('by')} #{@person.real_name}"
 

app/views/comments/_comment.html.haml

@@ -9,4 +9,4 @@
       = link_to post.person.real_name, post.person
     = post.text
     %div.time
-      = "#{time_ago_in_words(post.updated_at)} #{t('.ago')}"
+      = "#{time_ago_in_words(post.updated_at)} #{t('ago')}"

app/views/invitations/_new.haml

@@ -7,7 +7,7 @@
     = t('.if_they_accept_info')
   = form_for User.new, :url => invitation_path(User) do |invite|
     %p
-      = invite.label :email , t('.email')
+      = invite.label :email , t('email')
       = invite.text_field :email
     = t('.to')
     - unless @aspect.is_a? Aspect

app/views/invitations/new.html.haml

@@ -3,7 +3,7 @@
 = form_for User.new, :url => invitation_path(User) do |f|
   = devise_error_messages!
   %p
-    = f.label :email , t('.email')
+    = f.label :email , t('email')
     = f.text_field :email
   %p= f.submit t('.send_an_invitation')
 /= link_to "Home", after_sign_in_path_for(resource_name)

app/views/people/edit.html.haml

@@ -5,11 +5,11 @@
 
 #section_header
   %h2
-    = t('.settings')
+    = t('settings')
   %ul#settings_nav
-    %li=link_to t('.profile'), edit_person_path(current_user.person)
-    %li=link_to t('.account'), edit_user_path(current_user)
-    %li=link_to t('.services'), services_path
+    %li=link_to t('profile'), edit_person_path(current_user.person)
+    %li=link_to t('account'), edit_user_path(current_user)
+    %li=link_to t('services'), services_path
 
 .span-19.prepend-5.last
   = form_for @person, :html => { :multipart => true } do |person|
@@ -45,6 +45,6 @@
         = render 'people/profile_photo_upload', :form => profile
 
     .submit_block
-      = link_to t('.cancel'), edit_user_path(current_user)
-      = t('.or')
+      = link_to t('cancel'), edit_user_path(current_user)
+      = t('or')
       = person.submit t('.update_profile')

app/views/people/show.html.haml

@@ -28,7 +28,7 @@
                 %li= link_to aspect.name, aspect
 
     - if @person != current_user.person && @contact
-      = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button"
+      = link_to t('.remove_friend'), @person, :confirm => t('are_you_sure'), :method => :delete, :class => "button"
 
     - if @person == current_user.person
       %b

app/views/photos/_photo.haml

@@ -20,7 +20,7 @@
 
       - if current_user.owns?(post)
         .right
-          = link_to t('.delete'), photo_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+          = link_to t('delete'), photo_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     - if !post.album_id.nil?
       =t('.posted_a_new_photo_to')

app/views/photos/edit.html.haml

@@ -19,5 +19,5 @@
       = link_to "⇧ #{@album.name}", album_path(@album)
     -if current_user.owns? @album
       .button.right
-        = link_to t('.delete_photo'), @photo, :confirm => t('.are_you_sure'), :method => :delete
+        = link_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete
 

app/views/registrations/edit.html.haml

@@ -24,5 +24,5 @@
   = f.submit t('.update')
 %h3 t('.cancel_my_account')
 %p
-  Unhappy? #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('.are_you_sure'), :method => :delete}.
+  Unhappy? #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}.
 = link_to t('.back'), :back

app/views/services/index.html.haml

@@ -4,15 +4,15 @@
 
 #section_header
   %h2
-    = t('.settings')
+    = t('settings')
   %ul#settings_nav
-    %li=link_to t('.profile'), edit_person_path(current_user.person)
-    %li=link_to t('.account'), edit_user_path(current_user)
-    %li=link_to t('.services'), services_path
+    %li=link_to t('profile'), edit_person_path(current_user.person)
+    %li=link_to t('account'), edit_user_path(current_user)
+    %li=link_to t('services'), services_path
 
 .span-19.prepend-5.last
   %h2
-    = t('.services')
+    = t('services')
 
   %ul
     - for service in @services

app/views/shared/_publisher.haml

@@ -48,7 +48,7 @@
           = status.submit t('.share'), :title => "Share with #{aspect}"
 
     #publisher_photo_upload
-      = t('.or')
+      = t('or')
       = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id), :album_id => nil
     
 

app/views/status_messages/_status_message.html.haml

@@ -21,7 +21,7 @@
       - if current_user.owns?(post)
         .right
           = render "shared/reshare", :post => post, :current_user => current_user
-          = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+          = link_to t('delete'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     = make_links(post.message)
 

app/views/status_messages/show.html.haml

@@ -13,7 +13,7 @@
 
   - if current_user.owns? @status_message
     %p
-      = link_to t('.destroy'), @status_message, :confirm => t('.are_you_sure'), :method => :delete
+      = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
 
 .span-9.last
   #stream.show

app/views/users/edit.html.haml

@@ -14,15 +14,15 @@
 
 #section_header
   %h2
-    = t('.settings')
+    = t('settings')
   %ul#settings_nav
-    %li=link_to t('.profile'), edit_person_path(current_user.person)
-    %li=link_to t('.account'), edit_user_path(current_user)
-    %li=link_to t('.services'), services_path
+    %li=link_to t('profile'), edit_person_path(current_user.person)
+    %li=link_to t('account'), edit_user_path(current_user)
+    %li=link_to t('services'), services_path
 
 .span-19.prepend-5.last
   %h2
-    = t('.account')
+    = t('account')
 
   = link_to t('.invite_friends'), new_user_invitation_path(current_user)
 
@@ -39,12 +39,12 @@
       = f.label :password, t('.new_password')
       = f.password_field :password
     %p
-      = f.label :password_confirmation, t('.password_confirmation')
+      = f.label :password_confirmation, t('password_confirmation')
       = f.password_field :password_confirmation
 
     .submit_block
-      = link_to t('.cancel'), edit_user_path(current_user)
-      = t('.or')
+      = link_to t('cancel'), edit_user_path(current_user)
+      = t('or')
       = f.submit t('.change_password')
 
   %h3 
@@ -70,5 +70,5 @@
   %h3 
     = t('.close_account')
   = link_to t('.close_account'), current_user,
-              :confirm => t('.are_you_sure'), :method => :delete,
+              :confirm => t('are_you_sure'), :method => :delete,
               :class => "button"

config/locales/diaspora/en.yml

@@ -6,6 +6,23 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
+
+  settings: "Settings"
+  profile: "Profile"
+  account: "Account"
+  services: "Services"
+  cancel: "Cancel"
+  delete: "Delete"  
+  or: "or"
+  by: "by"
+  ago: "ago"
+  username: "Username"
+  email: "Email"
+  home: "Home"
+  password: "Password"
+  password_confirmation: "Password confirmation"
+  are_you_sure: "Are you sure?"
+  
   activemodel:
       errors:
           models:
@@ -26,9 +43,6 @@ en:
       helper:
           unknown_person: "unknown person"
           new_requests: "new requests"
-  dashboards:
-      helper:
-          home: "home"
   error_messages:
       helper:
           invalid_fields: "Invalid Fields"
@@ -54,7 +68,6 @@ en:
           manage_aspects: "Manage Aspects"
       publisher:
           share: "Share"
-          or: "or"
           post_a_message_to: "Post a message to %{aspect}"
           make_public: "make public"
       aspect_friends:
@@ -66,6 +79,8 @@ en:
           invitations_left: '(%{count} left)'
       reshare:
           reshare: 'Reshare'
+      author_info:
+          view_profile: 'View profile'
   albums:
       album:
           you: "you"
@@ -76,17 +91,13 @@ en:
           edit_album: "Edit Album"
           albums: "albums"
           updated: "updated"
-          by: "by"
       edit:
           album_name: "Album name"
           editing: "Editing"
           updated: "updated"
           update_album: "Update album"
-          are_you_sure: "Are you sure?"
           delete_album: "Delete Album"
-          cancel: "Cancel"
       index:
-          home: "home"
           new_album: "New Album"
       create:
           success: "You've created an album called %{name}."
@@ -138,19 +149,11 @@ en:
       edit:
           editing_profile: "Editing profile"
           invite_friends: "Invite friends"
-          are_you_sure: "Are you sure?"
           export_data: "Export Data"
           close_account: "Close Account"
           change_language: "Change Language"
           change_password: "Change Password"
           new_password: "New Password"
-          password_confirmation: "Password confirmation"
-          settings: "Settings"
-          profile: "Profile"
-          account: "Account"
-          services: "Services"
-          cancel: "Cancel"
-          or: "or"
       destroy: "Account successfully closed."
       getting_started:
           signup_steps: "Complete your sign-up by doing these things:"
@@ -158,10 +161,7 @@ en:
               albums: "Albums"
               you_dont_have_any_photos: "You don't have any photos!  Go to the"
               page_to_upload_some:  "page to upload some."
-              or: "or"
   comments:
-      comment:
-          ago: "ago"
       new_comment:
           comment: "Comment"
   photos:
@@ -171,17 +171,13 @@ en:
           next: "next"
           edit_photo: "Edit Photo"
           delete_photo: "Delete Photo"
-          are_you_sure: "Are you sure?"
           comments: "comments"
       edit:
           editing: "Editing"
-          are_you_sure: "Are you sure?"
           delete_photo: "Delete Photo"
       photo:
           show_comments: "show comments"
           posted_a_new_photo_to: "posted a new photo to"
-          delete: "Delete"
-          are_you_sure: "Are you sure?"
       new:
           new_photo: "New Photo"
           back_to_list: "Back to List"
@@ -201,10 +197,6 @@ en:
           sign_up_for_diaspora: "Sign up for Diaspora"
           upload_existing_account: "Upload an existing Diaspora account"
           upload: "Upload"
-          username: "Username"
-          email: "Email"
-          password: "Password"
-          password_confirmation: "Password confirmation"
       create:
           success: "You've joined Diaspora!"
   invitations:
@@ -216,7 +208,6 @@ en:
           invitation_token_invalid: 'The invitation token provided is not valid!'
           updated: 'Your password was set successfully. You are now signed in.'
       new:
-          email: 'Email'
           invite_someone_to_join: 'Invite someone to join Diaspora!'
           if_they_accept_info: 'if they accept, they will be added to the aspect you invited them'
           to: 'To'
@@ -229,13 +220,9 @@ en:
           oh_yeah: "oh yeah!"
       status_message:
           show_comments: "show comments"
-          delete: "Delete"
-          are_you_sure: "Are you sure?"
-          ago: "ago"
       show:
           status_message: "Status Message"
           comments: "comments"
-          are_you_sure: "Are you sure?"
           destroy: "Destroy"
           view_all: "View All"
           message: "Message"
@@ -260,13 +247,11 @@ en:
           last_seen: "last seen: %{how_long_ago}"
           friends_since: "friends since: %{how_long_ago}"
           save: "save"
-          are_you_sure: "Are you sure?"
           remove_friend: "remove friend"
           no_posts: "no posts to display!"
           add_friend: "add friend"
           edit_my_profile: "Edit my profile"
       edit:
-          settings: "Settings"
           info_available_to: "This info will be available to whomever you connect with on Diaspora."
           your_profile: "Your profile"
           your_name: "Your name"
@@ -277,12 +262,7 @@ en:
           your_bio: "Your bio"
           fill_me_out: "Fill me out"
           your_photo: "Your photo"
-          profile: "Profile"
-          account: "Account"
-          services: "Services"
-          cancel: "Cancel"
           update_profile: "Update Profile"
-          home: "Home"
           diaspora_username: "DIASPORA USERNAME"
           info: "Info"
           picture: "Picture"
@@ -290,7 +270,6 @@ en:
           albums: "Albums"
           you_dont_have_any_photos: "You don't have any photos!  Go to the"
           page_to_upload_some:  "page to upload some."
-          or: "or"
   requests:
       new_request:
           add_a_new_friend_to: "Add a new friend to"
@@ -310,9 +289,3 @@ en:
           already_friends: "You are already friends with %{destination_url}!"
           success: "A friend request was sent to %{destination_url}."
           horribly_wrong: "Something went horribly wrong."
-  services:
-      index:
-          settings: "Settings"
-          profile: "Profile"
-          account: "Account"
-          services: "Services"