Download as
Browse Code »

Commit 962cb3526c91e061a73a1481ad20ee28808986e0

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 10af872d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1199: fixed conflict of strings to translate

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/views/blocks/my_network/person.rhtml
  Diff comments   View file @962cb35
... ... @@ -3,8 +3,8 @@
3 3 content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
4 4 <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
5 5 content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
6   - <li><%= link_to(n__('One community', '%s communities', owner.communities.size) %
7   - content_tag('b', owner.communities.size), owner.public_profile_url.merge(:action => 'communities')) %></li>
  6 + <li><%= link_to(n__('One community', '%{num} communities', owner.communities.size) %
  7 + {:num => content_tag('b', owner.communities.size)}, owner.public_profile_url.merge(:action => 'communities')) %></li>
8 8 <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
9 9 content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
10 10 </ul>
... ...