aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Krahl <me@robin-krahl.de>2014-08-24 03:44:55 +0200
committerRobin Krahl <me@robin-krahl.de>2014-08-24 03:44:55 +0200
commitbec94fdb41dbb479b1128c864d9ccf736fa20bfc (patch)
tree3d7cf64c2e9f21b5f0ade23bd38eac1889b9cdd8
parente5cc93a08dc6a8566ed043752029c430d99f02f0 (diff)
downloadLrMediaWiki-bec94fdb41dbb479b1128c864d9ccf736fa20bfc.tar.gz
LrMediaWiki-bec94fdb41dbb479b1128c864d9ccf736fa20bfc.tar.bz2
Fix #8: Remove fallback description.
-rwxr-xr-xmediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua23
-rwxr-xr-xmediawiki.lrdevplugin/TranslatedStrings_de.txt1
2 files changed, 1 insertions, 23 deletions
diff --git a/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua b/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua
index ff27185..81f9839 100755
--- a/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua
+++ b/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua
@@ -69,7 +69,6 @@ MediaWikiExportServiceProvider.processRenderedPhotos = function(functionContext,
-- do upload to MediaWiki
local photo = rendition.photo
- local fallbackDescription = exportSettings.fallback_description
local descriptionEn = photo:getPropertyForPlugin(Info.LrToolkitIdentifier, 'description_en')
local descriptionDe = photo:getPropertyForPlugin(Info.LrToolkitIdentifier, 'description_de')
local descriptionAdditional = photo:getPropertyForPlugin(Info.LrToolkitIdentifier, 'description_additional')
@@ -84,11 +83,7 @@ MediaWikiExportServiceProvider.processRenderedPhotos = function(functionContext,
description = description .. descriptionAdditional
end
if isStringEmpty(description) then
- if fallbackDescription then
- description = fallbackDescription
- else
- rendition:uploadFailed(LOC '$$$/LrMediaWiki/Export/NoDescription=No description given for this file!')
- end
+ rendition:uploadFailed(LOC '$$$/LrMediaWiki/Export/NoDescription=No description given for this file!')
end
local source = exportSettings.info_source
local timestampSeconds = photo:getRawMetadata('dateTimeOriginal')
@@ -170,21 +165,6 @@ MediaWikiExportServiceProvider.sectionsForTopOfDialog = function(viewFactory, pr
spacing = viewFactory:control_spacing(),
viewFactory:static_text {
- title = LOC '$$$/LrMediaWiki/Section/Licensing/DefaultDescription=Default description',
- },
-
- viewFactory:edit_field {
- value = bind 'fallback_description',
- immediate = true,
- width_in_chars = 30,
- height_in_lines = 3,
- },
- },
-
- viewFactory:row {
- spacing = viewFactory:control_spacing(),
-
- viewFactory:static_text {
title = LOC '$$$/LrMediaWiki/Section/Licensing/Source=Source',
},
@@ -274,7 +254,6 @@ MediaWikiExportServiceProvider.exportPresetFields = {
{ key = 'username', default = '' },
{ key = 'password', default = '' },
{ key = 'api_path', default = 'https://commons.wikimedia.org/w/api.php' },
- { key = 'fallback_description', default = '' },
{ key = 'info_source', default = '{{own}}' },
{ key = 'info_author', default = '' },
{ key = 'info_license', default = '{{Cc-by-sa-4.0}}' },
diff --git a/mediawiki.lrdevplugin/TranslatedStrings_de.txt b/mediawiki.lrdevplugin/TranslatedStrings_de.txt
index 4d2d687..716fba7 100755
--- a/mediawiki.lrdevplugin/TranslatedStrings_de.txt
+++ b/mediawiki.lrdevplugin/TranslatedStrings_de.txt
@@ -15,7 +15,6 @@
"$$$/LrMediaWiki/Section/User/ApiPath=API-Pfad"
"$$$/LrMediaWiki/Section/User/ApiPath/Details=Pfad zur api.php-Datei"
"$$$/LrMediaWiki/Section/Licensing/Title=Upload-Informationen"
-"$$$/LrMediaWiki/Section/Licensing/DefaultDescription=Standard-Beschreibung"
"$$$/LrMediaWiki/Section/Licensing/Source=Quelle"
"$$$/LrMediaWiki/Section/Licensing/Author=Urheber"
"$$$/LrMediaWiki/Section/Licensing/License=Lizenz"