aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/l10n/pt_PT.js2
-rw-r--r--apps/files/l10n/pt_PT.json2
-rw-r--r--apps/files_external/lib/amazons3.php21
-rw-r--r--apps/files_sharing/l10n/de.js4
-rw-r--r--apps/files_sharing/l10n/de.json4
-rw-r--r--apps/files_sharing/l10n/de_DE.js5
-rw-r--r--apps/files_sharing/l10n/de_DE.json5
-rw-r--r--apps/files_sharing/l10n/el.js9
-rw-r--r--apps/files_sharing/l10n/el.json9
-rw-r--r--apps/files_sharing/l10n/ru.js6
-rw-r--r--apps/files_sharing/l10n/ru.json6
12 files changed, 57 insertions, 18 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b6f464bfd29..ed83c2be9df 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1708,11 +1708,13 @@
if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) {
this.$el.find('#filestable thead th').addClass('hidden');
this.$el.find('#emptycontent').addClass('hidden');
+ $('#searchresults').addClass('filter-empty');
if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
this.$el.find('.nofilterresults').removeClass('hidden').
find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false}));
}
} else {
+ $('#searchresults').removeClass('filter-empty');
this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
if (!this.$el.find('.mask').exists()) {
this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty);
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index 09974a0321d..d1830fefd99 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -43,7 +43,7 @@ OC.L10N.register(
"Disconnect storage" : "Desconete o armazenamento",
"Unshare" : "Deixar de partilhar",
"No permission to delete" : "Não tem permissão para apagar",
- "Download" : "Transferir",
+ "Download" : "Descarregar",
"Select" : "Selecionar",
"Pending" : "Pendente",
"Unable to determine date" : "Impossível determinar a data",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index 4172185936a..f0d2d6b74de 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -41,7 +41,7 @@
"Disconnect storage" : "Desconete o armazenamento",
"Unshare" : "Deixar de partilhar",
"No permission to delete" : "Não tem permissão para apagar",
- "Download" : "Transferir",
+ "Download" : "Descarregar",
"Select" : "Selecionar",
"Pending" : "Pendente",
"Unable to determine date" : "Impossível determinar a data",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 763cf59aa4c..02a02710a14 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -443,9 +443,12 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$path = $this->normalizePath($path);
$metadata = array();
- if (!is_null($mtime)) {
- $metadata = array('lastmodified' => $mtime);
+ if (is_null($mtime)) {
+ $mtime = time();
}
+ $metadata = [
+ 'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
+ ];
$fileType = $this->filetype($path);
try {
@@ -453,22 +456,24 @@ class AmazonS3 extends \OC\Files\Storage\Common {
if ($fileType === 'dir' && ! $this->isRoot($path)) {
$path .= '/';
}
- $this->getConnection()->copyObject(array(
+ $this->getConnection()->copyObject([
'Bucket' => $this->bucket,
'Key' => $this->cleanKey($path),
'Metadata' => $metadata,
- 'CopySource' => $this->bucket . '/' . $path
- ));
+ 'CopySource' => $this->bucket . '/' . $path,
+ 'MetadataDirective' => 'REPLACE',
+ ]);
$this->testTimeout();
} else {
$mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
- $this->getConnection()->putObject(array(
+ $this->getConnection()->putObject([
'Bucket' => $this->bucket,
'Key' => $this->cleanKey($path),
'Metadata' => $metadata,
'Body' => '',
- 'ContentType' => $mimeType
- ));
+ 'ContentType' => $mimeType,
+ 'MetadataDirective' => 'REPLACE',
+ ]);
$this->testTimeout();
}
} catch (S3Exception $e) {
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 06aecac9c42..d46e907e0c8 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -60,6 +60,8 @@ OC.L10N.register(
"Open documentation" : "Dokumentation öffnen",
"Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
- "Federated Cloud" : "Federated Cloud"
+ "Federated Cloud" : "Federated Cloud",
+ "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+ "HTML Code:" : "HTML-Code:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 1e3213113b1..30d6badbb34 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -58,6 +58,8 @@
"Open documentation" : "Dokumentation öffnen",
"Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
- "Federated Cloud" : "Federated Cloud"
+ "Federated Cloud" : "Federated Cloud",
+ "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+ "HTML Code:" : "HTML-Code:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 1536da3b98f..0074bdbecad 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -60,6 +60,9 @@ OC.L10N.register(
"Open documentation" : "Dokumentation öffnen",
"Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
- "Federated Cloud" : "Federated Cloud"
+ "Federated Cloud" : "Federated Cloud",
+ "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
+ "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
+ "HTML Code:" : "HTML-Code:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 9ff15fb26da..fef8ebf7b9d 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -58,6 +58,9 @@
"Open documentation" : "Dokumentation öffnen",
"Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
"Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
- "Federated Cloud" : "Federated Cloud"
+ "Federated Cloud" : "Federated Cloud",
+ "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
+ "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
+ "HTML Code:" : "HTML-Code:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 1c1c863a240..4f20489a687 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -40,6 +40,8 @@ OC.L10N.register(
"%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
"Shares" : "Κοινόχρηστοι φάκελοι",
+ "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
+ "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
"This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
"The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
"Password" : "Κωδικός πρόσβασης",
@@ -60,6 +62,11 @@ OC.L10N.register(
"Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
"Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές",
- "Federated Cloud" : "Federated σύννεφο"
+ "Federated Cloud" : "Federated σύννεφο",
+ "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
+ "Share it:" : "Μοιραστείτε το:",
+ "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
+ "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
+ "HTML Code:" : "Κώδικας HTML:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 934b6704146..8d5a947f4c2 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -38,6 +38,8 @@
"%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
"You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
"Shares" : "Κοινόχρηστοι φάκελοι",
+ "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
+ "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
"This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
"The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
"Password" : "Κωδικός πρόσβασης",
@@ -58,6 +60,11 @@
"Open documentation" : "Ανοιχτή τεκμηρίωση.",
"Allow users on this server to send shares to other servers" : "Να επιτρέπεται σε χρήστες αυτού του διακομιστή να στέλνουν διαμοιρασμένους φακέλους σε άλλους διακομιστές",
"Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές",
- "Federated Cloud" : "Federated σύννεφο"
+ "Federated Cloud" : "Federated σύννεφο",
+ "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
+ "Share it:" : "Μοιραστείτε το:",
+ "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
+ "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
+ "HTML Code:" : "Κώδικας HTML:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index c4c347b33da..0ae19ac8d33 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -60,6 +60,10 @@ OC.L10N.register(
"Open documentation" : "Открыть документацию",
"Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
"Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов",
- "Federated Cloud" : "Объединение облачных хранилищ"
+ "Federated Cloud" : "Объединение облачных хранилищ",
+ "Share it:" : "Поделись этим:",
+ "Add it to your website:" : "Добавь это на свой сайт:",
+ "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
+ "HTML Code:" : "HTML код:"
},
"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index c1b3a97d074..a2a7bf06029 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -58,6 +58,10 @@
"Open documentation" : "Открыть документацию",
"Allow users on this server to send shares to other servers" : "Разрешить пользователям делиться с пользователями других серверов",
"Allow users on this server to receive shares from other servers" : "Разрешить пользователям использовать общие ресурсы с других серверов",
- "Federated Cloud" : "Объединение облачных хранилищ"
+ "Federated Cloud" : "Объединение облачных хранилищ",
+ "Share it:" : "Поделись этим:",
+ "Add it to your website:" : "Добавь это на свой сайт:",
+ "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
+ "HTML Code:" : "HTML код:"
},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 01:48:25 +0000