From 66380fd33f00c9bb439ac3f1b65a74874a5666ec Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 18 May 2011 13:55:50 +0200
Subject: [PATCH] fixed some translations

---
 app/models/status_message.rb                | 2 +-
 config/locales/diaspora/en.yml              | 6 ++++++
 config/locales/javascript/javascript.en.yml | 3 +++
 public/javascripts/stream.js                | 6 +++---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index e87f88acc..3f5b3b77d 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -13,7 +13,7 @@ class StatusMessage < Post
   acts_as_taggable_on :tags
   extract_tags_from :raw_message
 
-  validates_length_of :text, :maximum => 10000, :text => "please make your status messages less than 10000 characters"
+  validates_length_of :text, :maximum => 10000, :text => I18n.t('status_messages.too_long', :count => 10000)
   xml_name :status_message
   xml_attr :raw_message
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index f99f6df67..4c7d4760b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -596,6 +596,12 @@ en:
       no_message_to_display: "No message to display."
     destroy:
       failure: "Failed to delete post"
+    too_long:
+      zero: "please make your status messages less than %{count} characters"
+      one: "please make your status messages less than %{count} character"
+      few: "please make your status messages less than %{count} characters"
+      many: "please make your status messages less than %{count} characters"
+      other: "please make your status messages less than %{count} characters"
 
   stream_helper:
     show_comments: "show all comments"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 90de9f5ea..aeae88c95 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -41,3 +41,6 @@ en:
           few: "In {{count}} aspects"
           many: "In {{count}} aspects"
           other: "In {{count}} aspects"
+      show_more: "show more"
+      failed_to_like: "Failed to like!"
+      failed_to_post_message: "Failed to post message!"
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 72c05d07d..b018cf95b 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -67,7 +67,7 @@ var Stream = {
     });
 
     $(stream_string + ".new_comment").live('ajax:failure', function(data, html, xhr) {
-      Diaspora.widgets.alert.alert('Failed to post message!');
+      Diaspora.widgets.alert.alert(Diaspora.widgets.i18n.t('failed_to_post_message'));
     });
 
     $stream.find(".comment_delete", ".comment").live('ajax:success', function(data, html, xhr) {
@@ -89,7 +89,7 @@ var Stream = {
     $(stream_string + " .content").find("p").expander({
       slicePoint: 400,
       widow: 12,
-      expandText: "show more",
+      expandText: Diaspora.widgets.i18n.t('show_more'),
       userCollapse: false
     });
   },
@@ -101,7 +101,7 @@ var Stream = {
     });
 
     likes.live('ajax:failure', function(data, html, xhr) {
-      Diaspora.widgets.alert.alert('Failed to like/dislike!');
+      Diaspora.widgets.alert.alert(Diaspora.widgets.i18n.t('failed_to_like'));
       $(this).parent().fadeIn('fast');
     });
   },