diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-07-15 09:15:32 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-15 09:15:32 +0200 |
| commit | 4c0ca2790996e42642e278ce6f0ae6fe4a803f89 (patch) | |
| tree | b81a1f2575485e92fe53fdc8f2033850c0469893 /apps | |
| parent | ff11ef3c5b1487d84503cd91e7d4560d72ceadb4 (diff) | |
| parent | 7159d6118e04ba543b8e6e3347438b31fd87ecc8 (diff) | |
| download | nextcloud-server-4c0ca2790996e42642e278ce6f0ae6fe4a803f89.tar.gz nextcloud-server-4c0ca2790996e42642e278ce6f0ae6fe4a803f89.zip | |
Merge pull request #9596 from owncloud/fixing-9503-master
reduce share action text to the user name only
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/js/shareSpec.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index e46be4ada46..eccd21c9248 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -143,7 +143,7 @@ ' data-action="Share-Notification" href="#" original-title="">' + ' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>'; $tr.find('.fileactions').append(function() { - var shareBy = t('files_sharing', 'Shared by {owner}', {owner: escapeHTML($tr.attr('data-share-owner'))}); + var shareBy = escapeHTML($tr.attr('data-share-owner')); var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>'); $result.on('click', function() { return false; diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js index 600859b4e7d..2cf5dc47b63 100644 --- a/apps/files_sharing/tests/js/shareSpec.js +++ b/apps/files_sharing/tests/js/shareSpec.js @@ -165,7 +165,7 @@ describe('OCA.Sharing.Util tests', function() { $tr = fileList.$el.find('tbody tr:first'); $action = $tr.find('.action-share'); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); expect(OC.basename(getImageUrl($tr.find('.filename')))).toEqual('folder-shared.svg'); }); @@ -207,7 +207,7 @@ describe('OCA.Sharing.Util tests', function() { expect($tr.find('.action-share').length).toEqual(0); $action = $tr.find('.action-share-notification'); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text().trim()).toEqual('Shared by User One'); + expect($action.find('>span').text().trim()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); expect(OC.basename(getImageUrl($tr.find('.filename')))).toEqual('folder-shared.svg'); expect($action.find('img').length).toEqual(1); @@ -369,7 +369,7 @@ describe('OCA.Sharing.Util tests', function() { OC.Share.updateIcon('file', 1); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); }); it('keep share text after unsharing reshare', function() { @@ -405,7 +405,7 @@ describe('OCA.Sharing.Util tests', function() { OC.Share.updateIcon('file', 1); expect($action.hasClass('permanent')).toEqual(true); - expect($action.find('>span').text()).toEqual('Shared by User One'); + expect($action.find('>span').text()).toEqual('User One'); expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg'); }); }); |