diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2023-02-09 11:19:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 11:19:14 +0100 |
| commit | d0eeb279b7ffe173d4a9911ce5e5b1a00cdb72da (patch) | |
| tree | 61f00e1f6f29f425822857b9e8115a7dd2a550c9 /core | |
| parent | d5c40a66fcbea2493326144b06e7a7d66a86ff28 (diff) | |
| parent | d4ed1a13fd1ef1ffc2b3e49623eb481c8772a98e (diff) | |
| download | nextcloud-server-d0eeb279b7ffe173d4a9911ce5e5b1a00cdb72da.tar.gz nextcloud-server-d0eeb279b7ffe173d4a9911ce5e5b1a00cdb72da.zip | |
Merge pull request #36587 from nextcloud/revert/34906
Revert "update 64-bit check wording"
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/setupchecks.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 67f8d70bd31..73896f9fc91 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -421,7 +421,7 @@ messages.push({ msg: t( 'core', - 'It seems like you are running a 32-bit PHP version. Nextcloud 26 and higher require 64-bit. Please upgrade your OS and PHP to 64-bit! For further details read {linkstart}the documentation page ↗{linkend} about this.' + 'It seems like you are running a 32-bit PHP version. Nextcloud needs 64-bit to run well. Please upgrade your OS and PHP to 64-bit! For further details read {linkstart}the documentation page ↗{linkend} about this.' .replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + OC.theme.docPlaceholderUrl.replace('PLACEHOLDER', 'admin-system-requirements') + '">') .replace('{linkend}', '</a>'), ), diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 6df1659d7d3..4532ac457b6 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -1234,7 +1234,7 @@ describe('OC.SetupChecks tests', function() { }); }); - + it('should return an error if imagick is not enabled', function(done) { var async = OC.SetupChecks.checkSetup(); @@ -1293,7 +1293,7 @@ describe('OC.SetupChecks tests', function() { }); }); - + it('should return an error if gmp or bcmath are not enabled', function(done) { var async = OC.SetupChecks.checkSetup(); @@ -1403,7 +1403,7 @@ describe('OC.SetupChecks tests', function() { async.done(function( data, s, x ){ expect(data).toEqual([{ - msg: 'It seems like you are running a 32-bit PHP version. Nextcloud 26 and higher require 64-bit. Please upgrade your OS and PHP to 64-bit! For further details read <a href="https://docs.example.org/admin-system-requirements" class="external" rel="noreferrer noopener">the documentation page ↗</a> about this.', + msg: 'It seems like you are running a 32-bit PHP version. Nextcloud needs 64-bit to run well. Please upgrade your OS and PHP to 64-bit! For further details read <a href="https://docs.example.org/admin-system-requirements" class="external" rel="noreferrer noopener">the documentation page ↗</a> about this.', type: OC.SetupChecks.MESSAGE_TYPE_WARNING }]); done(); |