From a2f1381dde05ceb7339dbfad123bee3822d8d036 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Thu, 17 Mar 2011 15:11:24 +0100
Subject: [PATCH] moar translations
---
app/controllers/posts_controller.rb | 4 ++--
app/views/posts/index.html.haml | 7 +------
app/views/shared/_publisher.html.haml | 2 +-
app/views/status_messages/new.haml | 2 +-
config/locales/diaspora/en.yml | 11 ++++++++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index be51e5f362..25edeccc24 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -41,11 +41,11 @@ class PostsController < ApplicationController
I18n.locale = @person.owner.language
render "posts/#{@post.class.to_s.underscore}", :layout => true
else
- flash[:error] = "that post does not exist!"
+ flash[:error] = I18n.t('posts.doesnt_exist')
redirect_to root_url
end
else
- flash[:error] = "that post does not exist!"
+ flash[:error] = I18n.t('posts.doesnt_exist')
redirect_to root_url
end
end
diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml
index 535c59bc0c..a2ac65a901 100644
--- a/app/views/posts/index.html.haml
+++ b/app/views/posts/index.html.haml
@@ -29,12 +29,7 @@
.prepend-2.span-7.last
%h3
- = @people_count
- %span{:style => "font-weight:normal"}
- - if @people_count == 1
- = t('.person')
- - else
- = t('.people')
+ = t('people', :count => @people_count)
.side_stream.stream
- for person in @people
diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 34f22e38cc..2e073bae9e 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -40,7 +40,7 @@
%i= t('.mention_helper_text')
- else
.badges
- %i= 'publishing to: '
+ %i= t('.publishing_to')
= aspect_badges(aspects_with_person, :link => false)
diff --git a/app/views/status_messages/new.haml b/app/views/status_messages/new.haml
index 821bb7afb8..4ecc87e22f 100644
--- a/app/views/status_messages/new.haml
+++ b/app/views/status_messages/new.haml
@@ -18,6 +18,6 @@
.span-15.last
#facebox_header
%h4
- = t('.mentioning') + @person.name
+ = t('.mentioning', :person => @person.name)
= render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dec5f54fc9..cc1e7c216f 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -319,6 +319,11 @@ en:
sign_in: "Sign in to view it."
people:
+ zero: "no people"
+ one: "1 person"
+ few: "%{count} people"
+ many: "%{count} people"
+ other: "%{count} people"
person:
pending_request: "pending request"
already_connected: "Already connected"
@@ -399,13 +404,12 @@ en:
or_select_one: "or select one from your already existing"
posts:
+ doesnt_exist: "that post does not exist!"
index:
whatup: "What's happening on %{pod}"
posts_tagged_with: "Posts tagged with #%{tag}"
nobody_talking: "Nobody is talking about %{tag} yet."
people_tagged_with: "People tagged with %{tag}"
- people: "people"
- person: "person"
profiles:
edit:
@@ -509,6 +513,7 @@ en:
all_contacts: "all contacts"
share_with: "share with"
whats_on_your_mind: "what's on your mind?"
+ publishing_to: "publishing to: "
add_contact:
enter_a_diaspora_username: "Enter a Diaspora username:"
your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
@@ -539,7 +544,7 @@ en:
status_messages:
new:
- mentioning: "Mentioning: "
+ mentioning: "Mentioning: %{person}"
show:
destroy: "Delete"
permalink: "permalink"
--
GitLab