} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
} else {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" is not user editable', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" is not user editable', array($id))
],
Http::STATUS_FORBIDDEN
);
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
} catch (NotFoundException $e) {
return new DataResponse(
[
- 'message' => (string)$this->l10n->t('Storage with id "%i" not found', array($id))
+ 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
],
Http::STATUS_NOT_FOUND
);
$mount = $this->dbConfig->getMountById($id);
if (!is_array($mount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
$config = $this->getStorageConfigFromDBMount($mount);
if ($this->isApplicable($config)) {
return $config;
} else {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
}
$existingMount = $this->dbConfig->getMountById($id);
if (!is_array($existingMount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found while updating storage');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found while updating storage');
}
$oldStorage = $this->getStorageConfigFromDBMount($existingMount);
$existingMount = $this->dbConfig->getMountById($id);
if (!is_array($existingMount)) {
- throw new NotFoundException('Storage with id "' . $id . '" not found');
+ throw new NotFoundException('Storage with ID "' . $id . '" not found');
}
$this->dbConfig->removeMount($id);
}
$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
- ->setParsedMessage($l->t('Please check the nextcloud and server log files for errors.'));
+ ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
} elseif ($notification->getObjectType() === 'core') {
$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
} else if(message === 'connection error') {
message = t('user_ldap', 'A connection error to LDAP / AD occurred, please check host, port and credentials.');
} else if(message === 'missing placeholder') {
- message = t('user_ldap', 'The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
+ message = t('user_ldap', 'The "%uid" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
}
}
OC.Notification.showTemporary(message, {isHTML: isHtml});
</p>
<p class="ldap_count">
<button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button">
- <?php p($l->t('Verify settings and count groups'));?>
+ <?php p($l->t('Verify settings and count the groups'));?>
</button>
<span id="ldap_group_count"></span>
</p>
</label>
<input type="checkbox" id="ldap_loginfilter_username"
- title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected.'));?>"
+ title="<?php p($l->t('Allows login against the LDAP / AD username, which is either uid or sAMAccountName and will be detected.'));?>"
name="ldap_loginfilter_username" value="1" />
</p>
<p>
</select>
<button type="button" id="ldap_action_add_configuration"
name="ldap_action_add_configuration" class="icon-add icon-default-style"
- title="<?php p($l->t('Add a new and blank configuration'));?>"> </button>
+ title="<?php p($l->t('Add a new configuration'));?>"> </button>
<button type="button" id="ldap_action_copy_configuration"
name="ldap_action_copy_configuration"
class="ldapIconCopy icon-default-style"
<input type="text" class="host" id="ldap_host"
name="ldap_host"
placeholder="<?php p($l->t('Host'));?>"
- title="<?php p($l->t('You can omit the protocol, except you require SSL. Then start with ldaps://'));?>"
+ title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
/>
<span class="hostPortCombinatorSpan">
<input type="number" id="ldap_port" name="ldap_port"
this.saving = false;
this.originalModel = JSON.parse(JSON.stringify(this.model));
- this.message = t('workflowengine', 'Successfully saved');
+ this.message = t('workflowengine', 'Saved');
this.errorMessage = '';
this.render();
};
getCheck: function() {
return {
'class': 'OCA\\WorkflowEngine\\Check\\FileMimeType',
- 'name': t('workflowengine', 'File mime type'),
+ 'name': t('workflowengine', 'File MIME type'),
'operators': [
{'operator': 'is', 'name': t('workflowengine', 'is')},
{'operator': '!is', 'name': t('workflowengine', 'is not')},
}
};
buttonlist[0] = {
- text: t('core', 'Ok'),
+ text: t('core', 'OK'),
click: functionToCall,
defaultButton: true
};
// .ocdata is an empty file in the data directory - if this is readable then the data dir is not protected
if (xhr.status === 200 && xhr.responseText === '') {
messages.push({
- msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.'),
+ msg: t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.'),
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
});
}
var PASSWORD_PLACEHOLDER = '**********';
var PASSWORD_PLACEHOLDER_MESSAGE = t('core', 'Choose a password for the public link');
- var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press enter');
+ var PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL = t('core', 'Choose a password for the public link or press "Enter ↵"');
var TEMPLATE =
'{{#if shareAllowed}}' +
async.done(function( data, s, x ){
expect(data).toEqual([
{
- msg: 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.',
+ msg: 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.',
type: OC.SetupChecks.MESSAGE_TYPE_ERROR
}]);
done();
if (isset($this->encryptionModules[$moduleId])) {
return call_user_func($this->encryptionModules[$moduleId]['callback']);
} else {
- $message = "Module with id: $moduleId does not exist.";
- $hint = $this->l->t('Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]);
+ $message = "Module with ID: $moduleId does not exist.";
+ $hint = $this->l->t('Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.', [$moduleId]);
throw new Exceptions\ModuleDoesNotExistsException($message, $hint);
}
} else {
/**
* Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
*
- * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
+ * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
*/
public function addFooter($text = '') {
if($text === '') {
- $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically generated email, please do not reply.');
+ $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan() . '<br>' . $this->l10n->t('This is an automatically sent email, please do not reply.');
}
if ($this->footerAdded) {
$connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string);
if(!$connection) {
throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
- $this->trans->t('You need to enter either an existing account or the administrator.'));
+ $this->trans->t('You need to enter details of an existing account.'));
}
$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
$stmt = oci_parse($connection, $query);
} catch (\Exception $e) {
$this->logger->logException($e);
throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
- $this->trans->t('You need to enter either an existing account or the administrator.'));
+ $this->trans->t('You need to enter details of an existing account.'));
}
}
if (!file_exists($dataDirectory . '/.ocdata')) {
$errors[] = [
- 'error' => $l->t('Your data directory is invalid'),
+ 'error' => $l->t('Your data directory is invalid'),
'hint' => $l->t('Please check that the data directory contains a file' .
' ".ocdata" in its root.')
];
/**
* Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
*
- * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically generated email" will be used
+ * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
*
* @since 12.0.0
*/
$subject = $this->l->t('Your password was reset by an administrator');
} else if ($event->getSubject() === self::EMAIL_CHANGED_BY) {
- $subject = $this->l->t('{actor} changed your email');
+ $subject = $this->l->t('{actor} changed your email address');
} else if ($event->getSubject() === self::EMAIL_CHANGED_SELF) {
- $subject = $this->l->t('You changed your email');
+ $subject = $this->l->t('You changed your email address');
} else if ($event->getSubject() === self::EMAIL_CHANGED) {
- $subject = $this->l->t('Your email was changed by an administrator');
+ $subject = $this->l->t('Your email address was changed by an administrator');
} else {
throw new \InvalidArgumentException();
return new JSONResponse([
'status' => 'error',
'data' => [
- 'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was successfully updated.'),
+ 'message' => $this->l->t('Backend doesn\'t support password change, but the user\'s encryption key was updated.'),
]
]);
} elseif (!$result && !$recoveryEnabledForUser) {
}
OC.Settings.Apps.hideErrorMessage(appId);
- element.val(t('settings','Uninstalling ....'));
+ element.val(t('settings','Uninstalling …'));
$.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) {
if(!result || result.status !== 'success') {
OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app'));
if (!$_['has_fileinfo']) {
?>
<li>
- <?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?>
+ <?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?>
</li>
<?php
}
</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>
--
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);
</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>
--
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);
</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>
--
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
/**
* @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);
//
// /**
// * @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');
'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');
projects / nextcloud-server.git / commitdiff