summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2023-02-09 13:52:38 +0100
committerGitHub <noreply@github.com>2023-02-09 13:52:38 +0100
commit67331c88dc53e45be6f2f39ad007824e7a6d8fb8 (patch)
treef9f8644e47e85decf1c1407856bb670ae1ad8206
parent32ed6135d2560788af295262d6ba5113da7e85cf (diff)
parentf886250bd3467a8028e32eb400974ec37ef3ed3d (diff)
downloadnextcloud-server-67331c88dc53e45be6f2f39ad007824e7a6d8fb8.tar.gz
nextcloud-server-67331c88dc53e45be6f2f39ad007824e7a6d8fb8.zip
Merge pull request #36631 from nextcloud/revert-34921-backport/34906/stable25
Revert "[stable25] update 64-bit check wording"
-rw-r--r--core/js/setupchecks.js2
-rw-r--r--core/js/tests/specs/setupchecksSpec.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 56ebf8674aa..f87a927be69 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 about this ↗{linkend}.'
+ '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 about this ↗{linkend}.'
.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 60d042102e0..3068e1e42a4 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -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 about this ↗</a>.',
+ 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 about this ↗</a>.',
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
}]);
done();