From c0f4e12fa8ca1b5f27adcc8789f7923ed83e1d31 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Tue, 4 Mar 2008 13:45:05 +0000 Subject: [PATCH] ActionItem172: minor English and wording review --- app/models/communities_block.rb | 2 +- app/models/enterprises_block.rb | 2 +- app/models/profile_info_block.rb | 2 +- app/views/layouts/application.rhtml | 2 +- app/views/shared/user_menu.rhtml | 12 ++++++------ app/views/tasks/_add_friend.rhtml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/models/communities_block.rb b/app/models/communities_block.rb index 87382bc..686a0e6 100644 --- a/app/models/communities_block.rb +++ b/app/models/communities_block.rb @@ -9,7 +9,7 @@ class CommunitiesBlock < ProfileListBlock end def help - _('Here you can see the communities where this user is part.') + _('The communities in which the user is a member') end def footer diff --git a/app/models/enterprises_block.rb b/app/models/enterprises_block.rb index dee8c17..53c1471 100644 --- a/app/models/enterprises_block.rb +++ b/app/models/enterprises_block.rb @@ -5,7 +5,7 @@ class EnterprisesBlock < ProfileListBlock end def help - _('Here you can see the enterprises where this user works.') + _('The enterprises where this user works.') end def self.description diff --git a/app/models/profile_info_block.rb b/app/models/profile_info_block.rb index 6679132..5c5a429 100644 --- a/app/models/profile_info_block.rb +++ b/app/models/profile_info_block.rb @@ -5,7 +5,7 @@ class ProfileInfoBlock < Block end def help - _('Basic information about %{user}. Here you see how much time %{user} is part of the %{env} enviroment, and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() } + _('Basic information about %{user}: how long %{user} is part of %{env} and useful links.') % { :user => self.owner.name(), :env => self.owner.environment.name() } end def content diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index a634b9c..2972e79 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -155,7 +155,7 @@ <%= _('No') %>

- <%= _('If needed, you can activate or inactivate the automatic help mode by clicking the question mark symbol in the top-right corner') %> + <%= _('If needed, you can activate or deactivate the automatic help mode by clicking the question mark symbol in the top-right corner') %> <%= javascript_include_tag 'noosfero-show-help' %> diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml index 6113432..4d4f27d 100644 --- a/app/views/shared/user_menu.rhtml +++ b/app/views/shared/user_menu.rhtml @@ -1,5 +1,5 @@

> <% if logged_in? %> @@ -16,20 +16,20 @@ @@ -48,7 +48,7 @@ <%= lightbox_link_to ''+ _('Login'), { :controller => 'account', :action => 'login_popup' }, :id => 'link_login', - :help => _('Open the login box to allow you to be recognized and to use the cool features of this enviroment.') %> + :help => _('Click here to enter your username and password and be recognized by the system.') %> <% end %> diff --git a/app/views/tasks/_add_friend.rhtml b/app/views/tasks/_add_friend.rhtml index 77aedc7..2cc9a69 100644 --- a/app/views/tasks/_add_friend.rhtml +++ b/app/views/tasks/_add_friend.rhtml @@ -11,8 +11,8 @@ <%= _('Accept') %> <% - content_tag('div', :id => "group-for-friend-#{task.id}", :help => _('You can select one of the existing groups or type the name of a new group.')) do %> - <%= _('Classify your new friend %s: ') % task.requestor.name %> + content_tag('div', :id => "group-for-friend-#{task.id}", :help => _('You can type the first letters of an existing group and have the system present you the available options, or you can type the name of a new group if you want.')) do %> + <%= _('Classify your new friend %s:') % task.requestor.name %> <%= text_field_with_local_autocomplete("task[group_for_friend]", profile.suggested_friend_groups, :id => "field-group-for-friend-#{task.id}") %>

<%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %> -- libgit2 0.21.2