diff options
-rw-r--r-- | core/js/share/sharedialogshareelistview.handlebars | 2 | ||||
-rw-r--r-- | core/js/sharedialogshareelistview.js | 2 | ||||
-rw-r--r-- | core/js/sharetemplates.js | 6 | ||||
-rw-r--r-- | settings/js/authtoken.handlebars | 4 | ||||
-rw-r--r-- | settings/js/authtoken_view.js | 3 | ||||
-rw-r--r-- | settings/js/templates.js | 12 |
6 files changed, 20 insertions, 9 deletions
diff --git a/core/js/share/sharedialogshareelistview.handlebars b/core/js/share/sharedialogshareelistview.handlebars index ba9aa6e510a..a95949c8157 100644 --- a/core/js/share/sharedialogshareelistview.handlebars +++ b/core/js/share/sharedialogshareelistview.handlebars @@ -19,7 +19,7 @@ {{#each linkReshares}} <li data-share-id="{{shareId}}" data-share-type="{{shareType}}"> <div class="avatar" data-username="{{shareInitiator}}"></div> - <span class="has-tooltip username" title="{{shareInitiator}}"> t('core', '{{shareInitiatorDisplayName}} shared via link') + '</span> + <span class="has-tooltip username" title="{{shareInitiator}}">{{shareInitiatorText}}</span> <span class="sharingOptionsGroup"> <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually">{{unshareLabel}}</span></a> </span> diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 39e79f19eb1..93373a54435 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -255,7 +255,7 @@ // with references list.push(_.extend({}, universal, share, { shareInitiator: shares[index].uid_owner, - shareInitiatorDisplayName: shares[index].displayname_owner + shareInitiatorText: t('core', '{shareInitiatorDisplayName} shared via link', {shareInitiatorDisplayName: shares[index].displayname_owner}) })); } diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js index 47bd2c9a142..efdd3ff6606 100644 --- a/core/js/sharetemplates.js +++ b/core/js/sharetemplates.js @@ -302,9 +302,9 @@ templates['sharedialogshareelistview'] = template({"1":function(container,depth0 + alias4(((helper = (helper = helpers.shareInitiator || (depth0 != null ? depth0.shareInitiator : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareInitiator","hash":{},"data":data}) : helper))) + "\"></div>\n <span class=\"has-tooltip username\" title=\"" + alias4(((helper = (helper = helpers.shareInitiator || (depth0 != null ? depth0.shareInitiator : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareInitiator","hash":{},"data":data}) : helper))) - + "\"> t('core', '" - + alias4(((helper = (helper = helpers.shareInitiatorDisplayName || (depth0 != null ? depth0.shareInitiatorDisplayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareInitiatorDisplayName","hash":{},"data":data}) : helper))) - + " shared via link') + '</span>\n <span class=\"sharingOptionsGroup\">\n <a href=\"#\" class=\"unshare\"><span class=\"icon-loading-small hidden\"></span><span class=\"icon icon-delete\"></span><span class=\"hidden-visually\">" + + "\">" + + alias4(((helper = (helper = helpers.shareInitiatorText || (depth0 != null ? depth0.shareInitiatorText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"shareInitiatorText","hash":{},"data":data}) : helper))) + + "</span>\n <span class=\"sharingOptionsGroup\">\n <a href=\"#\" class=\"unshare\"><span class=\"icon-loading-small hidden\"></span><span class=\"icon icon-delete\"></span><span class=\"hidden-visually\">" + alias4(((helper = (helper = helpers.unshareLabel || (depth0 != null ? depth0.unshareLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"unshareLabel","hash":{},"data":data}) : helper))) + "</span></a>\n </span>\n </li>\n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/settings/js/authtoken.handlebars b/settings/js/authtoken.handlebars index ab3405c8899..7c222d863fe 100644 --- a/settings/js/authtoken.handlebars +++ b/settings/js/authtoken.handlebars @@ -13,12 +13,12 @@ {{#if canScope}} <li><span class="menuitem"> <input class="filesystem checkbox" type="checkbox" id="{{id}}_filesystem" {{#if scope.filesystem}}checked{{/if}}/> - <label for="{{id}}_filesystem">' + t('settings', 'Allow filesystem access') </label><br/> + <label for="{{id}}_filesystem">{{allowFSAccess}}</label><br/> </span></li> {{/if}} {{#if canDelete}} <li> - <a class="icon icon-delete has-tooltip" title="' + t('settings', 'Disconnect') ">' + t('settings', 'Revoke') +'</a> + <a class="icon icon-delete has-tooltip" title="{{disconnectText}}">{{revokeText}}</a> </li> {{/if}} </div> diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 0ab5ebe2b63..76c6c8c0f66 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -31,6 +31,9 @@ _template: undefined, template: function (data) { + data.disconnectText = t('settings', 'Disconnect'); + data.revokeText = t('settings', 'Revoke'); + data.allowFSAccess = t('settings', 'Allow filesystem access'); return OC.Settings.Templates['authtoken'](data); }, diff --git a/settings/js/templates.js b/settings/js/templates.js index 649f2e95960..9d7457cd652 100644 --- a/settings/js/templates.js +++ b/settings/js/templates.js @@ -11,11 +11,19 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.scope : depth0)) != null ? stack1.filesystem : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "/>\n <label for=\"" + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper))) - + "_filesystem\">' + t('settings', 'Allow filesystem access') </label><br/>\n </span></li>\n"; + + "_filesystem\">" + + alias4(((helper = (helper = helpers.allowFSAccess || (depth0 != null ? depth0.allowFSAccess : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"allowFSAccess","hash":{},"data":data}) : helper))) + + "</label><br/>\n </span></li>\n"; },"4":function(container,depth0,helpers,partials,data) { return "checked"; },"6":function(container,depth0,helpers,partials,data) { - return " <li>\n <a class=\"icon icon-delete has-tooltip\" title=\"' + t('settings', 'Disconnect') \">' + t('settings', 'Revoke') +'</a>\n </li>\n"; + var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + + return " <li>\n <a class=\"icon icon-delete has-tooltip\" title=\"" + + alias4(((helper = (helper = helpers.disconnectText || (depth0 != null ? depth0.disconnectText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"disconnectText","hash":{},"data":data}) : helper))) + + "\">" + + alias4(((helper = (helper = helpers.revokeText || (depth0 != null ? depth0.revokeText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"revokeText","hash":{},"data":data}) : helper))) + + "</a>\n </li>\n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; |