From ba856ee975257766c3bd75c2301db782065004cb Mon Sep 17 00:00:00 2001
From: Eric Schultz <eric@wwahammy.com>
Date: Thu, 31 May 2018 12:20:49 -0500
Subject: [PATCH] correct footer terms and privacy link on multiple pages

---
 app/views/components/_footer_sub.html.erb  | 4 ++--
 app/views/layouts/_apified_footer.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/components/_footer_sub.html.erb b/app/views/components/_footer_sub.html.erb
index 382709a4..cce410c3 100644
--- a/app/views/components/_footer_sub.html.erb
+++ b/app/views/components/_footer_sub.html.erb
@@ -8,7 +8,7 @@
 
 				<span>
 
-					<span class='globalFooter-sub-item'>&copy; <%= Time.current.year %> CommitChange</span>
+					<span class='globalFooter-sub-item'>&copy; <%= Time.current.year %> <%= Settings.general.name %></span>
 
 					<span class='globalFooter-sub-item'>
 						<% if current_user %>
@@ -18,7 +18,7 @@
 						<% end %>
 					</span>
 					<span class='globalFooter-sub-item'>
-						<%= link_to "Terms & Privacy", Format::Url.concat(root_url, "help/terms-of-service-and-privacy-policy") %>
+						<%= link_to( t("footer.terms_and_privacy"), controller: :static, action: :terms_and_privacy) %>
 					</span>
 				</span>
 			</span>
diff --git a/app/views/layouts/_apified_footer.html.erb b/app/views/layouts/_apified_footer.html.erb
index af4d7afa..52c507b5 100644
--- a/app/views/layouts/_apified_footer.html.erb
+++ b/app/views/layouts/_apified_footer.html.erb
@@ -3,9 +3,9 @@
 <% if @theme == 'minimal' %>
   <div class="minimalFooter">
     <div class="container">
-      <span>&copy; 2018 <%= Settings.general.name %></span>
+      <span>&copy; <%= Time.current.year %> <%= Settings.general.name %></span>
       <span>About</span>
-      <span><%= link_to "Terms & Privacy", controller: :static, action: :terms_and_privacy %></span>
+      <span><%= link_to( t("footer.terms_and_privacy"), controller: :static, action: :terms_and_privacy) %></span>
     </div>
 
   </div>