Fixes #3438 - Remove duplicate LAN_ERROR_*

e107inc · Nov 30, 2023 · ea8d808 · ea8d808
1 parent dbcc265
commit ea8d808
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/e107_handlers/error_page_class.php b/e107_handlers/error_page_class.php
@@ -127,7 +127,7 @@ private function setPageForbidden()
 		$this->template = 403;
 		$this->title = LAN_ERROR_4;
 		$this->caption = LAN_ERROR_45;
-		$this->content = LAN_ERROR_5 . '<br/>' . LAN_ERROR_6 . '<br/><br/>' . LAN_ERROR_2;
+		$this->content = LAN_ERROR_5 . '<br/>' . LAN_ERROR_3 . '<br/><br/>' . LAN_ERROR_2;
 	}
 
 	/**
@@ -140,7 +140,7 @@ private function setPageNotFound()
 		$this->template = 404;
 		$this->title = LAN_ERROR_7;
 		$this->caption = LAN_ERROR_45;
-		$this->content = LAN_ERROR_21 . '<br/>' . LAN_ERROR_9;
+		$this->content = LAN_ERROR_21 . '<br/>' . LAN_ERROR_3;
 	}
 
 	/**
@@ -153,7 +153,7 @@ private function setPageInternalServerError()
 		$this->template = 500;
 		$this->title = LAN_ERROR_10;
 		$this->caption = LAN_ERROR_14;
-		$this->content = LAN_ERROR_11 . '<br/>' . LAN_ERROR_12;
+		$this->content = LAN_ERROR_11 . '<br/>' . LAN_ERROR_3;
 	}
 
 	/**
@@ -168,7 +168,7 @@ private function setPageUnknown()
 		$this->template = 'DEFAULT';
 		$this->title = LAN_ERROR_13 . ' (' . $errorQuery . ')';
 		$this->caption = LAN_ERROR_14;
-		$this->content = LAN_ERROR_15;
+		$this->content = LAN_ERROR_3;
 	}
 
 	/**

diff --git a/e107_languages/English/lan_error.php b/e107_languages/English/lan_error.php
@@ -21,16 +21,16 @@
 
 define("LAN_ERROR_4", "Error 403 - Access forbidden");
 define("LAN_ERROR_5", "You are not permitted to retrieve the document or page you requested.");
-define("LAN_ERROR_6", "Please inform the administrator of the referring page if you think this error page has been shown by mistake.");
+//define("LAN_ERROR_6", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3
 
 define("LAN_ERROR_7", "Error 404 - Document Not Found");
-define("LAN_ERROR_9", "Please inform the administrator of the referring page if you think this error message has been shown by mistake.");
+//define("LAN_ERROR_9", "Please inform the administrator of the referring page if you think this error message has been shown by mistake."); // use LAN_ERROR_3
 define("LAN_ERROR_10", "Error 500 - Internal server error");
 define("LAN_ERROR_11", "The server encountered an internal error or misconfiguration and was unable to complete your request");
-define("LAN_ERROR_12", "Please inform the administrator of the referring page if you think this error page has been shown by mistake.");
+//define("LAN_ERROR_12", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3
 define("LAN_ERROR_13", "Error - Unknown");
 define("LAN_ERROR_14", "The server encountered an error");
-define("LAN_ERROR_15", "Please inform the administrator of the referring page if you think this error page has been shown by mistake.");
+//define("LAN_ERROR_15", "Please inform the administrator of the referring page if you think this error page has been shown by mistake."); // use LAN_ERROR_3
 define("LAN_ERROR_16", "Your unsuccessful attempt to access");
 define("LAN_ERROR_17", "has been recorded.");
 define("LAN_ERROR_18", "Apparently, you were referred here by");