summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-18 18:01:50 -0500
committerGitHub <noreply@github.com>2017-04-18 18:01:50 -0500
commit269600a04f18e025313352d3b2293cc10d3c26fa (patch)
treeea97f5ea1965ea7328ce9a20585a282419e1ecf2 /tests
parent34e0b21f418c7dcc5ab346248873a2ae0ec5ba2b (diff)
parent1c0bffe87f578403b130015f8fee5560cc075b34 (diff)
downloadnextcloud-server-269600a04f18e025313352d3b2293cc10d3c26fa.tar.gz
nextcloud-server-269600a04f18e025313352d3b2293cc10d3c26fa.zip
Merge pull request #4369 from nextcloud/fix-translations
Fix translations
Diffstat (limited to 'tests')
-rw-r--r--tests/Settings/Mailer/NewUserMailHelperTest.php8
-rw-r--r--tests/data/emails/new-account-email.html2
-rw-r--r--tests/data/emails/new-account-email.txt2
-rw-r--r--tests/lib/Encryption/ManagerTest.php4
-rw-r--r--tests/lib/Mail/EMailTemplateTest.php2
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php
index 707abe9588d..7cf6c635360 100644
--- a/tests/Settings/Mailer/NewUserMailHelperTest.php
+++ b/tests/Settings/Mailer/NewUserMailHelperTest.php
@@ -324,7 +324,7 @@ class NewUserMailHelperTest extends TestCase {
</tr>
</tbody>
</table>
- <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically generated email, please do not reply.</p>
+ <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>
</center>
</td>
</tr>
@@ -350,7 +350,7 @@ Install Client: https://nextcloud.com/install/#install-clients
--
TestCloud -
-This is an automatically generated email, please do not reply.
+This is an automatically sent email, please do not reply.
EOF;
$result = $this->newUserMailHelper->generateTemplate($user, true);
@@ -557,7 +557,7 @@ EOF;
</tr>
</tbody>
</table>
- <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically generated email, please do not reply.</p>
+ <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - <br>This is an automatically sent email, please do not reply.</p>
</center>
</td>
</tr>
@@ -583,7 +583,7 @@ Install Client: https://nextcloud.com/install/#install-clients
--
TestCloud -
-This is an automatically generated email, please do not reply.
+This is an automatically sent email, please do not reply.
EOF;
$result = $this->newUserMailHelper->generateTemplate($user, false);
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html
index 2e3866163d7..32568e11b66 100644
--- a/tests/data/emails/new-account-email.html
+++ b/tests/data/emails/new-account-email.html
@@ -173,7 +173,7 @@
</tr>
</tbody>
</table>
- <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - A safe home for your data<br>This is an automatically generated email, please do not reply.</p>
+ <p class="text-center float-center" align="center" style="Margin:0;Margin-bottom:10px;color:#C8C8C8;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:12px;font-weight:400;line-height:16px;margin:0;margin-bottom:10px;padding:0;text-align:center">TestCloud - A safe home for your data<br>This is an automatically sent email, please do not reply.</p>
</center>
</td>
</tr>
diff --git a/tests/data/emails/new-account-email.txt b/tests/data/emails/new-account-email.txt
index e01268b5620..42d41406ba8 100644
--- a/tests/data/emails/new-account-email.txt
+++ b/tests/data/emails/new-account-email.txt
@@ -10,4 +10,4 @@ Install Client: https://nextcloud.com/install/#install-clients
--
TestCloud - A safe home for your data
-This is an automatically generated email, please do not reply. \ No newline at end of file
+This is an automatically sent email, please do not reply. \ No newline at end of file
diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php
index ad7f47e0a3e..ac26d4cb528 100644
--- a/tests/lib/Encryption/ManagerTest.php
+++ b/tests/lib/Encryption/ManagerTest.php
@@ -100,7 +100,7 @@ class ManagerTest extends TestCase {
/**
* @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
- * @expectedExceptionMessage Module with id: unknown does not exist.
+ * @expectedExceptionMessage Module with ID: unknown does not exist.
*/
public function testGetEncryptionModuleUnknown() {
$this->config->expects($this->any())->method('getAppValue')->willReturn(true);
@@ -214,7 +214,7 @@ class ManagerTest extends TestCase {
//
// /**
// * @expectedException \OC\Encryption\Exceptions\ModuleDoesNotExistsException
-// * @expectedExceptionMessage Module with id: unknown does not exist.
+// * @expectedExceptionMessage Module with ID: unknown does not exist.
// */
// public function testGetEncryptionModuleUnknown() {
// $config = $this->getMock('\OCP\IConfig');
diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php
index 2ba68dbbabb..450c007149c 100644
--- a/tests/lib/Mail/EMailTemplateTest.php
+++ b/tests/lib/Mail/EMailTemplateTest.php
@@ -81,7 +81,7 @@ class EMailTemplateTest extends TestCase {
'Install Client', 'https://nextcloud.com/install/#install-clients'
);
$this->emailTemplate->addFooter(
- 'TestCloud - A safe home for your data<br>This is an automatically generated email, please do not reply.'
+ 'TestCloud - A safe home for your data<br>This is an automatically sent email, please do not reply.'
);
$expectedHTML = file_get_contents(\OC::$SERVERROOT . '/tests/data/emails/new-account-email.html');