Skip to content

Commit f0ec2e9

Browse files
committed
switched a bunch more views to the NetworkName site setting
1 parent 22cee25 commit f0ec2e9

14 files changed

Lines changed: 39 additions & 26 deletions

File tree

app/mailers/user_mailer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def deletion_confirmation
55
@user = params[:user]
66
@host = params[:host]
77
@community = params[:community]
8-
mail to: @user.email, subject: 'Your Codidact account has been deleted as you requested',
8+
mail to: @user.email, subject: "Your #{SiteSetting['NetworkName']} account has been deleted as you requested",
99
from: "#{SiteSetting['NoReplySenderName', community: @community]} " \
1010
"<#{SiteSetting['NoReplySenderEmail', community: @community]}>"
1111
end
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<h1>Keyboard tools</h1>
2-
<p>Codidact supports keyboard tools to enhance user accessibility. You can activate (and then later deactivate) them here on this page:</p>
2+
3+
<p>
4+
<%= SiteSetting['NetworkName'] %> supports keyboard tools to enhance user accessibility.
5+
You can activate (and then later deactivate) them here on this page:
6+
</p>
37
<p>You'll need JavaScript to be enabled for the tools to work.</p>
48

59
<p>Keyboard tools are currently <strong class="js-keyboard_tools-status">unknown</strong>.
6-
<button class="button is-outlined js-keyboard_tools-toggle">Toggle</button>
10+
<button class="button is-outlined js-keyboard_tools-toggle">Toggle</button>
711
</p>
812

9-
<p>This setting is stored in your browser and not your user account, so you can set it as you want it on any device.</p>
13+
<p>This setting is stored in your browser and not your user account, so you can set it as you want it on any device.</p>

app/views/devise/mailer/confirmation_instructions.html.erb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
<p>Welcome to Codidact, <%= @resource.username %>! We're glad you're here. (If this wasn't you, please ignore this email.)</p>
1+
<p>Welcome to <%= SiteSetting['NetworkName'] %>, <%= @resource.username %>! We're glad you're here. (If this wasn't you, please ignore this email.)</p>
22

3-
<p>Please confirm your registration by clicking below (or copy and paste the URL into your browser). You cannot sign in to your account until you do this.</p>
3+
<p>
4+
Please confirm your registration by clicking below (or copy and paste the URL into your browser).
5+
You cannot sign in to your account until you do this.
6+
</p>
47

58
<p>
69
<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, host: RequestContext.community.host),

app/views/devise/registrations/new.html.erb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<% end %>
99

1010
<div class="notice is-info">
11-
<i class="fas fa-info-circle"></i> If you have an account on another <a href="https://codidact.com/">Codidact site</a>,
11+
<i class="fas fa-info-circle"></i> If you have an account on another
12+
<a href="https://codidact.com/"><%= SiteSetting['NetworkName'] %> site</a>,
1213
don't create a new account here - <%= link_to 'sign in', new_user_session_path %> with your existing details instead.
1314
</div>
1415

@@ -28,7 +29,7 @@
2829
<div class="form-group">
2930
<%= f.label :password, class: "form-element" %>
3031
<% if @minimum_password_length %>
31-
<div class="form-caption">(<%= @minimum_password_length %> characters minimum)</div>
32+
<div class="form-caption">(<%= @minimum_password_length %> characters minimum)</div>
3233
<% end %>
3334
<%= f.password_field :password, class: 'form-element', autocomplete: "new-password" %>
3435
</div>

app/views/donation_mailer/donation_successful.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121

2222
<p>
2323
Thanks and see you around,<br/>
24-
The Codidact Team
24+
The <%= SiteSetting['NetworkName'] %> Team
2525
</p>

app/views/donation_mailer/donation_successful.text.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ exactly what we've received and how we've spent it, which you'll find on Meta (h
1111

1212
If you're not already, get involved! Here are some more things you can do:
1313

14-
* Join our mailing list (https://codidact.org/)
15-
* Browse and join our communities (https://codidact.com/)
14+
* Join our mailing list (https://codidact.org/)
15+
* Browse and join our communities (https://codidact.com/)
1616

1717
Thanks and see you around,
18-
The Codidact Team
18+
The <%= SiteSetting['NetworkName'] %> Team

app/views/donation_mailer/donation_uncaptured.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
<p>
2222
Thanks and see you around,<br/>
23-
The Codidact Team
23+
The <%= SiteSetting['NetworkName'] %> Team
2424
</p>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<% if @name.nil? %>
2-
Your donation is unfinished
3-
---------------------------
2+
Your donation is unfinished
3+
---------------------------
44
<% else %>
5-
Your donation is unfinished, <%= @name %>
6-
-----------------------------<%= '-' * @name.size %>
5+
Your donation is unfinished, <%= @name %>
6+
-----------------------------<%= '-' * @name.size %>
77
<% end %>
88

99
You started the process to make a donation of <%= number_to_currency(@amount, unit: @symbol) %>, but left off before finishing up.
@@ -16,4 +16,4 @@ lend a hand.
1616
Whatever happened, thanks for thinking of us!
1717

1818
Thanks and see you around,
19-
The Codidact Team
19+
The <%= SiteSetting['NetworkName'] %> Team

app/views/layouts/_head.html.erb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
<% icon_path = SiteSetting['IconPath'] %>
1515
<link rel="icon" href="<%= icon_path.present? ? icon_path : '/assets/favicon.ico' %>" />
16-
<link rel="search" type="application/opensearchdescription+xml"
17-
title="Codidact <%= RequestContext.community.name %> search" href="<%= osd_url(format: :xml) %>" />
16+
<link rel="search"
17+
type="application/opensearchdescription+xml"
18+
title="<%= SiteSetting['NetworkName'] %> <%= RequestContext.community.name %> search"
19+
href="<%= osd_url(format: :xml) %>" />
1820
<link rel="preconnect" href="https://cdn.jsdelivr.net" />
1921
<link rel="preconnect" href="https://cdnjs.cloudflare.com" />
2022

@@ -81,7 +83,7 @@
8183
<meta name="twitter:card" content="summary" />
8284
<meta name="twitter:creator" content="@CodidactQA" />
8385
<meta property="og:type" content="website" />
84-
<meta property="og:site_name" content="<%= RequestContext.community.name %> - Codidact" />
86+
<meta property="og:site_name" content="<%= RequestContext.community.name %> - <%= SiteSetting['NetworkName'] %>" />
8587
<meta property="og:url" content="<%= request.original_url %>" />
8688
<meta property="og:title" content="<%= page_title %>" />
8789
<meta property="og:description" content="<%= content_for?(:description) ? content_for(:description) : desc %>" />

app/views/moderator/index.html.erb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,8 @@
105105

106106
<% chat = SiteSetting['ChatLink'] %>
107107
<% if chat.present? %>
108-
<p>As a moderator, you should join our <%= link_to 'community chat server', chat %>. Ping a Codidact team member there and you'll receive access to a special moderator-only lounge, where you can discuss moderation questions with your fellow moderators.</p>
108+
<p>
109+
As a moderator, you should join our <%= link_to 'community chat server', chat %>.
110+
Ping a <%= SiteSetting['NetworkName'] %> team member there and you'll receive access to a moderator-only lounge,
111+
where you can discuss moderation questions with your fellow moderators.</p>
109112
<% end %>

0 commit comments

Comments
 (0)