diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
commit | 9fb71af98850ad6638c4238ae0938972a9f23b50 (patch) | |
tree | 52e081bc8577f78505ea80fc7158eb9235c7ed59 /apps/files_sharing | |
parent | 6443e570c2793954309f9541cd6a7a8c309644ac (diff) | |
parent | 5b7b0536346a4a6608e0b294b6784ac5ff3b142a (diff) | |
download | nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.tar.gz nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.zip |
Merge branch 'master' into encryption_enable_public_upload
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'apps/files_sharing')
-rw-r--r-- | apps/files_sharing/l10n/cs_CZ.php | 3 | ||||
-rw-r--r-- | apps/files_sharing/l10n/el.php | 4 | ||||
-rw-r--r-- | apps/files_sharing/public.php | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php index 192c4a79572..adf099a6d94 100644 --- a/apps/files_sharing/l10n/cs_CZ.php +++ b/apps/files_sharing/l10n/cs_CZ.php @@ -14,6 +14,7 @@ $TRANSLATIONS = array( "Download" => "Stáhnout", "Upload" => "Odeslat", "Cancel upload" => "Zrušit odesílání", -"No preview available for" => "Náhled není dostupný pro" +"No preview available for" => "Náhled není dostupný pro", +"Direct link" => "Přímý odkaz" ); $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"; diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php index 4584e261b01..79387a91472 100644 --- a/apps/files_sharing/l10n/el.php +++ b/apps/files_sharing/l10n/el.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό", "The password is wrong. Try again." => "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.", "Password" => "Συνθηματικό", "Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.", @@ -13,6 +14,7 @@ $TRANSLATIONS = array( "Download" => "Λήψη", "Upload" => "Μεταφόρτωση", "Cancel upload" => "Ακύρωση αποστολής", -"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για" +"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για", +"Direct link" => "Άμεσος σύνδεσμος" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index f8091967012..f4042f65248 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -218,6 +218,8 @@ if (isset($path)) { $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&path='); $maxUploadFilesize=OCP\Util::maxUploadFilesize($path); + $fileHeader = (!isset($files) or count($files) > 0); + $emptyContent = ($allowPublicUploadEnabled and !$fileHeader); $folder = new OCP\Template('files', 'index', ''); $folder->assign('fileList', $list->fetchPage()); $folder->assign('breadcrumb', $breadcrumbNav->fetchPage()); @@ -231,6 +233,11 @@ if (isset($path)) { $folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $folder->assign('usedSpacePercent', 0); + $folder->assign('fileHeader', $fileHeader); + $folder->assign('disableSharing', true); + $folder->assign('trash', false); + $folder->assign('emptyContent', $emptyContent); + $folder->assign('ajaxLoad', false); $tmpl->assign('folder', $folder->fetchPage()); $maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB')); $allowZip = OCP\Config::getSystemValue('allowZipDownload', true) |