diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php index 2b6e1c16b..0c6072ee4 100644 --- a/Zotlabs/Storage/Browser.php +++ b/Zotlabs/Storage/Browser.php @@ -359,7 +359,7 @@ class Browser extends DAV\Browser\Plugin { '$upload' => t('Add Files'), '$is_owner' => $is_owner, '$is_admin' => is_site_admin(), - '$admin_delete' => t('Admin Delete'), + '$admin_delete_label' => t('Admin Delete'), '$parentpath' => $parent_path, '$folder_parent' => $folder_parent, '$folder' => $parent->folder_hash, @@ -372,27 +372,36 @@ class Browser extends DAV\Browser\Plugin { '$size' => t('Size'), '$lastmod' => t('Last Modified'), '$parent' => t('parent'), - '$edit' => t('Submit'), - '$delete' => t('Delete'), + '$submit_label' => t('Submit'), + '$cancel_label' => t('Cancel'), + '$delete_label' => t('Delete'), '$channel_id' => $channel_id, '$cpdesc' => t('Copy/paste this code to attach file to a post'), '$cpldesc' => t('Copy/paste this URL to link file from a web page'), - '$categories' => ['categories', t('Categories')], '$recurse' => ['recurse', t('Set permissions for all files and sub folders'), 0, '', [t('No'), t('Yes')]], - '$newfolder' => ['newfolder', t('Select a target location'), $parent->folder_hash, '', $folder_list], '$copy' => ['copy', t('Copy to target location'), 0, '', [t('No'), t('Yes')]], '$return_path' => $path, - '$lockstate' => $lockstate, '$allow_cid' => acl2json($channel_acl['allow_cid']), '$allow_gid' => acl2json($channel_acl['allow_gid']), '$deny_cid' => acl2json($channel_acl['deny_cid']), '$deny_gid' => acl2json($channel_acl['deny_gid']), - - '$is_owner' => $is_owner - + '$is_owner' => $is_owner, + '$select_all_label' => t('Select All'), + '$bulk_actions_label' => t('Bulk Actions'), + '$adjust_permissions_label' => t('Adjust Permissions'), + '$move_copy_label' => t('Move or Copy'), + '$categories_label' => t('Categories'), + '$download_label' => t('Download'), + '$info_label' => t('Info'), + '$rename_label' => t('Rename'), + '$post_label' => t('Post'), + '$attach_bbcode_label' => t('Attachment BBcode'), + '$embed_bbcode_label' => t('Embed BBcode'), + '$link_bbcode_label' => t('Link BBcode'), + '$close_label' => t('Close') )); $a = false; diff --git a/include/js_strings.php b/include/js_strings.php index 6f559f4c4..e06e105fd 100644 --- a/include/js_strings.php +++ b/include/js_strings.php @@ -47,10 +47,10 @@ function js_strings() { 'days' => tt('%d days', '%d days', '%d'), 'months' => tt('%d months', '%d months', '%d'), 'years' => tt('%d years', '%d years', '%d'), - + // get plural function code 'plural_func' => tf(), - + '$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))), '$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))), '$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))), @@ -113,6 +113,9 @@ function js_strings() { '$month' => t('month','calendar'), '$week' => t('week','calendar'), '$day' => t('day','calendar'), - '$allday' => t('All day','calendar') + '$allday' => t('All day','calendar'), + + // mod cloud + '$download_info' => t('Please stand by while your download is being prepared.') )); } diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 8fb66c5aa..5ca1f52a9 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -68,7 +68,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); + $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); let data = [ {name: 'attach_path', value: window.location.pathname}, @@ -296,7 +296,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl('Please stand by while your download is being prepared...', { sticky: false, theme: 'info', life: 10000 }); + $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); post_data.push( {name: 'attach_path', value: window.location.pathname}, diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 84c9f2e86..c24e3c8aa 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -67,37 +67,37 @@
- +
- +
{{if $is_owner}}
{{if $is_owner}} - Adjust permissions + {{$adjust_permissions_label}} {{/if}} - Move or copy - Categories - Download - {{$delete}} + {{$move_copy_label}} + {{$categories_label}} + {{$download_label}} + {{$delete_label}}
{{else if $is_admin}}
- {{$admin_delete}} + {{$admin_delete_label}}
{{/if}} @@ -122,7 +122,7 @@ {{/if}}
{{if $is_owner}} @@ -131,7 +131,7 @@ {{/if}}
@@ -166,22 +166,22 @@
- Info + {{$info_label}} {{if $is_owner}} - Adjust permissions + {{$adjust_permissions_label}} {{/if}} - Rename - Move or copy - Categories + {{$rename_label}} + {{$move_copy_label}} + {{$categories_label}} {{if $item.collection}} - Download + {{$download_label}} {{else}} {{if $is_owner}} - Post + {{$post_label}} {{/if}} - Download + {{$download_label}} {{/if}} - {{$delete}} + {{$delete_label}}
{{else}} @@ -192,12 +192,12 @@
{{if $item.collection}} - Download + {{$download_label}} {{else}} - Download + {{$download_label}} {{/if}} {{if $is_admin}} - {{$admin_delete}} + {{$admin_delete_label}} {{/if}}
@@ -219,23 +219,23 @@
{{if ! $item.collection}}
- +
{{if $item.embed_bbcode}}
- +
{{/if}} {{/if}}
- +
@@ -253,7 +253,7 @@ {{/if}}
{{if $is_owner}} @@ -262,7 +262,7 @@ {{/if}}
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 58426e20c..291d78fb2 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -66,8 +66,13 @@ 'month' : "{{$month}}", 'week' : "{{$week}}", 'day' : "{{$day}}", - 'allday' : "{{$allday}}" + 'allday' : "{{$allday}}", + + // mod cloud + + 'download_info' : "{{$download_info}}" + }; - +