diff options
Diffstat (limited to 'apps/files_sharing')
26 files changed, 260 insertions, 71 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js index da0f957ed99..dccd6027b02 100644 --- a/apps/files_sharing/js/sharedfilelist.js +++ b/apps/files_sharing/js/sharedfilelist.js @@ -79,6 +79,42 @@ var permission = parseInt($tr.attr('data-permissions')) | OC.PERMISSION_DELETE; $tr.attr('data-permissions', permission); } + + // add row with expiration date for link only shares - influenced by _createRow of filelist + if (this._linksOnly) { + var expirationTimestamp = 0; + if(fileData.shares[0].expiration !== null) { + expirationTimestamp = moment(fileData.shares[0].expiration).valueOf(); + } + $tr.attr('data-expiration', expirationTimestamp); + + // date column (1000 milliseconds to seconds, 60 seconds, 60 minutes, 24 hours) + // difference in days multiplied by 5 - brightest shade for expiry dates in more than 32 days (160/5) + var modifiedColor = Math.round((expirationTimestamp - (new Date()).getTime()) / 1000 / 60 / 60 / 24 * 5); + // ensure that the brightest color is still readable + if (modifiedColor >= 160) { + modifiedColor = 160; + } + + if (expirationTimestamp > 0) { + formatted = OC.Util.formatDate(expirationTimestamp); + text = OC.Util.relativeModifiedDate(expirationTimestamp); + } else { + formatted = t('files_sharing', 'No expiration date set'); + text = ''; + modifiedColor = 160; + } + td = $('<td></td>').attr({"class": "date"}); + td.append($('<span></span>').attr({ + "class": "modified", + "title": formatted, + "style": 'color:rgb(' + modifiedColor + ',' + modifiedColor + ',' + modifiedColor + ')' + }).text(text) + .tooltip({placement: 'top'}) + ); + + $tr.append(td); + } return $tr; }, @@ -98,6 +134,11 @@ // root has special permissions this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); + + // hide expiration date header for non link only shares + if (!this._linksOnly) { + this.$el.find('th.column-expiration').addClass('hidden'); + } } else { OCA.Files.FileList.prototype.updateEmptyContent.apply(this, arguments); @@ -249,6 +290,7 @@ type: share.share_type, target: share.share_with, stime: share.stime * 1000, + expiration: share.expiration, }; if (self._sharedWithUser) { file.shareOwner = share.displayname_owner; diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js index fbf9d981d6b..93534911d17 100644 --- a/apps/files_sharing/l10n/cs_CZ.js +++ b/apps/files_sharing/l10n/cs_CZ.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Přidat do svého ownCloudu", "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", - "Direct link" : "Přímý odkaz" + "Direct link" : "Přímý odkaz", + "Upload files to %s" : "Nahrát soubory do %s", + "Select or drop files" : "Vyberte nebo přetáhněte soubory", + "Uploading files…" : "Probíhá nahrávání souborů...", + "Uploaded files:" : "Nahrané soubory:" }, "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json index fc62ee6253b..fb39cf9a7e5 100644 --- a/apps/files_sharing/l10n/cs_CZ.json +++ b/apps/files_sharing/l10n/cs_CZ.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Přidat do svého ownCloudu", "Download" : "Stáhnout", "Download %s" : "Stáhnout %s", - "Direct link" : "Přímý odkaz" + "Direct link" : "Přímý odkaz", + "Upload files to %s" : "Nahrát soubory do %s", + "Select or drop files" : "Vyberte nebo přetáhněte soubory", + "Uploading files…" : "Probíhá nahrávání souborů...", + "Uploaded files:" : "Nahrané soubory:" },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 602721d13c1..31033d33de9 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -17,12 +17,12 @@ OC.L10N.register( "Files and folders you share will show up here" : "Von Dir geteilte Dateien und Ordner werden hier erscheinen", "No shared links" : "Keine geteilten Links", "Files and folders you share by link will show up here" : "Per Link freigegebene Dateien und Ordner werden hier erscheinen", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchtest Du die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?", "Remote share" : "Entfernte Freigabe", "Remote share password" : "Passwort für die entfernte Freigabe", "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", - "You can upload into this folder" : "Du kannst in diesen Ordner hochladen", + "You can upload into this folder" : "In diesen Ordner kann hochgeladen werden", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", "Shared by" : "Geteilt von ", @@ -49,24 +49,24 @@ OC.L10N.register( "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>", "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", - "You received a new remote share %2$s from %1$s" : "Du hast eine neue Remotefreigabe %2$s von %1$s erhalten", - "You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten", + "You received a new remote share %2$s from %1$s" : "Sie haben eine neue Remotefreigabe %2$s von %1$s erhalten", + "You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt", "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", - "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt", + "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s", - "You removed the share of %2$s for %1$s" : "Du hast die Freigabe von %2$s für %1$s entfernt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s entfernt", "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe der %3$s für %1$s entfernt", - "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt", + "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit Gruppe %3$s geteilt", - "You removed the share of group %2$s for %1$s" : "Du hast die Freigabe der Gruppe %2$s für %1$s entfernt", + "You removed the share of group %2$s for %1$s" : "Sie haben die Freigabe der Gruppe %2$s für %1$s entfernt", "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt", "%2$s shared %1$s via link" : "%2$s hat %1$s über einen Link freigegeben", - "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", - "You removed the public link for %1$s" : "Du hast den öffentlichen Link für %1$s entfernt", + "You shared %1$s via link" : "Sie haben %1$s über einen Link freigegeben", + "You removed the public link for %1$s" : "Sie haben den öffentlichen Link für %1$s entfernt", "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt", "Your public link for %1$s expired" : "Dein öffentlicher Link für %1$s ist abgelaufen", "The public link of %2$s for %1$s expired" : "Der öffentliche Link von %2$s für %1$s ist abgelaufen", @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkter Link" + "Direct link" : "Direkter Link", + "Upload files to %s" : "Dateien auf %s hochladen", + "Select or drop files" : "Dateien auswählen oder hierher ziehen", + "Uploading files…" : "Dateien werden hochgeladen...", + "Uploaded files:" : "Hochgeladene Dateien: " }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 2d8b8e426e5..26966249118 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -15,12 +15,12 @@ "Files and folders you share will show up here" : "Von Dir geteilte Dateien und Ordner werden hier erscheinen", "No shared links" : "Keine geteilten Links", "Files and folders you share by link will show up here" : "Per Link freigegebene Dateien und Ordner werden hier erscheinen", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchtest Du die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?", "Remote share" : "Entfernte Freigabe", "Remote share password" : "Passwort für die entfernte Freigabe", "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", - "You can upload into this folder" : "Du kannst in diesen Ordner hochladen", + "You can upload into this folder" : "In diesen Ordner kann hochgeladen werden", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", "Invalid ownCloud url" : "Ungültige OwnCloud-URL", "Shared by" : "Geteilt von ", @@ -47,24 +47,24 @@ "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>", "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt", "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>", - "You received a new remote share %2$s from %1$s" : "Du hast eine neue Remotefreigabe %2$s von %1$s erhalten", - "You received a new remote share from %s" : "Du hast eine neue Remotefreigabe von %s erhalten", + "You received a new remote share %2$s from %1$s" : "Sie haben eine neue Remotefreigabe %2$s von %1$s erhalten", + "You received a new remote share from %s" : "Sie haben eine neue Remotefreigabe von %s erhalten", "%1$s accepted remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s akzeptiert", "%1$s declined remote share %2$s" : "%1$s hat die Remotefreigabe von %2$s abgelehnt", "%1$s unshared %2$s from you" : "%1$s hat die Freigabe von %2$s für Dich entfernt", "Public shared folder %1$s was downloaded" : "Der öffentliche geteilte Ordner %1$s wurde heruntergeladen", "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", - "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt", + "You shared %1$s with %2$s" : "Sie haben %1$s mit %2$s geteilt", "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s", - "You removed the share of %2$s for %1$s" : "Du hast die Freigabe von %2$s für %1$s entfernt", + "You removed the share of %2$s for %1$s" : "Sie haben die Freigabe von %2$s für %1$s entfernt", "%2$s removed the share of %3$s for %1$s" : "%2$s hat die Freigabe der %3$s für %1$s entfernt", - "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt", + "You shared %1$s with group %2$s" : "Sie haben %1$s mit der Gruppe %2$s geteilt", "%2$s shared %1$s with group %3$s" : "%2$s hat %1$s mit Gruppe %3$s geteilt", - "You removed the share of group %2$s for %1$s" : "Du hast die Freigabe der Gruppe %2$s für %1$s entfernt", + "You removed the share of group %2$s for %1$s" : "Sie haben die Freigabe der Gruppe %2$s für %1$s entfernt", "%2$s removed the share of group %3$s for %1$s" : "%2$s hat die Freigabe der Gruppe %3$s für %1$s entfernt", "%2$s shared %1$s via link" : "%2$s hat %1$s über einen Link freigegeben", - "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", - "You removed the public link for %1$s" : "Du hast den öffentlichen Link für %1$s entfernt", + "You shared %1$s via link" : "Sie haben %1$s über einen Link freigegeben", + "You removed the public link for %1$s" : "Sie haben den öffentlichen Link für %1$s entfernt", "%2$s removed the public link for %1$s" : "%2$s hat den öffentlichen Link für %1$s entfernt", "Your public link for %1$s expired" : "Dein öffentlicher Link für %1$s ist abgelaufen", "The public link of %2$s for %1$s expired" : "Der öffentliche Link von %2$s für %1$s ist abgelaufen", @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkter Link" + "Direct link" : "Direkter Link", + "Upload files to %s" : "Dateien auf %s hochladen", + "Select or drop files" : "Dateien auswählen oder hierher ziehen", + "Uploading files…" : "Dateien werden hochgeladen...", + "Uploaded files:" : "Hochgeladene Dateien: " },"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 56e1ec25c1d..b99e2790adb 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkte Verlinkung" + "Direct link" : "Direkte Verlinkung", + "Upload files to %s" : "Dateien auf %s hochladen", + "Select or drop files" : "Dateien auswählen oder hierher ziehen", + "Uploading files…" : "Dateien werden hochgeladen...", + "Uploaded files:" : "Hochgeladene Dateien: " }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 205e0eeaadb..d0966273524 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen", "Download" : "Herunterladen", "Download %s" : "Download %s", - "Direct link" : "Direkte Verlinkung" + "Direct link" : "Direkte Verlinkung", + "Upload files to %s" : "Dateien auf %s hochladen", + "Select or drop files" : "Dateien auswählen oder hierher ziehen", + "Uploading files…" : "Dateien werden hochgeladen...", + "Uploaded files:" : "Hochgeladene Dateien: " },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js index 78d3630c674..6068561339e 100644 --- a/apps/files_sharing/l10n/en_GB.js +++ b/apps/files_sharing/l10n/en_GB.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Add to your ownCloud", "Download" : "Download", "Download %s" : "Download %s", - "Direct link" : "Direct link" + "Direct link" : "Direct link", + "Upload files to %s" : "Upload files to %s", + "Select or drop files" : "Select or drop files", + "Uploading files…" : "Uploading files…", + "Uploaded files:" : "Uploaded files:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json index eda362a6541..c44c7129952 100644 --- a/apps/files_sharing/l10n/en_GB.json +++ b/apps/files_sharing/l10n/en_GB.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Add to your ownCloud", "Download" : "Download", "Download %s" : "Download %s", - "Direct link" : "Direct link" + "Direct link" : "Direct link", + "Upload files to %s" : "Upload files to %s", + "Select or drop files" : "Select or drop files", + "Uploading files…" : "Uploading files…", + "Uploaded files:" : "Uploaded files:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index 4ae7c4e177e..8bb1afa8597 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Agregue su propio ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Enlace directo" + "Direct link" : "Enlace directo", + "Upload files to %s" : "Subir archivos a %s", + "Select or drop files" : "Seleccione o arrastre y suelte archivos", + "Uploading files…" : "Subiendo archivos...", + "Uploaded files:" : "Archivos subidos:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index 026d7f72e9d..4a6f0133c92 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Agregue su propio ownCloud", "Download" : "Descargar", "Download %s" : "Descargar %s", - "Direct link" : "Enlace directo" + "Direct link" : "Enlace directo", + "Upload files to %s" : "Subir archivos a %s", + "Select or drop files" : "Seleccione o arrastre y suelte archivos", + "Uploading files…" : "Subiendo archivos...", + "Uploaded files:" : "Archivos subidos:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 5fddc9855af..52259e88e5b 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -5,7 +5,7 @@ OC.L10N.register( "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Not allowed to create a federated share with the same user server" : "Non autorisé à créer un partage fédéré avec un utilisateur du même serveur", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", - "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", + "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe est probablement incorrect", "Storage not valid" : "Support de stockage non valide", "Couldn't add remote share" : "Impossible d'ajouter le partage distant", "Shared with you" : "Partagés avec vous", @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Ajouter à votre ownCloud", "Download" : "Télécharger", "Download %s" : "Télécharger %s", - "Direct link" : "Lien direct" + "Direct link" : "Lien direct", + "Upload files to %s" : "Téléversement des fichiers vers %s", + "Select or drop files" : "Sélectionner ou glisser-déposer vos fichiers", + "Uploading files…" : "Téléversement des fichiers...", + "Uploaded files:" : "Fichiers téléversés :" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 254da51c315..66ea6fab370 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -3,7 +3,7 @@ "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères non valides.", "Not allowed to create a federated share with the same user server" : "Non autorisé à créer un partage fédéré avec un utilisateur du même serveur", "Invalid or untrusted SSL certificate" : "Certificat SSL non valable ou non fiable", - "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe en probablement incorrect", + "Could not authenticate to remote share, password might be wrong" : "Impossible de s'authentifier au partage distant : le mot de passe est probablement incorrect", "Storage not valid" : "Support de stockage non valide", "Couldn't add remote share" : "Impossible d'ajouter le partage distant", "Shared with you" : "Partagés avec vous", @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Ajouter à votre ownCloud", "Download" : "Télécharger", "Download %s" : "Télécharger %s", - "Direct link" : "Lien direct" + "Direct link" : "Lien direct", + "Upload files to %s" : "Téléversement des fichiers vers %s", + "Select or drop files" : "Sélectionner ou glisser-déposer vos fichiers", + "Uploading files…" : "Téléversement des fichiers...", + "Uploaded files:" : "Fichiers téléversés :" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 85231123e53..af19da26a07 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Aggiungi al tuo ownCloud", "Download" : "Scarica", "Download %s" : "Scarica %s", - "Direct link" : "Collegamento diretto" + "Direct link" : "Collegamento diretto", + "Upload files to %s" : "Carica file su %s", + "Select or drop files" : "Seleziona o deseleziona file", + "Uploading files…" : "Caricamento file in corso...", + "Uploaded files:" : "File caricati:" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 461b8602a1e..1e179170ea8 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Aggiungi al tuo ownCloud", "Download" : "Scarica", "Download %s" : "Scarica %s", - "Direct link" : "Collegamento diretto" + "Direct link" : "Collegamento diretto", + "Upload files to %s" : "Carica file su %s", + "Select or drop files" : "Seleziona o deseleziona file", + "Uploading files…" : "Caricamento file in corso...", + "Uploaded files:" : "File caricati:" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js index bd40344053a..7640f8f5104 100644 --- a/apps/files_sharing/l10n/ja.js +++ b/apps/files_sharing/l10n/ja.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "ownCloud に追加", "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", - "Direct link" : "リンク" + "Direct link" : "リンク", + "Upload files to %s" : "%s にファイルをアップロード", + "Select or drop files" : "ファイルを選択するか、ドラッグ&ドロップしてください", + "Uploading files…" : "ファイルをアップロード中...", + "Uploaded files:" : "アップロード済ファイル:" }, "nplurals=1; plural=0;"); diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json index 4b98342822d..70f1fa0f32e 100644 --- a/apps/files_sharing/l10n/ja.json +++ b/apps/files_sharing/l10n/ja.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "ownCloud に追加", "Download" : "ダウンロード", "Download %s" : "%s をダウンロード", - "Direct link" : "リンク" + "Direct link" : "リンク", + "Upload files to %s" : "%s にファイルをアップロード", + "Select or drop files" : "ファイルを選択するか、ドラッグ&ドロップしてください", + "Uploading files…" : "ファイルをアップロード中...", + "Uploaded files:" : "アップロード済ファイル:" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index 9bd9ba81331..680a9d94bd4 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -8,21 +8,21 @@ OC.L10N.register( "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord", "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", - "Shared with you" : "Gedeeld met u", + "Shared with you" : "Deelde met je", "Shared with others" : "Gedeeld door u", "Shared by link" : "Gedeeld via een link", "Nothing shared with you yet" : "Nog niets met u gedeeld", - "Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met u delen, worden hier getoond", + "Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met je delen, worden hier getoond", "Nothing shared yet" : "Nog niets gedeeld", "Files and folders you share will show up here" : "Bestanden en mappen die u deelt, worden hier getoond", "No shared links" : "Geen gedeelde links", - "Files and folders you share by link will show up here" : "Bestanden en mappen die u via links deelt, worden hier getoond", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wilt u de externe share {name} van {owner}@{remote} toevoegen?", + "Files and folders you share by link will show up here" : "Bestanden en mappen die je via links deelt, worden hier getoond", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?", "Remote share" : "Externe share", "Remote share password" : "Wachtwoord externe share", "Cancel" : "Annuleren", "Add remote share" : "Toevoegen externe share", - "You can upload into this folder" : "U kunt uploaden naar deze map", + "You can upload into this folder" : "Je kunt uploaden naar deze map", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", "Shared by" : "Gedeeld door", @@ -49,23 +49,23 @@ OC.L10N.register( "A file or folder has been <strong>shared</strong>" : "Een bestand of map is <strong>gedeeld</strong>", "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>", - "You received a new remote share %2$s from %1$s" : "U ontving een nieuwe externe share %2$s van %1$s", - "You received a new remote share from %s" : "U ontving een nieuwe externe share van %s", + "You received a new remote share %2$s from %1$s" : "Je ontving een nieuwe externe share %2$s van %1$s", + "You received a new remote share from %s" : "Je ontving een nieuwe externe share van %s", "%1$s accepted remote share %2$s" : "%1$s accepteerde externe share %2$s", "%1$s declined remote share %2$s" : "%1$s weigerde externe share %2$s", "%1$s unshared %2$s from you" : "%1$s stopte met delen van %2$s met je", "Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded", "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded", - "You shared %1$s with %2$s" : "U deelde %1$s met %2$s", + "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s", "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s", - "You removed the share of %2$s for %1$s" : "U heeft de share van %1$s met %2$s verwijderd", + "You removed the share of %2$s for %1$s" : "Je hebt de share van %1$s met %2$s verwijderd", "%2$s removed the share of %3$s for %1$s" : "%2$s heeft de share van %1$s met %3$s verwijderd", - "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s", + "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s", "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s", - "You removed the share of group %2$s for %1$s" : "U heeft de share van %1$s met de groep %2$s verwijderd", + "You removed the share of group %2$s for %1$s" : "Je heeft de share van %1$s met de groep %2$s verwijderd", "%2$s removed the share of group %3$s for %1$s" : "%2$s heeft de share van %1$s met de groep %3$s verwijderd", "%2$s shared %1$s via link" : "%2$s deelde %1$s via link", - "You shared %1$s via link" : "U deelde %1$s via link", + "You shared %1$s via link" : "Je deelde %1$s via link", "You removed the public link for %1$s" : "U heeft de openbare link voor %1$s verwijderd", "%2$s removed the public link for %1$s" : "%2$s heeft de openbare link voor %1$s verwijderd", "Your public link for %1$s expired" : "Uw openbare link voor %1$s is verlopen", @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Toevoegen aan uw ownCloud", "Download" : "Downloaden", "Download %s" : "Download %s", - "Direct link" : "Directe link" + "Direct link" : "Directe link", + "Upload files to %s" : "Uploaden bestanden naar%s", + "Select or drop files" : "Selecteer of leg bestanden neer", + "Uploading files…" : "Uploaden bestanden...", + "Uploaded files:" : "Geüploade bestanden" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index 01558fc5e73..3170ab55186 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -6,21 +6,21 @@ "Could not authenticate to remote share, password might be wrong" : "Kon niet authenticeren bij externe share, misschien verkeerd wachtwoord", "Storage not valid" : "Opslag ongeldig", "Couldn't add remote share" : "Kon geen externe share toevoegen", - "Shared with you" : "Gedeeld met u", + "Shared with you" : "Deelde met je", "Shared with others" : "Gedeeld door u", "Shared by link" : "Gedeeld via een link", "Nothing shared with you yet" : "Nog niets met u gedeeld", - "Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met u delen, worden hier getoond", + "Files and folders others share with you will show up here" : "Bestanden en mappen die anderen met je delen, worden hier getoond", "Nothing shared yet" : "Nog niets gedeeld", "Files and folders you share will show up here" : "Bestanden en mappen die u deelt, worden hier getoond", "No shared links" : "Geen gedeelde links", - "Files and folders you share by link will show up here" : "Bestanden en mappen die u via links deelt, worden hier getoond", - "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wilt u de externe share {name} van {owner}@{remote} toevoegen?", + "Files and folders you share by link will show up here" : "Bestanden en mappen die je via links deelt, worden hier getoond", + "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?", "Remote share" : "Externe share", "Remote share password" : "Wachtwoord externe share", "Cancel" : "Annuleren", "Add remote share" : "Toevoegen externe share", - "You can upload into this folder" : "U kunt uploaden naar deze map", + "You can upload into this folder" : "Je kunt uploaden naar deze map", "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}", "Invalid ownCloud url" : "Ongeldige ownCloud url", "Shared by" : "Gedeeld door", @@ -47,23 +47,23 @@ "A file or folder has been <strong>shared</strong>" : "Een bestand of map is <strong>gedeeld</strong>", "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>", "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>", - "You received a new remote share %2$s from %1$s" : "U ontving een nieuwe externe share %2$s van %1$s", - "You received a new remote share from %s" : "U ontving een nieuwe externe share van %s", + "You received a new remote share %2$s from %1$s" : "Je ontving een nieuwe externe share %2$s van %1$s", + "You received a new remote share from %s" : "Je ontving een nieuwe externe share van %s", "%1$s accepted remote share %2$s" : "%1$s accepteerde externe share %2$s", "%1$s declined remote share %2$s" : "%1$s weigerde externe share %2$s", "%1$s unshared %2$s from you" : "%1$s stopte met delen van %2$s met je", "Public shared folder %1$s was downloaded" : "Openbaar gedeelde map %1$s werd gedownloaded", "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded", - "You shared %1$s with %2$s" : "U deelde %1$s met %2$s", + "You shared %1$s with %2$s" : "Je deelde %1$s met %2$s", "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s", - "You removed the share of %2$s for %1$s" : "U heeft de share van %1$s met %2$s verwijderd", + "You removed the share of %2$s for %1$s" : "Je hebt de share van %1$s met %2$s verwijderd", "%2$s removed the share of %3$s for %1$s" : "%2$s heeft de share van %1$s met %3$s verwijderd", - "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s", + "You shared %1$s with group %2$s" : "Je deelde %1$s met groep %2$s", "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s", - "You removed the share of group %2$s for %1$s" : "U heeft de share van %1$s met de groep %2$s verwijderd", + "You removed the share of group %2$s for %1$s" : "Je heeft de share van %1$s met de groep %2$s verwijderd", "%2$s removed the share of group %3$s for %1$s" : "%2$s heeft de share van %1$s met de groep %3$s verwijderd", "%2$s shared %1$s via link" : "%2$s deelde %1$s via link", - "You shared %1$s via link" : "U deelde %1$s via link", + "You shared %1$s via link" : "Je deelde %1$s via link", "You removed the public link for %1$s" : "U heeft de openbare link voor %1$s verwijderd", "%2$s removed the public link for %1$s" : "%2$s heeft de openbare link voor %1$s verwijderd", "Your public link for %1$s expired" : "Uw openbare link voor %1$s is verlopen", @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Toevoegen aan uw ownCloud", "Download" : "Downloaden", "Download %s" : "Download %s", - "Direct link" : "Directe link" + "Direct link" : "Directe link", + "Upload files to %s" : "Uploaden bestanden naar%s", + "Select or drop files" : "Selecteer of leg bestanden neer", + "Uploading files…" : "Uploaden bestanden...", + "Uploaded files:" : "Geüploade bestanden" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index 4d2963dba24..dbe3db3dcfa 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -104,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Adiconar ao seu ownCloud", "Download" : "Baixar", "Download %s" : "Baixar %s", - "Direct link" : "Link direto" + "Direct link" : "Link direto", + "Upload files to %s" : "Carregar arquivos para %s", + "Select or drop files" : "Selecione e solte arquivos", + "Uploading files…" : "Carregando arquivos...", + "Uploaded files:" : "Arquivos carregados:" }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 2d4397efd94..28396902ccb 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -102,6 +102,10 @@ "Add to your ownCloud" : "Adiconar ao seu ownCloud", "Download" : "Baixar", "Download %s" : "Baixar %s", - "Direct link" : "Link direto" + "Direct link" : "Link direto", + "Upload files to %s" : "Carregar arquivos para %s", + "Select or drop files" : "Selecione e solte arquivos", + "Uploading files…" : "Carregando arquivos...", + "Uploaded files:" : "Arquivos carregados:" },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js index 8ae00c40bae..79e2e33d994 100644 --- a/apps/files_sharing/l10n/sl.js +++ b/apps/files_sharing/l10n/sl.js @@ -27,6 +27,7 @@ OC.L10N.register( "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", + "Share API is disabled" : "API za souporabo je izključen", "Wrong share ID, share doesn't exist" : "Napačen ID mesta uporabe; mesto ne obstaja!", "Could not delete share" : "Tega predmeta v souporabi ni mogoče izbrisati.", "Please specify a file or folder path" : "Določiti je treba datoteko ali pot do mape", @@ -38,6 +39,7 @@ OC.L10N.register( "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Deljenje %s ni uspelo ker sistem ne dovoli souporabe za tip %s", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", "Could not lock path" : "Poti ni mogoče zakleniti", @@ -57,10 +59,19 @@ OC.L10N.register( "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s umaknil souporabo %3$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s deli %1$s s skupino %3$s", + "You removed the share of group %2$s for %1$s" : "Ukinili ste deljenje s skupino %2$s za %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s ukinil deljenje s skupino %3$s za %1$s", + "%2$s shared %1$s via link" : "%2$s deli %1$s preko povezave", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", + "You removed the public link for %1$s" : "Umaknili ste javno povezavo za %1$s", + "%2$s removed the public link for %1$s" : "%2$s umaknil javno povezavo za %1$s", "Your public link for %1$s expired" : "Javna povezava za %1$s je časovno potekla!", + "The public link of %2$s for %1$s expired" : "Javna povezava %2$s za %1$s je potekla", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", + "%2$s removed the share for %1$s" : "%2$s je umaknil deljenje za %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", "Shared with %2$s" : "V souporabi z %2$s", "Shared with %3$s by %2$s" : "Souporaba z %3$s in %2$s", @@ -93,6 +104,10 @@ OC.L10N.register( "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud", "Download" : "Prejmi", "Download %s" : "Prejmi %s", - "Direct link" : "Neposredna povezava" + "Direct link" : "Neposredna povezava", + "Upload files to %s" : "Naloži datoteke v %s", + "Select or drop files" : "Izberi ali povleci datoteke", + "Uploading files…" : "Nalaganje datotek...", + "Uploaded files:" : "Naložene datoteke:" }, "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"); diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json index 36f775d9766..3698b1f3d3f 100644 --- a/apps/files_sharing/l10n/sl.json +++ b/apps/files_sharing/l10n/sl.json @@ -25,6 +25,7 @@ "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud", "Shared by" : "V souporabi z", "Sharing" : "Souporaba", + "Share API is disabled" : "API za souporabo je izključen", "Wrong share ID, share doesn't exist" : "Napačen ID mesta uporabe; mesto ne obstaja!", "Could not delete share" : "Tega predmeta v souporabi ni mogoče izbrisati.", "Please specify a file or folder path" : "Določiti je treba datoteko ali pot do mape", @@ -36,6 +37,7 @@ "Public upload disabled by the administrator" : "Javno pošiljanje v oblak je skrbniško onemogočeno", "Public upload is only possible for publicly shared folders" : "Javno pošiljanje v oblak je mogoče le za javne mape v skupni rabi.", "Invalid date, date format must be YYYY-MM-DD" : "Neveljaven zapis časa; biti mora v zapisu YYYY-MM-DD", + "Sharing %s failed because the back end does not allow shares from type %s" : "Deljenje %s ni uspelo ker sistem ne dovoli souporabe za tip %s", "Unknown share type" : "Neznana vrsta mesta souporabe", "Not a directory" : "Predmet ni mapa", "Could not lock path" : "Poti ni mogoče zakleniti", @@ -55,10 +57,19 @@ "You shared %1$s with %2$s" : "Omogočili ste souporabo %1$s z uporabnikom %2$s", "%2$s shared %1$s with %3$s" : "Uporabnik %2$s je omogočil souporabo %1$s z %3$s", "You removed the share of %2$s for %1$s" : "Odstranili ste mapo v souporabi %2$s za %1$s", + "%2$s removed the share of %3$s for %1$s" : "%2$s umaknil souporabo %3$s za %1$s", "You shared %1$s with group %2$s" : "Omogočili ste souporabo %1$s s skupino %2$s", + "%2$s shared %1$s with group %3$s" : "%2$s deli %1$s s skupino %3$s", + "You removed the share of group %2$s for %1$s" : "Ukinili ste deljenje s skupino %2$s za %1$s", + "%2$s removed the share of group %3$s for %1$s" : "%2$s ukinil deljenje s skupino %3$s za %1$s", + "%2$s shared %1$s via link" : "%2$s deli %1$s preko povezave", "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave", + "You removed the public link for %1$s" : "Umaknili ste javno povezavo za %1$s", + "%2$s removed the public link for %1$s" : "%2$s umaknil javno povezavo za %1$s", "Your public link for %1$s expired" : "Javna povezava za %1$s je časovno potekla!", + "The public link of %2$s for %1$s expired" : "Javna povezava %2$s za %1$s je potekla", "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s", + "%2$s removed the share for %1$s" : "%2$s je umaknil deljenje za %1$s", "Downloaded via public link" : "Prejeto preko javne povezave", "Shared with %2$s" : "V souporabi z %2$s", "Shared with %3$s by %2$s" : "Souporaba z %3$s in %2$s", @@ -91,6 +102,10 @@ "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud", "Download" : "Prejmi", "Download %s" : "Prejmi %s", - "Direct link" : "Neposredna povezava" + "Direct link" : "Neposredna povezava", + "Upload files to %s" : "Naloži datoteke v %s", + "Select or drop files" : "Izberi ali povleci datoteke", + "Uploading files…" : "Nalaganje datotek...", + "Uploaded files:" : "Naložene datoteke:" },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" }
\ No newline at end of file diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php index fa0365c749c..f59cb7653d8 100644 --- a/apps/files_sharing/templates/list.php +++ b/apps/files_sharing/templates/list.php @@ -22,6 +22,9 @@ <th id="headerDate" class="hidden column-mtime"> <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a> </th> + <th class="hidden column-expiration"> + <a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a> + </th> </tr> </thead> <tbody id="fileList"> diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index f69098cde7b..90d9f0a8567 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -30,6 +30,9 @@ use OCP\Share\IShare; use OCP\Share\IManager; use OCP\Files\Mount\IMountPoint; +/** + * @group DB + */ class MountProviderTest extends \Test\TestCase { /** @var MountProvider */ diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js index 0b0676a19e6..f177b61c78a 100644 --- a/apps/files_sharing/tests/js/sharedfilelistSpec.js +++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js @@ -38,6 +38,9 @@ describe('OCA.Sharing.FileList tests', function() { '<th class="hidden column-mtime">' + '<a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a>' + '</th>' + + '<th class="column-expiration">' + + '<a class="columntitle"><span>Expiration date</span></a>' + + '</th>' + '</tr></thead>' + '<tbody id="fileList"></tbody>' + '<tfoot></tfoot>' + @@ -512,6 +515,9 @@ describe('OCA.Sharing.FileList tests', function() { fileList.reload(); + var expirationDateInADay = moment() + .add(1, 'days').format('YYYY-MM-DD HH:mm:ss'); + /* jshint camelcase: false */ ocsResponse = { ocs: { @@ -528,12 +534,28 @@ describe('OCA.Sharing.FileList tests', function() { path: '/local path/local name.txt', permissions: 1, stime: 11111, + expiration: null, share_type: OC.Share.SHARE_TYPE_LINK, share_with: null, token: 'abc', mimetype: 'text/plain', uid_owner: 'user1', displayname_owner: 'User One' + },{ + id: 8, + item_type: 'file', + item_source: 50, + file_source: 50, + path: '/local path2/local name2.txt', + permissions: 1, + stime: 11112, + expiration: expirationDateInADay, + share_type: OC.Share.SHARE_TYPE_LINK, + share_with: null, + token: 'abcd', + mimetype: 'text/plain2', + uid_owner: 'user2', + displayname_owner: 'User One2' }] } }; @@ -570,10 +592,10 @@ describe('OCA.Sharing.FileList tests', function() { JSON.stringify(ocsResponse) ); - // only renders the link share entry + // only renders the link share entries var $rows = fileList.$el.find('tbody tr'); var $tr = $rows.eq(0); - expect($rows.length).toEqual(1); + expect($rows.length).toEqual(2); expect($tr.attr('data-id')).toEqual('49'); expect($tr.attr('data-type')).toEqual('file'); expect($tr.attr('data-file')).toEqual('local name.txt'); @@ -588,8 +610,17 @@ describe('OCA.Sharing.FileList tests', function() { expect($tr.find('a.name').attr('href')).toEqual( OC.webroot + '/remote.php/webdav/local%20path/local%20name.txt' ); + expect($tr.attr('data-expiration')).toEqual('0'); + expect($tr.find('td:last-child span').text()).toEqual(''); expect($tr.find('.nametext').text().trim()).toEqual('local name.txt'); + + // change to next row + $tr = $rows.eq(1); + expect($tr.attr('data-id')).toEqual('50'); + expect($tr.attr('data-file')).toEqual('local name2.txt'); + expect($tr.attr('data-expiration')).not.toEqual('0'); + expect($tr.find('td:last-child span').text()).toEqual('in a day'); }); it('does not show virtual token recipient as recipient when password was set', function() { /* jshint camelcase: false */ @@ -613,7 +644,7 @@ describe('OCA.Sharing.FileList tests', function() { // only renders the link share entry var $rows = fileList.$el.find('tbody tr'); var $tr = $rows.eq(0); - expect($rows.length).toEqual(1); + expect($rows.length).toEqual(2); expect($tr.attr('data-id')).toEqual('49'); expect($tr.attr('data-type')).toEqual('file'); expect($tr.attr('data-file')).toEqual('local name.txt'); |