Skip to content
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

Jump to bottom

Add translation method in list.html.erb #11213

Merged
merged 2 commits into from
Jun 24, 2022
Merged

Add translation method in list.html.erb #11213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15661db
Add translation method in list.html.erb
jenniferhalloran Jun 23, 2022
2515321
Add code to add location and see full profile
jenniferhalloran Jun 24, 2022
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
4 changes: 2 additions & 2 deletions app/views/users/list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<% if current_user && (@map_lat.blank? || @map_lon.blank?) %>
<div class="col-md-4">
<a class="btn btn-outline-secondary blurred-location-input" style="color:#666;" hover="this.style.background='grey';" submit_to="/profile/tags/create/<%= current_user.uid %>"><i class="fa fa-map-marker" style="color:#c40;"></i> Add your location</a>
<a class="btn btn-outline-secondary blurred-location-input" style="color:#666;" hover="this.style.background='grey';" submit_to="/profile/tags/create/<%= current_user.uid %>"><i class="fa fa-map-marker" style="color:#c40;"></i> <%= translation('users.list.add_your_location') %> </a>
</div>
<% end %>
</div>
Expand Down Expand Up @@ -59,7 +59,7 @@
<li class="btn-success"><a style="color: white;" href="/profile/<%= user.username %>"><i class="fa fa-check-circle fa-white"></i> Unban on profile</a></li>
<i class='fa fa-ban' style="color:#a00;"></i> <%= translation('users.list.banned') %>
<% elsif user.status == 1 && user != current_user %>
<li><a href="/profile/<%= user.username %>">See Full Profile</a></li>
<li><a href="/profile/<%= user.username %>"><%= translation('users.list.see_full_profile') %></a></li>
<li class="btn-danger"><a style="color: white;" data-confirm="<%= translation('users.list.are_you_sure',{},false) %>" href="/ban/<%= user.uid %>" ><i class="fa fa-ban fa-white"></i> <%= translation('users.list.ban') %></a></li>
<% end %>
<% end %>
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ en:
banned: "Banned"
are_you_sure: "Are you sure? The user will no longer be able to log in or publish."
ban: "Ban"
add_your_location: "Add your location"
see_full_profile: "See Full Profile"
_photo:
profile_photo: "Profile photo"
drag_and_drop_image: "Drag and drop to add an image, or"
Expand Down