Fix error ins source language strings

https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/core/50786279
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/settings-1/50555028

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 1819b5a9c1ecd7db44158ab644454943f5b57d28..c29c4137c587a323a82ed300c3fc0ffe46f65b4b 100644 (file)
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -276,7 +276,7 @@
                                        var minimumSeconds = 15768000;
                                        if(isNaN(transportSecurityValidity) || transportSecurityValidity <= (minimumSeconds - 1)) {
                                                messages.push({
-                                                       msg: t('core', 'The "Strict-Transport-Security" HTTP header is not configured to least "{seconds}" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="{docUrl}">security tips</a>.', {'seconds': minimumSeconds, docUrl: '#admin-tips'}),
+                                                       msg: t('core', 'The "Strict-Transport-Security" HTTP header is not configured to at least "{seconds}" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="{docUrl}">security tips</a>.', {'seconds': minimumSeconds, docUrl: '#admin-tips'}),
                                                        type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                                                });
                                        }

diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 59df3a58746096b439c0f7b37ef0d130678c7223..fa0974c90f99060f5ddb0f6429c67ede4fff9557 100644 (file)
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -542,7 +542,7 @@ describe('OC.SetupChecks tests', function() {
 
                async.done(function( data, s, x ){
                        expect(data).toEqual([{
-                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
+                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to at least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
                                type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                        }]);
                        done();
@@ -567,7 +567,7 @@ describe('OC.SetupChecks tests', function() {
 
                async.done(function( data, s, x ){
                        expect(data).toEqual([{
-                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
+                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to at least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
                                type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                        }]);
                        done();
@@ -592,7 +592,7 @@ describe('OC.SetupChecks tests', function() {
 
                async.done(function( data, s, x ){
                        expect(data).toEqual([{
-                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
+                               msg: 'The "Strict-Transport-Security" HTTP header is not configured to at least "15768000" seconds. For enhanced security we recommend enabling HSTS as described in our <a href="#admin-tips">security tips</a>.',
                                type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                        }]);
                        done();

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 539e4b94b8bb2964b0cc61c93f0b4abaa75b8c4b..a51b9aa16e270fa9f0a2ae42bac9a291658f2e91 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -110,7 +110,7 @@ if ($_['WindowsWarning']) {
 foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
        ?>
        <li>
-               <?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version.', $data)); ?>
+               <?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.', $data)); ?>
        </li>
 <?php
 }