Merge branch 'master' of github.com:diaspora/diaspora into fb

Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb

app/views/shared/_sub_header.haml

@@ -7,11 +7,11 @@
       - else
         %h1
           - if @aspect == :all
-            = link_to "All Aspects", root_path
-          - elsif @aspect == :manage
-            = "Manage Aspects"
+            = link_to t('.all_aspects'), root_path
           - elsif @aspect == :public
             = "Public"
+          - elsif @aspect == :manage
+            = link_to t('.manage_aspects'), root_path
           - else
             = link_to @aspect.name, @aspect
 

app/views/shared/log.haml

@@ -2,5 +2,4 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = @log.to_s

app/views/status_messages/_new_status_message.haml

@@ -2,9 +2,8 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for StatusMessage.new, :remote => true do |f|
   = f.error_messages
   %p
-    = f.text_field :message, :value => "tell me something good"
-    = f.submit 'oh yeah!', :class => 'button'
+    = f.text_field :message, :value => t('.tell_me_something_good')
+    = f.submit t('.oh_yeah'), :class => 'button'

app/views/status_messages/_status_message.html.haml

@@ -2,25 +2,23 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
 
   = person_image_link(post.person)
 
   .content
     %span.from
-      = link_to post.person.real_name, post.person 
+      = link_to post.person.real_name, post.person
       = post.message
-      
+
     .info
       %span.time= link_to(how_long_ago(post), object_path(post))
       \--
-      = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
+      = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
 
-    = render "comments/comments", :post => post 
+    = render "comments/comments", :post => post
 
   - if current_user.owns?(post)
     .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"
-      = 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"
+      = render "shared/reshare", :post => post, :current_user => current_user

app/views/status_messages/index.html.haml

@@ -2,11 +2,10 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1.big_text status messages
 = render "status_messages/new_status_message", :status_message => @status_message
 %ul#stream
-  
+
   - for status_message in @status_messages
     = render "status_message", :post => status_message
 #pagination

app/views/status_messages/show.html.haml

@@ -2,15 +2,13 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1
   = link_to @status_message.person.real_name, @status_message.person
   = @status_message.message
-  
 
-%h4= "comments (#{@status_message.comments.count})"
+%h4= "#{t('.comments')} (#{@status_message.comments.count})"
 = render "comments/comments", :post => @status_message
 
 %p
   - if current_user.owns? @status_message
-    = link_to "Destroy", @status_message, :confirm => 'Are you sure?', :method => :delete
+    = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure?'), :method => :delete

app/views/users/_profile.haml

@@ -10,7 +10,7 @@
 
   = f.fields_for :profile do |p|
 
-    %h3 Picture
+    %h3="#{t('.picture')}"
     %div#image_picker
       = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
 
@@ -26,34 +26,34 @@
               = link_to image_tag(photo.url(:thumb_medium)), "#"
 
       - else
-        You don't have any photos!  Go to the
-        = link_to "albums", albums_path(:aspect => 'all')
-        page to upload some.
+        =t('.you_dont_have_any_photos')
+        = link_to t('.albums'), albums_path(:aspect => 'all')
+        =t('.page_to_upload_some')
 
     =will_paginate @photos
 
     %br
 
-    %h3 Info
+    %h3="#{t('.info')}"
 
     %p
       %b
-        DIASPORA USERNAME:
+        ="#{t('.diaspora_username')}:"
         = @user.diaspora_handle
 
     %p
       = p.label :first_name
       = p.text_field :first_name, :value => @profile.first_name
     %p
-      = p.label :last_name 
+      = p.label :last_name
       = p.text_field :last_name, :value => @profile.last_name
 
   #submit_block
-    = link_to "Cancel", root_path
+    = link_to t('.cancel'), root_path
     or
-    = f.submit "Update Profile"
+    = f.submit t('.update_profile')
 
 #content_bottom
   .back
-    = link_to "⇧ home", root_path
+    = link_to "⇧ #{t('.home')}", root_path
 

app/views/users/edit.html.haml

@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $("#settings_nav li > a").click( function() {
     var target = "#"+$(this).attr('class');
@@ -15,8 +14,7 @@
 
 
 - content_for :publish do
-  %h1
-    Settings
+  %h1="#{t('.editing_profile')}"
 
 - content_for :left_pane do
   %ul#settings_nav
@@ -29,3 +27,4 @@
 #services.settings_pane
   = render 'users/services'
     
+

autotest/discover.rb

@@ -2,6 +2,5 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Autotest.add_discovery { "rails" }
 Autotest.add_discovery { "rspec2" }

config.ru

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)

config/app_config.yml.example

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 default:
   pod_url: "http://example.org/"
   debug: false
@@ -12,8 +11,8 @@ default:
   socket_collection_name: 'websocket'
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
   mongo_host: 'localhost'
-  mongo_post: 27017
-  
+  mongo_port: 27017
+
 development:
 
 test:

config/application.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require File.expand_path('../boot', __FILE__)
 
 require 'action_controller/railtie'
@@ -13,7 +11,7 @@ require 'active_resource/railtie'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-require 'lib/mongo_mapper/bson_id'
+require File.expand_path('../../lib/mongo_mapper/bson_id', __FILE__)
 module Diaspora
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

config/boot.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.

config/cucumber.yml

+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

config/deploy.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 config = YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml')
 all = config['cross_server']
 
@@ -108,7 +106,6 @@ namespace :deploy do
     run 'gem install bundler'
   end
 
-
   task :migrate do
   end
  end
@@ -153,7 +150,6 @@ namespace :db do
     deploy::restart
   end
 
-
 end
 
 after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle", 'deploy:symlink_config'

config/deploy_config.yml

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'

config/environment.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5

config/environments/development.rb

@@ -2,8 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-require 'lib/mongo_mapper/clear_dev_memory'
+require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 

config/environments/production.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -16,7 +15,7 @@ Diaspora::Application.configure do
 
   # Specifies the header that your server uses for sending files
   #config.action_dispatch.x_sendfile_header = "X-Sendfile"
-  
+
   config.active_support.deprecation = :notify
 
   # For nginx:

config/environments/test.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -32,13 +31,11 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :stderr
   config.threadsafe!
 
-
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
-
 begin
  require 'database_cleaner'
  DatabaseCleaner.strategy = :truncation