Skip to content

Commit ae0dfa3

Browse files
OaphiOaphi
committed
a bunch more instances of hardcoded network name removed
1 parent 546e22a commit ae0dfa3

6 files changed

Lines changed: 73 additions & 73 deletions

File tree

‎app/mailers/admin_mailer.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def to_moderators
1515
from = "#{SiteSetting['ModeratorDistributionListSenderName', community: @community]} " \
1616
"<#{SiteSetting['ModeratorDistributionListSenderEmail', community: @community]}>"
1717
to = SiteSetting['ModeratorDistributionListSenderEmail', community: @community]
18-
mail subject: "Codidact Moderators: #{@subject}", to: to, from: from, bcc: emails
18+
mail subject: "#{SiteSetting['NetworkName']} Moderators: #{@subject}", to: to, from: from, bcc: emails
1919
end
2020

2121
def to_all_users

‎app/mailers/summary_mailer.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def content_summary
1010
@users = params[:users]
1111

1212
mail(from: "#{SiteSetting['NoReplySenderName']} <#{SiteSetting['NoReplySenderEmail']}>",
13-
subject: 'Codidact Content Summary',
13+
subject: "#{SiteSetting['NetworkName']} Content Summary",
1414
to: params[:to])
1515
end
1616
end

‎app/mailers/two_factor_mailer.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ def disable_email
66
@host = params[:host]
77
@token = SecureRandom.urlsafe_base64(64)
88
user.update(login_token: @token, login_token_expires_at: 5.minutes.from_now)
9-
mail to: user.email, subject: 'Disable two-factor authentication on Codidact'
9+
mail to: user.email, subject: "Disable two-factor authentication on #{SiteSetting['NetworkName']}"
1010
end
1111

1212
def login_email
1313
user = params[:user]
1414
@host = params[:host]
1515
@token = SecureRandom.urlsafe_base64(64)
1616
user.update(login_token: @token, login_token_expires_at: 5.minutes.from_now)
17-
mail to: user.email, subject: 'Your sign in link for Codidact'
17+
mail to: user.email, subject: "Your sign in link for #{SiteSetting['NetworkName']}"
1818
end
1919

2020
def backup_code
2121
@user = params[:user]
2222
@host = params[:host]
23-
mail to: @user.email, subject: 'Your 2FA backup code for Codidact'
23+
mail to: @user.email, subject: "Your 2FA backup code for #{SiteSetting['NetworkName']}"
2424
end
2525
end

‎app/views/advertisement/index.html.erb‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,74 @@
33
<p><%= t('ads.blurb_types') %></p>
44

