diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-23 23:10:37 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-23 23:10:37 +0200 |
| commit | 6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d (patch) | |
| tree | b564539f21866e6049d69da6d011647ff46540f7 /apps/files_sharing | |
| parent | 1dab0767502013b5e86e8e24e3b12a2a8939f7a8 (diff) | |
| parent | 02b2b5a808b135007d8d54b837e70c38f02729fd (diff) | |
| download | nextcloud-server-6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d.tar.gz nextcloud-server-6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d.zip | |
Merge branch 'master' into oc_preview
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/public.js | 6 | ||||
| -rw-r--r-- | apps/files_sharing/l10n/zh_CN.php | 7 | ||||
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 8cac8bf1997..357c6fdf540 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -31,19 +31,19 @@ $(document).ready(function() { } } FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) { - var tr = $('tr').filterAttr('data-file', filename) + var tr = $('tr').filterAttr('data-file', filename); if (tr.length > 0) { window.location = $(tr).find('a.name').attr('href'); } }); FileActions.register('file', 'Download', OC.PERMISSION_READ, '', function(filename) { - var tr = $('tr').filterAttr('data-file', filename) + var tr = $('tr').filterAttr('data-file', filename); if (tr.length > 0) { window.location = $(tr).find('a.name').attr('href'); } }); FileActions.register('dir', 'Download', OC.PERMISSION_READ, '', function(filename) { - var tr = $('tr').filterAttr('data-file', filename) + var tr = $('tr').filterAttr('data-file', filename); if (tr.length > 0) { window.location = $(tr).find('a.name').attr('href')+'&download'; } diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php index 37898a1cd00..f541d6c155a 100644 --- a/apps/files_sharing/l10n/zh_CN.php +++ b/apps/files_sharing/l10n/zh_CN.php @@ -1,7 +1,14 @@ <?php $TRANSLATIONS = array( +"The password is wrong. Try again." => "用户名或密码错误！请重试", "Password" => "密码", "Submit" => "提交", +"Sorry, this link doesn’t seem to work anymore." => "抱歉，此链接已失效", +"Reasons might be:" => "可能原因是：", +"the item was removed" => "此项已移除", +"the link expired" => "链接过期", +"sharing is disabled" => "共享已禁用", +"For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。", "%s shared the folder %s with you" => "%s与您共享了%s文件夹", "%s shared the file %s with you" => "%s与您共享了%s文件", "Download" => "下载", diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 5c23a9eb0d0..7384b094cb0 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -391,7 +391,7 @@ class Shared extends \OC\Files\Storage\Common { public function free_space($path) { if ($path == '') { - return \OC\Files\FREE_SPACE_UNKNOWN; + return \OC\Files\SPACE_UNKNOWN; } $source = $this->getSourcePath($path); if ($source) { |