sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36587 from nextcloud/revert/34906 

Revert "update 64-bit check wording"
pull/36594/head
Côme Chilliet 2023-02-09 11:19:14 +07:00 committed by GitHub
parent d5c40a66fc d4ed1a13fd
commit d0eeb279b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/setupchecks.js
Unescape Escape View File

@ -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>'),
),

6
core/js/tests/specs/setupchecksSpec.js
Unescape Escape View File

@ -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();