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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated subscriptions.html.erb and en.yml #11219

Closed
wants to merge 2 commits into from
Closed

Updated subscriptions.html.erb and en.yml #11219

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
2f8f47c
Update subscriptions.html.erb
gitofbabai Jun 24, 2022
4ea1119
Update en.yml
gitofbabai Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/views/home/subscriptions.html.erb
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@

<hr />
<p>
<a href="/subscriptions/digest" class="btn btn-outline-secondary"><i class="fa fa-list"></i> Subscriptions digest</a>
<a href="/subscriptions/digest" class="btn btn-outline-secondary"><i class="fa fa-list"></i> <%= raw translation('home.subscriptions.subscriptions_digest') %></a>
</p>
<hr />

Expand All @@ -32,9 +32,9 @@

<hr />

<a href="/settings" class="btn btn-outline-secondary" style="margin-bottom: 10px;"><i class="fa fa-bell"></i> Notification settings </a>
<a href="/settings" class="btn btn-outline-secondary" style="margin-bottom: 10px;"><i class="fa fa-bell"></i> <%= raw translation('home.subscriptions.notification_settings') %> </a>

<p style="font-style: italic;"> Control how you get notifications. </p>
<p style="font-style: italic;"> <%= raw translation('home.subscriptions.control_notifications') %> </p>

</div>

Expand All @@ -56,13 +56,13 @@
</form>

<% if current_user.subscriptions.size == 0 %>
<p> You haven't subscribed to any topic yet </p>
<p> <%= raw translation('home.subscriptions.subscribe_topic') %> </p>
<% else %>
<table class="table">
<tr><th><%=raw translation('home.subscriptions.tag') %></th><th><%=raw translation('home.subscriptions.options') %></th></tr>
<% current_user.subscriptions(:tag).includes(:tag).each do |subscription| %>
<tr>
<td><a href="/tag/<%= subscription.tagname %>"><%= subscription.tagname %></a> <i style="color:#aaa;"> +<%= Tag.follower_count(subscription.tagname).to_i-1 %> other people</i></td>
<td><a href="/tag/<%= subscription.tagname %>"><%= subscription.tagname %></a> <i style="color:#aaa;"> +<%= Tag.follower_count(subscription.tagname).to_i-1 %> <%= raw translation('home.subscriptions.other_people') %></i></td>
<td><div class="btn-toolbar" style="margin:0;">
<div class="btn-group">
<!--
Expand Down Expand Up @@ -104,4 +104,4 @@
.popover{
z-index: 1000;
}
</style>
</style>
6 changes: 6 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Expand Up @@ -902,6 +902,12 @@ en:
share_subscription_link: "Share this subscription link"
share: "Share"
unsubscribe: "Unfollow"
subscribe_topic: "Subscribe to Topics"
notification_settings: "Notification Settings"
subscriptions_digest: "Subscriptions Digest"
control_notifications: "Control how you get notifications"
subscribe_topics: "You haven't subscribed to any topic yet"
other_people: "other people"
_comments:
commented: "commented"
read_more: "Read more"
Expand Down