Skip to content

Commit

Permalink
Remove version number "5" from titles and texts
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasWeinert committed Apr 20, 2018
1 parent ff5f550 commit 0cbc40c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/system/papaya_help.php
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ function sendBugReport() {
'CC'
);
}
$email->setSubject('papaya CMS 5 Bug Report');
$email->setSubject('papaya CMS Bug Report');
$body = $this->bugReportDialog->data['description']."\n";
if (isset($this->bugReportDialog->data['testdata']) &&
$this->bugReportDialog->data['testdata']) {
Expand Down
14 changes: 7 additions & 7 deletions src/system/papaya_installer.php
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@ function getXMLInfoText($testSummary) {
}
$result = '<sheet><text>'.LF;
$result .= '<div class="installer">';
$result .= '<h1>papaya CMS 5 installation tests.</h1>'.LF;
$result .= '<h1>papaya CMS installation tests.</h1>'.LF;
$result .= '<p>The Installer has run some tests.</p>'.LF;
$result .= '<table>';
if ($testSummary[TESTRESULT_FAILED] > 0) {
Expand Down Expand Up @@ -1387,7 +1387,7 @@ function getXMLInfoText($testSummary) {
papaya_strings::escapeHTMLChars($this->getLink(array('step' => $link)))
);
} else {
$result .= '<p class="error">Your server does not support <i>papaya CMS 5</i>'.
$result .= '<p class="error">Your server does not support <i>papaya CMS</i>'.
' currently. The installation can not continue.</p>'.LF;
}
$result .= '<p>If you need more information about the system requirements and'.
Expand Down Expand Up @@ -1415,9 +1415,9 @@ function getXMLWelcomeText() {
$result .= '<text>'.LF;
$result .= '<div class="installer">';
$result .= '<br/>'.LF;
$result .= '<h1>Welcome to the papaya CMS 5 installation.</h1>'.LF;
$result .= '<h1>Welcome to the papaya CMS installation.</h1>'.LF;
$result .= '<p>The installer will guide you through the installation of'.
' papaya CMS 5 step by step.</p>'.LF;
' papaya CMS step by step.</p>'.LF;
$result .= sprintf(
'<a href="%s" class="nextLink">Next &gt;&gt;</a>',
papaya_strings::escapeHTMLChars($this->getLink(array('step' => 'license')))
Expand Down Expand Up @@ -1448,8 +1448,8 @@ function getXMLLicenseText() {
$data = $this->getLicense();
$result = '<sheet width="800px" align="center">';
$result .= '<text><div class="installer">';
$result .= '<h1 style="padding-left: 4px;">papaya CMS 5 license.</h1>'.LF;
$result .= '<p style="padding-left: 4px;">To install papaya CMS 5 please read the'.
$result .= '<h1 style="padding-left: 4px;">papaya CMS license.</h1>'.LF;
$result .= '<p style="padding-left: 4px;">To install papaya CMS please read the'.
' terms of the following license before you continue.</p>'.LF;
$result .= '<br/>'.LF;
$result .= '<div style="text-align: center; padding-top: 2em; font-weight: bold;">';
Expand Down Expand Up @@ -1487,7 +1487,7 @@ function getXMLLicenseText() {
function getXMLDefaultsText() {
$result = '<sheet width="300px" align="center">';
$result .= '<text><div class="installer">';
$result .= '<h1 style="padding-left: 4px;">papaya CMS 5 default data.</h1>'.LF;
$result .= '<h1 style="padding-left: 4px;">papaya CMS default data.</h1>'.LF;
if ($this->getOptionsValidator()->validate()) {
$result .= sprintf(
'<a href="%s" class="nextLink">Next &gt;&gt;</a>',
Expand Down

0 comments on commit 0cbc40c

Please sign in to comment.