Merge remote branch 'upstream/master'

app/views/albums/edit.html.haml

@@ -9,7 +9,7 @@
   = album.error_messages
 
   %h4
-    Album name
+    = t('.album_name')
     = album.text_field :name
 
   - for photo in @album.photos
@@ -18,7 +18,7 @@
   .submit_block
     = link_to t('.cancel'), root_path
     or
-    = album.submit
+    = album.submit t('.update_album')
 
 .button.delete
   = link_to t('.delete_album'), @album, :confirm => t('.are_you_sure'), :method => :delete

app/views/aspects/_new_aspect.haml

@@ -9,7 +9,7 @@
   = form_for Aspect.new do |aspect|
     = aspect.error_messages
     %p
-      = aspect.label :name
+      = aspect.label :name , t('.name')
       = aspect.text_field :name
       = aspect.submit t('.create'), :class => 'button'
 

app/views/devise/sessions/new.html.haml

@@ -1,22 +1,23 @@
 .span-10.append-1.last
   .floating
-    %h3 Login
+    %h3 
+      = t('.login')
     = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
       #user
         %p.username
-          = f.label :username
+          = f.label :username , t('.username')
           = f.text_field :username
         %p.user_network
           ="@#{APP_CONFIG[:terse_pod_url]}"
 
         %p
-          = f.label :password
+          = f.label :password , t('.password')
           = f.password_field :password
       /%p
       /- if devise_mapping.rememberable?
       /  = f.check_box :remember_me
-      /  = f.label :remember_me
+      /  = f.label :remember_me , t('.remember_me')
-      = f.submit "Sign in"
+      = f.submit t('.sign_in')
     
     %p
       = render :partial => "devise/shared/links"

app/views/devise/shared/_links.haml

@@ -1,11 +1,11 @@
 - if controller_name != 'sessions'
-  = link_to "Sign in", new_session_path(resource_name)
+  = link_to t('.sign_in'), new_session_path(resource_name)
   %br/
 - if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Sign up", new_registration_path(resource_name)
+  = link_to t('.sign_up'), new_registration_path(resource_name)
   %br/
 - if devise_mapping.recoverable? && controller_name != 'passwords'
-  = link_to "Forgot your password?", new_password_path(resource_name)
+  = link_to t('.forgot_your_password'), new_password_path(resource_name)
   %br/
 - if devise_mapping.confirmable? && controller_name != 'confirmations'
   = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)

app/views/layouts/application.html.haml

@@ -51,15 +51,15 @@
         - if current_user
           #global_search
             = form_tag(people_path, :method => 'get') do
-              = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5
+              = text_field_tag 'q', nil, :placeholder => t('.search'), :type => 'search', :results => 5
 
           %ul#user_menu
             .avatar
               = owner_image_tag
             = link_to current_user.real_name, '#'
-            %li= link_to "view profile", current_user.person
+            %li= link_to t('.view_profile'), current_user.person
-            %li= link_to "edit profile", edit_person_path(current_user.person)
+            %li= link_to t('.edit_profile'), edit_person_path(current_user.person)
-            %li= link_to "account settings", edit_user_path(current_user)
+            %li= link_to t('.account_settings'), edit_user_path(current_user)
             %li= link_to t('.logout.'), destroy_user_session_path
 
           = render "shared/aspect_nav"

app/views/people/edit.html.haml

@@ -5,16 +5,16 @@
 
 #section_header
   %h2
-    Settings
+    = t('.settings')
   %ul#settings_nav
-    %li=link_to 'Profile', edit_person_path(current_user.person)
+    %li=link_to t('.profile'), edit_person_path(current_user.person)
-    %li=link_to 'Account', edit_user_path(current_user)
+    %li=link_to t('.account'), edit_user_path(current_user)
-    %li=link_to 'Services', services_path
+    %li=link_to t('.services'), services_path
 
 .span-19.prepend-5.last
   = form_for @person, :html => { :multipart => true } do |person|
     %h3
-      Your Profile
+      = t('.your_profile')
       .description
         This info will be available to whomever you connect with on Diaspora.
 
