Merge pull request #5355 from nextcloud/stable12-5167

[stable12] l10n improvements from transifex
This commit is contained in:
Joas Schilling 2017-06-13 10:20:26 +02:00 committed by GitHub
commit eb22d392d8
3 changed files with 4 additions and 4 deletions

View File

@ -152,7 +152,7 @@
messages.push({
msg: t(
'core',
'The PHP Opcache is not properly configured. <a target="_blank" rel="noreferrer" href="{docLink}">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:',
'The PHP OPcache is not properly configured. <a target="_blank" rel="noreferrer" href="{docLink}">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:',
{
docLink: data.phpOpcacheDocumentation,
}

View File

@ -433,7 +433,7 @@ describe('OC.SetupChecks tests', function() {
async.done(function( data, s, x ){
expect(data).toEqual([{
msg: 'The PHP Opcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:' + "<pre><code>opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>",
msg: 'The PHP OPcache is not properly configured. <a href="https://example.org/link/to/doc" rel="noreferrer">For better performance we recommend</a> to use following settings in the <code>php.ini</code>:' + "<pre><code>opcache.enable=1\nopcache.enable_cli=1\nopcache.interned_strings_buffer=8\nopcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.save_comments=1\nopcache.revalidate_freq=1</code></pre>",
type: OC.SetupChecks.MESSAGE_TYPE_INFO
}]);
done();

View File

@ -997,8 +997,8 @@ class OC_Util {
if (!file_exists($dataDirectory . '/.ocdata')) {
$errors[] = [
'error' => $l->t('Your data directory is invalid'),
'hint' => $l->t('Please check that the data directory contains a file' .
' ".ocdata" in its root.')
'hint' => $l->t('Ensure there is a file called ".ocdata"' .
' in the root of the data directory.')
];
}
return $errors;