summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/comments/l10n/en_GB.js1
-rw-r--r--apps/comments/l10n/en_GB.json1
-rw-r--r--apps/comments/l10n/sr.js1
-rw-r--r--apps/comments/l10n/sr.json1
-rw-r--r--apps/comments/l10n/zh_HK.js1
-rw-r--r--apps/comments/l10n/zh_HK.json1
-rw-r--r--apps/files/l10n/fr.js1
-rw-r--r--apps/files/l10n/fr.json1
-rw-r--r--apps/files/l10n/ja.js1
-rw-r--r--apps/files/l10n/ja.json1
-rw-r--r--apps/updatenotification/lib/Notification/BackgroundJob.php5
-rw-r--r--apps/updatenotification/tests/Notification/BackgroundJobTest.php29
-rw-r--r--apps/workflowengine/lib/Check/FileMimeType.php8
-rw-r--r--apps/workflowengine/tests/Check/FileMimeTypeTest.php6
14 files changed, 46 insertions, 12 deletions
diff --git a/apps/comments/l10n/en_GB.js b/apps/comments/l10n/en_GB.js
index 49ed5a39611..a407653ecfc 100644
--- a/apps/comments/l10n/en_GB.js
+++ b/apps/comments/l10n/en_GB.js
@@ -16,6 +16,7 @@ OC.L10N.register(
"Delete comment" : "Delete comment",
"Cancel edit" : "Cancel edit",
"Post comment" : "Post comment",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"No more messages" : "No more messages",
"Retry" : "Retry",
diff --git a/apps/comments/l10n/en_GB.json b/apps/comments/l10n/en_GB.json
index 2d616dee12b..06925580145 100644
--- a/apps/comments/l10n/en_GB.json
+++ b/apps/comments/l10n/en_GB.json
@@ -14,6 +14,7 @@
"Delete comment" : "Delete comment",
"Cancel edit" : "Cancel edit",
"Post comment" : "Post comment",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"No more messages" : "No more messages",
"Retry" : "Retry",
diff --git a/apps/comments/l10n/sr.js b/apps/comments/l10n/sr.js
index ab78abb322e..6c5422c08dd 100644
--- a/apps/comments/l10n/sr.js
+++ b/apps/comments/l10n/sr.js
@@ -16,6 +16,7 @@ OC.L10N.register(
"Delete comment" : "Обриши коментар",
"Cancel edit" : "Поништи измену",
"Post comment" : "Објави коментар",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "„@” за помињања, „:” за емођи, „/” за паметни бирач",
"No comments yet, start the conversation!" : "Још нема коментара. Започните дискусију!",
"No more messages" : "Нема више порука",
"Retry" : "Покушај поново",
diff --git a/apps/comments/l10n/sr.json b/apps/comments/l10n/sr.json
index a0e52eb1c8b..f69058eaabc 100644
--- a/apps/comments/l10n/sr.json
+++ b/apps/comments/l10n/sr.json
@@ -14,6 +14,7 @@
"Delete comment" : "Обриши коментар",
"Cancel edit" : "Поништи измену",
"Post comment" : "Објави коментар",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "„@” за помињања, „:” за емођи, „/” за паметни бирач",
"No comments yet, start the conversation!" : "Још нема коментара. Започните дискусију!",
"No more messages" : "Нема више порука",
"Retry" : "Покушај поново",
diff --git a/apps/comments/l10n/zh_HK.js b/apps/comments/l10n/zh_HK.js
index 74f4e1f151c..1cd1156b923 100644
--- a/apps/comments/l10n/zh_HK.js
+++ b/apps/comments/l10n/zh_HK.js
@@ -16,6 +16,7 @@ OC.L10N.register(
"Delete comment" : "刪除留言",
"Cancel edit" : "取消編輯",
"Post comment" : "張貼留言",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
"No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
"No more messages" : "沒有更多訊息",
"Retry" : "重試",
diff --git a/apps/comments/l10n/zh_HK.json b/apps/comments/l10n/zh_HK.json
index bc2abe4d898..ae45af5da1d 100644
--- a/apps/comments/l10n/zh_HK.json
+++ b/apps/comments/l10n/zh_HK.json
@@ -14,6 +14,7 @@
"Delete comment" : "刪除留言",
"Cancel edit" : "取消編輯",
"Post comment" : "張貼留言",
+ "\"@\" for mentions, \":\" for emoji, \"/\" for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
"No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
"No more messages" : "沒有更多訊息",
"Retry" : "重試",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 04693e3d547..49c9d21bbda 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -182,6 +182,7 @@ OC.L10N.register(
"\"{displayName}\" action failed" : "Échec de l'action \"{displayName}\"",
"\"{name}\" is not an allowed filetype." : "\"{name}\" n'est pas un type de fichier autorisé.",
"{newName} already exists." : "{newName} existe déjà.",
+ "\"{char}\" is not allowed inside a file name." : "\"{char}\" n'est pas autorisé dans un nom de fichier.",
"Name cannot be empty" : "Le nom ne peut pas être vide",
"Another entry with the same name already exists" : "Une autre entrée avec le même nom existe déjà",
"Renamed \"{oldName}\" to \"{newName}\"" : "Renommer \"{oldName}\" en \"{newName}\"",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index f4acd3f3125..3825adffd6c 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -180,6 +180,7 @@
"\"{displayName}\" action failed" : "Échec de l'action \"{displayName}\"",
"\"{name}\" is not an allowed filetype." : "\"{name}\" n'est pas un type de fichier autorisé.",
"{newName} already exists." : "{newName} existe déjà.",
+ "\"{char}\" is not allowed inside a file name." : "\"{char}\" n'est pas autorisé dans un nom de fichier.",
"Name cannot be empty" : "Le nom ne peut pas être vide",
"Another entry with the same name already exists" : "Une autre entrée avec le même nom existe déjà",
"Renamed \"{oldName}\" to \"{newName}\"" : "Renommer \"{oldName}\" en \"{newName}\"",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 2189c4d7ad8..08e798df0b3 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -182,6 +182,7 @@ OC.L10N.register(
"\"{displayName}\" action failed" : "\"{displayName}\" アクションは失敗しました",
"\"{name}\" is not an allowed filetype." : "\"{name}\" は許可されたファイルタイプではありません。",
"{newName} already exists." : "{newName} すでに存在しています。",
+ "\"{char}\" is not allowed inside a file name." : "\"{char}\"はファイル名には使用できません。",
"Name cannot be empty" : "名前は空にできません",
"Another entry with the same name already exists" : "同じ名前の別のエントリがすでに存在しています",
"Renamed \"{oldName}\" to \"{newName}\"" : "\"{oldName}\" から \"{newName}\" に名前を変更済み",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index ea61f1594ce..f254dd03532 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -180,6 +180,7 @@
"\"{displayName}\" action failed" : "\"{displayName}\" アクションは失敗しました",
"\"{name}\" is not an allowed filetype." : "\"{name}\" は許可されたファイルタイプではありません。",
"{newName} already exists." : "{newName} すでに存在しています。",
+ "\"{char}\" is not allowed inside a file name." : "\"{char}\"はファイル名には使用できません。",
"Name cannot be empty" : "名前は空にできません",
"Another entry with the same name already exists" : "同じ名前の別のエントリがすでに存在しています",
"Renamed \"{oldName}\" to \"{newName}\"" : "\"{oldName}\" から \"{newName}\" に名前を変更済み",
diff --git a/apps/updatenotification/lib/Notification/BackgroundJob.php b/apps/updatenotification/lib/Notification/BackgroundJob.php
index 4889c931238..08142d5b00b 100644
--- a/apps/updatenotification/lib/Notification/BackgroundJob.php
+++ b/apps/updatenotification/lib/Notification/BackgroundJob.php
@@ -57,6 +57,11 @@ class BackgroundJob extends TimedJob {
}
protected function run($argument) {
+ // Do not check for updates if not connected to the internet
+ if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
+ return;
+ }
+
if (\OC::$CLI && !$this->config->getSystemValueBool('debug', false)) {
try {
// Jitter the pinging of the updater server and the appstore a bit.
diff --git a/apps/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
index df8b104e9ca..d669a5832b4 100644
--- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php
+++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
@@ -112,9 +112,34 @@ class BackgroundJobTest extends TestCase {
$job->expects($this->once())
->method('checkAppUpdates');
+ $this->config->expects($this->exactly(2))
+ ->method('getSystemValueBool')
+ ->withConsecutive(
+ ['has_internet_connection', true],
+ ['debug', false],
+ )
+ ->willReturnOnConsecutiveCalls(
+ true,
+ true,
+ );
+
+ self::invokePrivate($job, 'run', [null]);
+ }
+
+ public function testRunNoInternet() {
+ $job = $this->getJob([
+ 'checkCoreUpdate',
+ 'checkAppUpdates',
+ ]);
+
+ $job->expects($this->never())
+ ->method('checkCoreUpdate');
+ $job->expects($this->never())
+ ->method('checkAppUpdates');
+
$this->config->method('getSystemValueBool')
- ->with('debug', false)
- ->willReturn(true);
+ ->with('has_internet_connection', true)
+ ->willReturn(false);
self::invokePrivate($job, 'run', [null]);
}
diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php
index 991d7ebc739..dfcfed9466b 100644
--- a/apps/workflowengine/lib/Check/FileMimeType.php
+++ b/apps/workflowengine/lib/Check/FileMimeType.php
@@ -107,13 +107,7 @@ class FileMimeType extends AbstractStringCheck implements IFileCheck {
* @return bool
*/
public function executeCheck($operator, $value) {
- $actualValue = $this->getActualValue();
- $plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
- if ($actualValue === 'httpd/unix-directory') {
- return $plainMimetypeResult;
- }
- $detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
- return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
+ return $this->executeStringCheck($operator, $value, $this->getActualValue());
}
/**
diff --git a/apps/workflowengine/tests/Check/FileMimeTypeTest.php b/apps/workflowengine/tests/Check/FileMimeTypeTest.php
index 3ebcaa8f4b3..e5a4c99269f 100644
--- a/apps/workflowengine/tests/Check/FileMimeTypeTest.php
+++ b/apps/workflowengine/tests/Check/FileMimeTypeTest.php
@@ -127,7 +127,7 @@ class FileMimeTypeTest extends TestCase {
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$check->setFileInfo($storage, 'foo/bar.txt');
- $this->assertTrue($check->executeCheck('is', 'text/plain-path-detected'));
+ $this->assertTrue($check->executeCheck('is', 'text/plain-content-detected'));
}
public function testFallback() {
@@ -142,7 +142,7 @@ class FileMimeTypeTest extends TestCase {
public function testFromCacheCached() {
$storage = new Temporary([]);
$storage->mkdir('foo');
- $storage->file_put_contents('foo/bar.txt', 'asd');
+ $storage->file_put_contents('foo/bar.txt', 'text-content');
$storage->getScanner()->scan('');
$check = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
@@ -156,7 +156,7 @@ class FileMimeTypeTest extends TestCase {
$newCheck = new FileMimeType($this->l10n, $this->request, $this->mimeDetector);
$newCheck->setFileInfo($storage, 'foo/bar.txt');
- $this->assertTrue($newCheck->executeCheck('is', 'text/plain-path-detected'));
+ $this->assertTrue($newCheck->executeCheck('is', 'text/plain-content-detected'));
}
public function testExistsCached() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 23:30:25 +0000