@@ -22,26 +22,26 @@
 
     = person.fields_for :profile do |profile|
       %h4
-        Your name
+        = t('.your_name')
-        = profile.text_field :first_name, :value => @profile.first_name, :placeholder => "First name"
+        = profile.text_field :first_name, :value => @profile.first_name, :placeholder => t('.first_name')
-        = profile.text_field :last_name, :value => @profile.last_name, :placeholder => "Last name"
+        = profile.text_field :last_name, :value => @profile.last_name, :placeholder => t('.last_name')
 
       %h4
-        Your gender
+        = t('.your_gender')
         %br
         = select_tag 'person[profile][gender]', options_for_select(["","Female","Male"], @person.profile.gender)
 
       %h4
-        Your birthday
+        = t('.your_birthday')
         %br
         = select_date @person.profile.birthday, :order => [:month, :day, :year], :start_year => 1930, :end_year => 2000
 
       %h4
-        Your bio
+        = t('.your_bio')
-        = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => "Fill me out"
+        = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('.fill_me_out')
 
       %h4
-        Your photo
+        = t('.your_photo')
         = render 'people/profile_photo_upload', :form => profile
 
     .submit_block

app/views/registrations/edit.html.haml

@@ -21,8 +21,8 @@
     %br/
     = f.password_field :current_password
   %p
-  = f.submit "Update"
+  = f.submit t('.update')
-%h3 Cancel my account
+%h3 t('.cancel_my_account')
 %p
-  Unhappy? #{link_to "Cancel my account", registration_path(resource_name), :confirm => "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 "Back", :back
+= link_to t('.back'), :back

app/views/registrations/new.html.haml

@@ -1,20 +1,20 @@
 .span-12.prepend-6.last
   .floating
     %h3
-      Sign up for Diaspora
+      = t('.sign_up_for_diaspora')
     = image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
     = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
       %p
-        = f.label :username
+        = f.label :username , t('.username')
         = f.text_field :username
       %p
-        = f.label :email
+        = f.label :email , t('.email')
         = f.text_field :email
       %p
-        = f.label :password
+        = f.label :password , t('.password')
         = f.password_field :password
       %p
-        = f.label :password_confirmation
+        = f.label :password_confirmation , t('.password_confirmation')
         = f.password_field :password_confirmation
 
       = f.submit t('.sign_up')
@@ -22,7 +22,7 @@
 
   .floating
     %h3
-      Upload an existing Diaspora account
+      = t('.upload_existing_account')
 
     = form_tag '/users/import', :multipart => true do
 
@@ -38,5 +38,5 @@
 
       %label Select File
       = file_field 'upload', 'file'
-      = submit_tag "Upload"
+      = submit_tag t('.upload')
 

app/views/requests/_new_request.haml

@@ -18,7 +18,7 @@
     %i= t '.your_diaspora_username_is', :diaspora_handle  => current_user.diaspora_handle
 
     %p
-      = fr_request.label :destination_url, t(".friends_username")
+      = fr_request.label :destination_url, t('.friends_username')
       = fr_request.text_field :destination_url
     = fr_request.hidden_field :aspect_id, :value => aspect.id
 
@@ -27,5 +27,5 @@
     - if defined?(manage)
       = hidden_field_tag :manage, true
 
-    = fr_request.submit
+    = fr_request.submit t('.create_request')
 

app/views/services/index.html.haml

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

app/views/shared/_author_info.html.haml

@@ -13,4 +13,4 @@
               - for aspect in current_user.aspects_with_post( post.id )
                 %li= link_to aspect.name, aspect
 
-    = link_to "view profile", person_path(person)
+    = link_to t('.view_profile'), person_path(person)

app/views/users/edit.html.haml

@@ -14,48 +14,52 @@
 
 #section_header
   %h2
-    Settings
+    = t('.settings')
   %ul#settings_nav
-    %li=link_to 'Profile', edit_person_path(current_user.person)
+    %li=link_to t('.profile'), edit_person_path(current_user.person)
-    %li=link_to 'Account', edit_user_path(current_user)
+    %li=link_to t('.account'), edit_user_path(current_user)
-    %li=link_to 'Services', services_path
+    %li=link_to t('.services'), services_path
 
 .span-19.prepend-5.last