55
<div class="grid">
6-
<div class="grid--cell is-12 is-4-lg">
7-
<div class="widget">
8-
<div class="widget--header h-ta-center h-fw-bold">
9-
<%= t('g.codidact_network').capitalize %>
10-
</div>
11-
<a href="<%= codidact_ads_url %>"><img src="<%= codidact_ads_url %>" alt="Codidact network ad"></a>
12-
<div class="widget--body">
13-
<p><%= t('ads.image_link') %></p>
14-
<pre><code><%= codidact_ads_url %></code></pre>
15-
<p><%= t('ads.image_html') %></p>
16-
<pre><code><%= ('<img src="' + codidact_ads_url + '" alt="Codidact network">') %></code></pre>
17-
</div>
18-
</div>
6+
<div class="grid--cell is-12 is-4-lg">
7+
<div class="widget">
8+
<div class="widget--header h-ta-center h-fw-bold">
9+
<%= t('g.codidact_network').capitalize %>
10+
</div>
11+
<a href="<%= codidact_ads_url %>"><img src="<%= codidact_ads_url %>" alt="Codidact network ad"></a>
12+
<div class="widget--body">
13+
<p><%= t('ads.image_link') %></p>
14+
<pre><code><%= codidact_ads_url %></code></pre>
15+
<p><%= t('ads.image_html') %></p>
16+
<pre><code><%= ("<img src=\"#{codidact_ads_url}\" alt=\"#{SiteSetting['NetworkName']} network\">") %></code></pre>
17+
</div>
1918
</div>
20-
<div class="grid--cell is-12 is-4-lg">
21-
<div class="widget">
22-
<div class="widget--header h-ta-center h-fw-bold">
23-
<%= t('g.community').capitalize %>
24-
</div>
25-
<a href="<%= community_ads_url %>"><img src="<%= community_ads_url %>" alt="Community ad"></a>
26-
<div class="widget--body">
27-
<p><%= t('ads.image_link') %></p>
28-
<pre><code><%= community_ads_url %></code></pre>
29-
<p><%= t('ads.image_html') %></p>
30-
<pre><code><%= ('<img src="' + community_ads_url + '" alt="' + @community.name + '">') %></code></pre>
31-
</div>
32-
</div>
19+
</div>
20+
<div class="grid--cell is-12 is-4-lg">
21+
<div class="widget">
22+
<div class="widget--header h-ta-center h-fw-bold">
23+
<%= t('g.community').capitalize %>
24+
</div>
25+
<a href="<%= community_ads_url %>"><img src="<%= community_ads_url %>" alt="Community ad"></a>
26+
<div class="widget--body">
27+
<p><%= t('ads.image_link') %></p>
28+
<pre><code><%= community_ads_url %></code></pre>
29+
<p><%= t('ads.image_html') %></p>
30+
<pre><code><%= ('<img src="' + community_ads_url + '" alt="' + @community.name + '">') %></code></pre>
31+
</div>
3332
</div>
34-
<div class="grid--cell is-12 is-4-lg">
35-
<div class="widget">
36-
<div class="widget--header h-ta-center h-fw-bold">
37-
<%= t('ads.random_posts') %>
38-
</div>
39-
<a href="<%= random_question_ads_url %>"><img src="<%= random_question_ads_url %>" alt="Random posts ad"></a>
40-
<div class="widget--body">
41-
<p><%= t('ads.image_link') %></p>
42-
<pre><code><%= random_question_ads_url %></code></pre>
43-
<p><%= t('ads.image_html') %></p>
44-
<pre><code><%= ('<img src="' + random_question_ads_url + '" alt="' + @community.name + ' questions">') %></code></pre>
45-
</div>
46-
</div>
33+
</div>
34+
<div class="grid--cell is-12 is-4-lg">
35+
<div class="widget">
36+
<div class="widget--header h-ta-center h-fw-bold">
37+
<%= t('ads.random_posts') %>
38+
</div>
39+
<a href="<%= random_question_ads_url %>"><img src="<%= random_question_ads_url %>" alt="Random posts ad"></a>
40+
<div class="widget--body">
41+
<p><%= t('ads.image_link') %></p>
42+
<pre><code><%= random_question_ads_url %></code></pre>
43+
<p><%= t('ads.image_html') %></p>
44+
<pre><code><%= ('<img src="' + random_question_ads_url + '" alt="' + @community.name + ' questions">') %></code></pre>
45+
</div>
4746
</div>
48-
<div class="grid--cell is-12 is-4-lg">
49-
<div class="widget">
50-
<div class="widget--header h-ta-center h-fw-bold">
51-
<%= t('ads.specific_post') %>
52-
</div>
53-
<div class="widget--body">
54-
<p><%= t('ads.image_link') %></p>
55-
<pre><code><%= specific_question_ads_url('X') %></code></pre>
56-
<p><%= t('ads.image_html') %></p>
57-
<pre><code><%= ('<img src="' + specific_question_ads_url('X') + '" alt="(choose an alt text)">') %></code></pre>
58-
<p><em><%= t('ads.replace_x.post') %></em></p>
59-
</div>
60-
</div>
47+
</div>
48+
<div class="grid--cell is-12 is-4-lg">
49+
<div class="widget">
50+
<div class="widget--header h-ta-center h-fw-bold">
51+
<%= t('ads.specific_post') %>
52+
</div>
53+
<div class="widget--body">
54+
<p><%= t('ads.image_link') %></p>
55+
<pre><code><%= specific_question_ads_url('X') %></code></pre>
56+
<p><%= t('ads.image_html') %></p>
57+
<pre><code><%= ('<img src="' + specific_question_ads_url('X') + '" alt="(choose an alt text)">') %></code></pre>
58+
<p><em><%= t('ads.replace_x.post') %></em></p>
59+
</div>
6160
</div>
62-
<div class="grid--cell is-12 is-4-lg">
63-
<div class="widget">
64-
<div class="widget--header h-ta-center h-fw-bold">
65-
<%= t('ads.random_from_cat') %>
66-
</div>
67-
<div class="widget--body">
68-
<p><%= t('ads.image_link') %></p>
69-
<pre><code><%= specific_category_ads_url('X') %></code></pre>
70-
<p><%= t('ads.image_html') %></p>
71-
<pre><code><%= ('<img src="' + specific_category_ads_url('X') + '" alt="(choose an alt text)">') %></code></pre>
72-
<p><em><%= t('ads.replace_x.category') %></em></p>
73-
</div>
74-
</div>
61+
</div>
62+
<div class="grid--cell is-12 is-4-lg">
63+
<div class="widget">
64+
<div class="widget--header h-ta-center h-fw-bold">
65+
<%= t('ads.random_from_cat') %>
66+
</div>
67+
<div class="widget--body">
68+
<p><%= t('ads.image_link') %></p>
69+
<pre><code><%= specific_category_ads_url('X') %></code></pre>
70+
<p><%= t('ads.image_html') %></p>
71+
<pre><code><%= ('<img src="' + specific_category_ads_url('X') + '" alt="(choose an alt text)">') %></code></pre>
72+
<p><em><%= t('ads.replace_x.category') %></em></p>
73+
</div>
7574
</div>
76-
</div>
75+
</div>
76+
</div>

‎app/views/categories/rss_feed.rss.builder‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ xml.feed xmlns: 'http://www.w3.org/2005/Atom' do
33
xml.id category_feed_url(@category)
44
xml.title "New Posts - #{@category.name} - #{SiteSetting['SiteName']}"
55
xml.author do
6-
xml.name "#{SiteSetting['SiteName']} - Codidact"
6+
xml.name "#{SiteSetting['SiteName']} - #{SiteSetting['NetworkName']}"
77
end
88
xml.link nil, rel: 'self', href: category_url(@category)
99
xml.updated @posts.maximum(:last_activity)&.iso8601 || RequestContext.community.created_at&.iso8601

‎app/views/tags/show.rss.builder‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ xml.feed xmlns: 'http://www.w3.org/2005/Atom' do
33
xml.id tag_url(id: @category.id, tag_id: @tag.id, format: :rss)
44
xml.title "New Posts Tagged '#{@tag.name}' - #{SiteSetting['SiteName']}"
55
xml.author do
6-
xml.name "#{SiteSetting['SiteName']} - Codidact"
6+
xml.name "#{SiteSetting['SiteName']} - #{SiteSetting['NetworkName']}"
77
end
88
xml.link nil, rel: 'self', href: tag_url(id: @category.id, tag_id: @tag.id, format: :rss)
99
xml.updated @posts.maximum(:last_activity)&.iso8601 || RequestContext.community.created_at&.iso8601

0 commit comments

Comments
 (0)