nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some translations

Browse source
This commit is contained in:
MrZYX 2011-05-18 13:55:50 +02:00
parent b0e9f5388b
commit 66380fd33f
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/status_message.rb
View file

@ -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

6
config/locales/diaspora/en.yml
View file

@ -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"

3
config/locales/javascript/javascript.en.yml
View file

@ -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!"

6
public/javascripts/stream.js
View file

@ -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');
});
},