jenkins-bot has submitted this change and it was merged.
Change subject: (bug 43593) error for restricted flickr content.
......................................................................
(bug 43593) error for restricted flickr content.
Restricted content from flickr needs authorization. Since currently there
is no way to find out if the content is restricted or invalid we try to
display a single error message for both conditions.
Todo: Find out a way to know if the flickr set is restricted and authorize
users to fetch its content.
Change-Id: Id906ae3f205ed4742e2e03cc1faa49171e5d47c9
---
M UploadWizard.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Kaldari: Looks good to me, approved
TheDJ: Looks good to me, but someone else must approve
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
index ff383cc..6d82488 100644
--- a/UploadWizard.i18n.php
+++ b/UploadWizard.i18n.php
@@ -313,7 +313,7 @@
'mwe-upwiz-license-external' => 'This file is under the following
license on $1: $2.',
'mwe-upwiz-license-external-invalid' => 'This file is under the
following license on $1: $2. Unfortunately, this license is not appropriate for
use on this site.',
'mwe-upwiz-license-photoset-invalid' => 'Unfortunately, no image in the
photoset has a license appropriate to be used on this site.',
- 'mwe-upwiz-url-invalid' => 'The URL entered is not a valid $1 image or
photoset URL.',
+ 'mwe-upwiz-url-invalid' => 'The URL entered points to an invalid or
restricted $1 image or photoset and cannot be used.',
'mwe-upwiz-categories' => 'Categories',
'mwe-upwiz-categories-add' => 'Add another category',
'mwe-upwiz-category-will-be-added' => 'This category is not in use
yet.',
--
To view, visit https://gerrit.wikimedia.org/r/53946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id906ae3f205ed4742e2e03cc1faa49171e5d47c9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
