[Git][noosfero/noosfero][master] 2 commits: Return "Follow" in events for its original function

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
59b499ae by Iasmin Mendes at 2018-08-06T12:10:36Z
Return "Follow" in events for its original function

- - - - -
970f6c97 by Rodrigo Souto at 2018-08-06T19:25:19Z
Merge branch 'original-follow-in-events' into 'master'

Return "Follow" in events for its original function

See merge request noosfero/noosfero!1594
- - - - -


2 changed files:

- app/helpers/article_helper.rb
- app/views/content_viewer/_publishing_info.html.erb


Changes:

=====================================
app/helpers/article_helper.rb
=====================================
@@ -159,11 +159,11 @@ module ArticleHelper
   end
 
   def follow_button_text(article)
-    font_awesome(:add, article.event? ? _('Attend') : _('Follow'))
+    font_awesome(:add, _('Follow'))
   end
 
   def unfollow_button_text(article)
-    font_awesome(:minus, article.event? ? _('Unattend') : _('Unfollow'))
+    font_awesome(:minus, _('Unfollow'))
   end
 
   def following_button(page, user)


=====================================
app/views/content_viewer/_publishing_info.html.erb
=====================================
@@ -18,13 +18,7 @@
       <% end %>
 
       <span class="followers-count">
-        <% if article.event? %>
-          <% if article.person_followers.size > 0 %>
-            <%= _("%s will attend this event.") % [ pluralize(article.person_followers.size, _("person"))]%>
-          <% else %>
-            <%= _("No one attending this event yet.") %>
-          <% end %>
-        <% elsif article.person_followers.size > 0 %>
+        <% if article.person_followers.size > 0 %>
           <%= _("%s following this article.") % [ pluralize(article.person_followers.size, _("person"))]%>
         <% else %>
           <%= _("No one following this article yet.") %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ef1c0a37e0bd7c2df01abab8f6a8f58b5caa6810...970f6c97c7eac0ca83b47b0424d1ed6566ed29d1

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/ef1c0a37e0bd7c2df01abab8f6a8f58b5caa6810...970f6c97c7eac0ca83b47b0424d1ed6566ed29d1
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180806/b9e3a394/attachment-0001.html>