From 64304c836403a141d59e428de5f833ea385eda6f Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Tue, 13 Aug 2019 21:05:12 +0200
Subject: [PATCH 1/2] [ticket/15745] Uses {{ CREDIT_LINE }} instead of
 hardcoded language

PHPBB3-15745
---
 phpBB/adm/style/installer_footer.html                    | 4 +++-
 .../prosilver/template/ucp_pm_viewmessage_print.html     | 9 ++++++++-
 phpBB/styles/prosilver/template/viewtopic_print.html     | 9 ++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index fefa8f6d3f..181add5038 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -6,7 +6,9 @@
 
 	<div id="page-footer">
 		<div class="copyright">
-			Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+			<!-- IF S_COPYRIGHT_HTML -->
+				{{ CREDIT_LINE }}
+			<!-- ENDIF -->
 		</div>
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index 7a8849258a..06a9699e92 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -42,7 +42,14 @@
 
 	<div id="page-footer" class="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
+		<div class="copyright">
+			<p>{ CREDIT_LINE }}
+			</p>
+			<!-- IF TRANSLATION_INFO -->
+			<p>{{ TRANSLATION_INFO }}
+			</p>
+			<!-- ENDIF -->
+		</div>
 	</div>
 </div>
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index b504949053..3c77e214e0 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -38,7 +38,14 @@
 
 	<div id="page-footer" class="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
-		<div class="copyright">Powered by phpBB&reg; Forum Software &copy; phpBB Limited<br />https://www.phpbb.com/</div>
+			<div class="copyright">
+				<p>{ CREDIT_LINE }}
+				</p>
+				<!-- IF TRANSLATION_INFO -->
+				<p>{{ TRANSLATION_INFO }}
+				</p>
+				<!-- ENDIF -->
+			</div>
 	</div>
 </div>
 

From 14d83139ce488b12085a14935c88a40dfdf2492f Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Tue, 13 Aug 2019 21:32:44 +0200
Subject: [PATCH 2/2] [ticket/15745] Use TWIG instead of phpbb template code

PHPBB3-15745
---
 phpBB/adm/style/installer_footer.html                       | 4 ++--
 .../styles/prosilver/template/ucp_pm_viewmessage_print.html | 6 +++---
 phpBB/styles/prosilver/template/viewtopic_print.html        | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
index 181add5038..54e6951a12 100644
--- a/phpBB/adm/style/installer_footer.html
+++ b/phpBB/adm/style/installer_footer.html
@@ -6,9 +6,9 @@
 
 	<div id="page-footer">
 		<div class="copyright">
-			<!-- IF S_COPYRIGHT_HTML -->
+			{% if S_COPYRIGHT_HTML %}
 				{{ CREDIT_LINE }}
-			<!-- ENDIF -->
+			{% endif %}
 		</div>
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
index 06a9699e92..41ff5b898a 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
@@ -43,12 +43,12 @@
 	<div id="page-footer" class="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
 		<div class="copyright">
-			<p>{ CREDIT_LINE }}
+			<p>{{ CREDIT_LINE }}
 			</p>
-			<!-- IF TRANSLATION_INFO -->
+			{% if TRANSLATION_INFO %}
 			<p>{{ TRANSLATION_INFO }}
 			</p>
-			<!-- ENDIF -->
+			{% endif %}
 		</div>
 	</div>
 </div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html
index 3c77e214e0..658062f9fd 100644
--- a/phpBB/styles/prosilver/template/viewtopic_print.html
+++ b/phpBB/styles/prosilver/template/viewtopic_print.html
@@ -39,12 +39,12 @@
 	<div id="page-footer" class="page-footer">
 		<div class="page-number">{S_TIMEZONE}<br />{PAGE_NUMBER}</div>
 			<div class="copyright">
-				<p>{ CREDIT_LINE }}
+				<p>{{ CREDIT_LINE }}
 				</p>
-				<!-- IF TRANSLATION_INFO -->
+				{% if TRANSLATION_INFO %}
 				<p>{{ TRANSLATION_INFO }}
 				</p>
-				<!-- ENDIF -->
+				{% endif %}
 			</div>
 	</div>
 </div>