diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-01 14:25:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 14:25:02 +0200 |
| commit | 66970f4c179c480b2f473dd0f17df1b51f4147a2 (patch) | |
| tree | 34eaa49656e768b6c39a73dcf768a9efe935ef56 | |
| parent | ca2942aa014a5b31ec685484d181c77c828b4d7b (diff) | |
| parent | 9b8e884b19175a304e00fdd1371c9a524c3afbfc (diff) | |
| download | nextcloud-server-66970f4c179c480b2f473dd0f17df1b51f4147a2.tar.gz nextcloud-server-66970f4c179c480b2f473dd0f17df1b51f4147a2.zip | |
Merge pull request #11498 from nextcloud/copy-link-wording
Change wording of 'Copy URL' to more understandable 'Copy link'
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 10 | ||||
| -rw-r--r-- | tests/acceptance/features/bootstrap/FilesAppContext.php | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 736404e2681..9cd48aaf9a7 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -406,7 +406,7 @@ permissions: permissions }); }, - + showNoteForm: function(event) { event.preventDefault(); event.stopPropagation(); @@ -431,9 +431,9 @@ var shareId = $li.data('share-id'); var $menu = $element.closest('li'); var $form = $menu.next('li.share-note-form'); - + $form.find('.share-note').val(''); - + $form.addClass('hidden'); $menu.find('.share-note-delete').hide(); @@ -600,7 +600,7 @@ var popover = this.popoverMenuTemplate({ cid: this.model.get('linkShare').id, - copyLabel: t('core', 'Copy URL'), + copyLabel: t('core', 'Copy link'), social: social, shareLinkURL: this.model.get('linkShare').link, @@ -745,7 +745,7 @@ var datePicker = $(expirationDatePicker); var state = $element.prop('checked'); datePicker.toggleClass('hidden', !state); - + if (!state) { // disabled, let's hide the input and // set the expireDate to nothing diff --git a/tests/acceptance/features/bootstrap/FilesAppContext.php b/tests/acceptance/features/bootstrap/FilesAppContext.php index ab9fc8fe29c..408995b9a83 100644 --- a/tests/acceptance/features/bootstrap/FilesAppContext.php +++ b/tests/acceptance/features/bootstrap/FilesAppContext.php @@ -227,9 +227,9 @@ class FilesAppContext implements Context, ActorAwareInterface { * @return Locator */ public static function copyUrlMenuItem() { - return Locator::forThe()->xpath("//a[normalize-space() = 'Copy URL']")-> + return Locator::forThe()->xpath("//a[normalize-space() = 'Copy link']")-> descendantOf(self::shareLinkMenu())-> - describedAs("Copy URL menu item in the share link menu in the details view in Files app"); + describedAs("Copy link menu item in the share link menu in the details view in Files app"); } /** |