Skip to content

Fix several small bugs and improvements #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2023
Merged

Fix several small bugs and improvements #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ee2432
translations fixed
franpb14 May 29, 2023
2f34a66
gap as ... instead of "truncate"
franpb14 May 29, 2023
2cb3327
sanitize post rendered description
franpb14 May 31, 2023
6f1b089
member description without markdown
franpb14 Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/kaminari/_gap.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<li class='disabled'>
<%= content_tag :a, raw(t 'views.pagination.truncate') %>
<%= content_tag :a, '...' %>
</li>
2 changes: 1 addition & 1 deletion app/views/shared/_posts.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<% end %>
</h4>
<p>
<%= strip_tags(post.rendered_description.to_html) %>
<%= sanitize strip_tags(post.rendered_description.to_html) %>
</p>
<p>
<small>
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/_member_card.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</div>
<div class="to-member-card__body">
<div class="to-member-card__body__description">
<%= member.description&.truncate(124) %>
<%= sanitize strip_tags(markdown(member.description&.truncate(124))) %>
</div>
<div class="to-member-card__body__items">
<% if member.phone.present? %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/users/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<%= link_to post, post %>
</div>
<div class="col-sm-8">
<%= strip_tags(post.rendered_description.to_html) %>
<%= sanitize strip_tags(post.rendered_description.to_html) %>
</div>
<div class="col-sm-1">
<% if @user != current_user %>
Expand Down Expand Up @@ -138,7 +138,7 @@
<%= link_to post, post %>
</div>
<div class="col-sm-9">
<%= strip_tags(post.rendered_description.to_html) %>
<%= sanitize strip_tags(post.rendered_description.to_html) %>
</div>
</div>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ en:
recent_posts:
subject: Newsletter
text1: 'Latest offers published:'
text2: 'Lastest inquiries published:'
text2: 'Latest requests published:'
organizations:
give_time:
give_time: Give time to
Expand Down Expand Up @@ -438,7 +438,7 @@ en:
shared:
movements:
delete_reason: Are you sure to delete this comment?
movements: Movements
movements: Exchanges
post_form:
group_inquiry: Is it a group request?
group_offer: Is it a group offer?
Expand Down