Commit e4d081b39131877d980150bf210b825c03dd6554
Exists in
stable
Merge branch 'master' into stable
Showing
3 changed files
with
34 additions
and
8 deletions
Show diff stats
views/blocks/categories_and_tags.html.erb
| 1 | <% if block.owner.categories.count > 0 %> | 1 | <% if block.owner.categories.count > 0 %> |
| 2 | - <h3 class="block-title"><span><%= _("Categories") %></span></h3> | 2 | + <h3 class="block-title"><span><%= _("Categories:") %></span></h3> |
| 3 | 3 | ||
| 4 | <div class="category_cloud"> | 4 | <div class="category_cloud"> |
| 5 | <% block.owner.categories.each do |category| %> | 5 | <% block.owner.categories.each do |category| %> |
views/blocks/software_statistics.html.erb
| 1 | <div class="software-metrics-block"> | 1 | <div class="software-metrics-block"> |
| 2 | <ul class="metrics-list"> | 2 | <ul class="metrics-list"> |
| 3 | - <li><span class="arrow-globe-icon"></span><%= pluralize(profile.hits, 'visita', 'visitas') %></li> | ||
| 4 | - <li><span class="downloads-icon"></span><%= pluralize(total_downloads, 'download', 'downloads') %></li> | ||
| 5 | - <li><span class="face-icon"></span><%= block.benefited_people.to_s + _(' benefited people*') %></li> | ||
| 6 | - <li><span class="pig-safe-icon"></span><strong class="saved-money"><%= number_to_currency(block.saved_resources, unit: 'R$ ', separator: ',', delimiter: '.') %></strong> <%= _(' saved resources*') %></li> | 3 | + <li> |
| 4 | + <span class="arrow-globe-icon"></span> | ||
| 5 | + <span id="visit-count"> | ||
| 6 | + <%= pluralize(profile.hits, 'visita', 'visitas') %> | ||
| 7 | + </span> | ||
| 8 | + </li> | ||
| 9 | + <li> | ||
| 10 | + <span class="downloads-icon"></span> | ||
| 11 | + <span id="downloads-count"> | ||
| 12 | + <%= pluralize(total_downloads, 'download', 'downloads') %> | ||
| 13 | + </span> | ||
| 14 | + </li> | ||
| 15 | + <li> | ||
| 16 | + <span class="face-icon"></span> | ||
| 17 | + <span id="benefited-people"> | ||
| 18 | + <%= block.benefited_people.to_s + _(' benefited people*') %> | ||
| 19 | + </span> | ||
| 20 | + </li> | ||
| 21 | + <li> | ||
| 22 | + <span class="pig-safe-icon"></span> | ||
| 23 | + <span id="saved-resources"> | ||
| 24 | + <strong class="saved-money"> | ||
| 25 | + <%= number_to_currency(block.saved_resources, unit: 'R$ ', | ||
| 26 | + separator: ',', delimiter: '.') %> | ||
| 27 | + </strong> | ||
| 28 | + <%= _(' saved resources*') %> | ||
| 29 | + </span> | ||
| 30 | + </li> | ||
| 7 | </ul> | 31 | </ul> |
| 8 | 32 | ||
| 9 | - <div class="admin-estimation">* <%= _("Data estimated by the software administrator.") %></div> | 33 | + <div class="admin-estimation"> |
| 34 | + * <%= _("Data estimated by the software administrator.") %> | ||
| 35 | + </div> | ||
| 10 | </div> | 36 | </div> |
views/organization_ratings_extra_fields_show_data.html.erb
| 1 | <div class="aditional-informations"> | 1 | <div class="aditional-informations"> |
| 2 | <div class="comments-people-benefited"> | 2 | <div class="comments-people-benefited"> |
| 3 | - <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %> | 3 | + <span><%=_("Benefited People")%> :</span> <%= user_rating.people_benefited unless user_rating.nil? %> |
| 4 | </div> | 4 | </div> |
| 5 | 5 | ||
| 6 | <div class="comments-saved-value"> | 6 | <div class="comments-saved-value"> |
| 7 | - <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %> | 7 | + <span><%=_("Saved Resources")%> :</span> <%= user_rating.saved_value unless user_rating.nil? %> |
| 8 | </div> | 8 | </div> |
| 9 | </div> | 9 | </div> |
| 10 | 10 |