Skip to content

Commit

Permalink
Merge pull request #280 from wmde/no-pd-on-edited
Browse files Browse the repository at this point in the history
Dont show public domain snippet when image was edited
  • Loading branch information
tobijat authored Jan 15, 2018
2 parents e7bce6c + 4568c75 commit 19634e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions js/app/DialogueEvaluation.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ $.extend( DialogueEvaluation.prototype, {
var url = this.getAttributionLicence().getUrl();
if( url ) {
attribution += ', ';
if( licence.isPublicDomain() ) {
if( !editingAttribution && licence.isPublicDomain() ) {
attribution += Messages.t( 'dialogue.pd-attribution-hint' )
+ ', ' + Messages.t( 'dialogue.check-details' )
+ ' Wikimedia Commons: ';
Expand All @@ -150,18 +150,18 @@ $.extend( DialogueEvaluation.prototype, {
_getHtmlAttribution: function() {
var attributionLink;
var licence = this.getAttributionLicence();
if( licence.isPublicDomain() ) {
var editingAttribution = this._getEditingAttribution();

if( !editingAttribution && licence.isPublicDomain() ) {
attributionLink = ', ' + Messages.t( 'dialogue.pd-attribution-hint' );
if( licence.getUrl() ) {
attributionLink += ', ' + Messages.t( 'dialogue.check-details' ) + ' '
+ this._makeLink( licence.getUrl(), 'Wikimedia Commons' );
}
} else {
attributionLink = ', ' + this._getHtmlLicence();
// attributionLink = this._getHtmlLicence();
}

var editingAttribution = this._getEditingAttribution();
if( editingAttribution ) {
editingAttribution = ', ' + editingAttribution;
}
Expand Down

0 comments on commit 19634e3

Please sign in to comment.