Merge branch 'master' of git://github.com/diaspora/diaspora

app/controllers/application_controller.rb

@@ -67,7 +67,11 @@ class ApplicationController < ActionController::Base
     else
       I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES
     end
+
+    WillPaginate::ViewHelpers.pagination_options[:previous_label] = "&laquo; #{I18n.t('previous')}"
+    WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} &raquo;"
   end
+
   def clear_gc_stats
     GC.clear_stats if GC.respond_to?(:clear_stats)
   end

app/views/conversations/index.haml

@@ -17,7 +17,7 @@
     %h3
       .right
         = link_to t('.new_message'), new_conversation_path, :class => 'button', :rel => 'facebox'
-      Inbox
+      = t('.inbox')
 
   #conversation_inbox
     - if @conversations.count > 0

config/initializers/will_paginate.rb

-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-WillPaginate::ViewHelpers.pagination_options[:previous_label] = "« #{I18n.t('previous')}"
-WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} »"

config/locales/diaspora/en.yml

@@ -184,6 +184,7 @@ en:
       no_conversation_selected: "no conversation selected"
       create_a_new_message: "create a new message"
       no_messages: "no messages"
+      inbox: "Inbox"
     show:
       reply: "reply"
       delete: "delete and block conversation"
@@ -406,12 +407,6 @@ en:
   posts:
     doesnt_exist: "that post does not exist!"
 
-  tags:
-    show:
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-
   profiles:
     edit:
       your_public_profile: "Your public profile"
@@ -560,6 +555,12 @@ en:
     show_comments: "show all comments"
     hide_comments: "hide comments"
 
+  tags:
+    show:
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
+
   users:
     edit:
       export_data: "Export Data"