Skip to content

Commit 240f7da

Browse files
authored
Merge pull request #698 from coopdevs/fix-bad-translations
Fix several small bugs and improvements
2 parents 264a82d + 6f1b089 commit 240f7da

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/views/kaminari/_gap.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<li class='disabled'>
2-
<%= content_tag :a, raw(t 'views.pagination.truncate') %>
2+
<%= content_tag :a, '...' %>
33
</li>

app/views/shared/_posts.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<% end %>
88
</h4>
99
<p>
10-
<%= strip_tags(post.rendered_description.to_html) %>
10+
<%= sanitize strip_tags(post.rendered_description.to_html) %>
1111
</p>
1212
<p>
1313
<small>

app/views/users/_member_card.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</div>
2828
<div class="to-member-card__body">
2929
<div class="to-member-card__body__description">
30-
<%= member.description&.truncate(124) %>
30+
<%= sanitize strip_tags(markdown(member.description&.truncate(124))) %>
3131
</div>
3232
<div class="to-member-card__body__items">
3333
<% if member.phone.present? %>

app/views/users/show.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<%= link_to post, post %>
107107
</div>
108108
<div class="col-sm-8">
109-
<%= strip_tags(post.rendered_description.to_html) %>
109+
<%= sanitize strip_tags(post.rendered_description.to_html) %>
110110
</div>
111111
<div class="col-sm-1">
112112
<% if @user != current_user %>
@@ -138,7 +138,7 @@
138138
<%= link_to post, post %>
139139
</div>
140140
<div class="col-sm-9">
141-
<%= strip_tags(post.rendered_description.to_html) %>
141+
<%= sanitize strip_tags(post.rendered_description.to_html) %>
142142
</div>
143143
</div>
144144
<% end %>

config/locales/en.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ en:
373373
recent_posts:
374374
subject: Newsletter
375375
text1: 'Latest offers published:'
376-
text2: 'Lastest inquiries published:'
376+
text2: 'Latest requests published:'
377377
organizations:
378378
give_time:
379379
give_time: Give time to
@@ -438,7 +438,7 @@ en:
438438
shared:
439439
movements:
440440
delete_reason: Are you sure to delete this comment?
441-
movements: Movements
441+
movements: Exchanges
442442
post_form:
443443
group_inquiry: Is it a group request?
444444
group_offer: Is it a group offer?

0 commit comments

Comments
 (0)