-  %h2 Account
+  %h2
+    = t('.account')
 
-  = link_to "invite friends", new_user_invitation_path(current_user)
+  = link_to t('.invite_friends'), new_user_invitation_path(current_user)
 
   %br
   %br
   %br
 
-  %h3 Change Password
+  %h3 
+    = t('.change_password')
   = form_for @user do |f|
     = f.error_messages
 
     %p
-      = f.label :password, "New Password"
+      = f.label :password, t('.new_password')
       = f.password_field :password
     %p
-      = f.label :password_confirmation
+      = f.label :password_confirmation, t('.password_confirmation')
       = f.password_field :password_confirmation
 
     .submit_block
-      = link_to "Cancel", edit_user_path(current_user)
+      = link_to t('.cancel'), edit_user_path(current_user)
       or
-      = f.submit 'Change password'
+      = f.submit t('.change_password')
 
-  %h3 Change language
+  %h3 
+    = t('.change_language')
   = form_for @user do |f|
     = f.error_messages
 
     %p
       = f.select :language, available_language_options
-      = f.submit 'Change language'
+      = f.submit t('.change_language')
 
   %br
 
-  %h3 Export Data
+  %h3 
+    = t('.export_data')
   = link_to "download my xml", users_export_path, :class => "button"
   = link_to "download my photos", users_export_photos_path, :class => "button"
 
@@ -63,7 +67,8 @@
   %br
   %br
 
-  %h3 Close Account
+  %h3 
-  = link_to "Close Account", current_user,
+    = t('.close_account')
-              :confirm => "Are you sure?", :method => :delete,
+  = link_to t('.close_account'), current_user,
+              :confirm => t('.are_you_sure'), :method => :delete,
               :class => "button"

config/locales/devise/devise.en.yml

@@ -15,6 +15,11 @@ en:
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account was not activated yet.'
     sessions:
+      new:
+        login: 'Login'
+        username: 'Username'
+        password: 'Password'
+        sign_in: 'Sign in'
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -43,4 +48,9 @@ en:
         subject: 'Unlock Instructions'
       invitation:
         subject: 'A friend wants you to join Diaspora!'
-
+    shared:
+      links:
+        sign_in: 'Sign in'
+        sign_up: 'Sign up'
+        forgot_your_password: 'Forgot your password?'
+        

config/locales/diaspora/en.yml

@@ -39,7 +39,10 @@ en:
            people_on_pod_are_aware_of: " people on pod are aware of"
   layouts:
       application:
+          view_profile: "view profile"
           edit_profile: "edit profile"
+          account_settings: "account settings"
+          search: "Search"
           logout: "logout"
   shared:
       aspect_nav:
@@ -66,8 +69,10 @@ en:
           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"
@@ -102,6 +107,7 @@ en:
           ignore_remove: "Ignore/Remove"
       new_aspect:
           add_a_new_aspect: "Add a new aspect"
+          name: "Name"
           create: "Create"
       create:
           success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
@@ -122,6 +128,19 @@ en:
   users:
       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"
       destroy: "Account successfully closed."
       getting_started:
           'step_1':
@@ -168,6 +187,13 @@ en:
   registrations:
       new:
           sign_up: "Sign up"
+          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:
@@ -220,6 +246,19 @@ en:
           no_posts: "no posts to display!"
           add_friend: "add friend"
       edit:
+          settings: "Settings"
+          your_profile: "Your profile"
+          your_name: "Your name"
+          first_name: "First name"
+          last_name: "Last name"
+          your_gender: "Your gender"
+          your_birthday: "Your birthday"
+          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"
@@ -237,6 +276,7 @@ en:
           enter_a_diaspora_username: "Enter a Diaspora username:"
           your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
           friends_username: "Friend's username"
+          create_request: "Create request"
       destroy:
           success: "You are now friends."
           error: "Please select an aspect!"
@@ -249,3 +289,9 @@ 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"