From e4b9313b7b6d6edcffcd6ce8e547e2a165042e51 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Tue, 2 Sep 2014 15:35:38 +0200 Subject: =?UTF-8?q?Fix=20#14:=20Add=20=E2=80=98Other=20templates=E2=80=99?= =?UTF-8?q?=20field=20to=20metadata.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua | 6 +++++- mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua | 9 +++++++-- mediawiki.lrdevplugin/TranslatedStrings_de.txt | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua b/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua index f2745e4..3ea7f48 100755 --- a/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua +++ b/mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua @@ -92,6 +92,10 @@ MediaWikiExportServiceProvider.processRenderedPhotos = function(functionContext, local author = exportSettings.info_author local license = exportSettings.info_license local templates = exportSettings.info_templates + local additionalTemplates = photo:getPropertyForPlugin(Info.LrToolkitIdentifier, 'templates') or '' + if not MediaWikiUtils.isStringEmpty(additionalTemplates) then + templates = templates .. '\n' .. additionalTemplates + end local other = exportSettings.info_other local categories = exportSettings.info_categories local additionalCategories = photo:getPropertyForPlugin(Info.LrToolkitIdentifier, 'categories') or '' @@ -292,4 +296,4 @@ MediaWikiExportServiceProvider.exportPresetFields = { { key = 'info_categories', default = '' }, } -return MediaWikiExportServiceProvider \ No newline at end of file +return MediaWikiExportServiceProvider diff --git a/mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua b/mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua index 2f1c89a..bab12af 100644 --- a/mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua +++ b/mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua @@ -30,6 +30,11 @@ return { title = LOC '$$$/LrMediaWiki/Metadata/DescriptionAdditional=Description (other)', dataType = 'string', }, + { + id = 'templates', + title = LOC '$$$/LrMediaWiki/Metadata/Templates=Templates', + dataType = 'string', + }, { id = 'categories', title = LOC '$$$/LrMediaWiki/Metadata/Categories=Categories', @@ -37,5 +42,5 @@ return { }, }, - schemaVersion = 2, -} \ No newline at end of file + schemaVersion = 3, +} diff --git a/mediawiki.lrdevplugin/TranslatedStrings_de.txt b/mediawiki.lrdevplugin/TranslatedStrings_de.txt index 3bcc72e..06420d5 100755 --- a/mediawiki.lrdevplugin/TranslatedStrings_de.txt +++ b/mediawiki.lrdevplugin/TranslatedStrings_de.txt @@ -26,6 +26,7 @@ "$$$/LrMediaWiki/Metadata/DescriptionAdditional=Beschreibung (andere)" "$$$/LrMediaWiki/Metadata/DescriptionDe=Beschreibung (de)" "$$$/LrMediaWiki/Metadata/DescriptionEn=Beschreibung (en)" +"$$$/LrMediaWiki/Metadata/Templates=Vorlagen" "$$$/LrMediaWiki/PluginName=MediaWiki für Lightroom" "$$$/LrMediaWiki/Section/Licensing/Author=Urheber" "$$$/LrMediaWiki/Section/Licensing/Categories/Details=mit ; trennen" @@ -40,4 +41,4 @@ "$$$/LrMediaWiki/Section/User/ApiPath=API-Pfad" "$$$/LrMediaWiki/Section/User/Password=Passwort" "$$$/LrMediaWiki/Section/User/Title=Login-Informationen" -"$$$/LrMediaWiki/Section/User/Username=Benutzername" \ No newline at end of file +"$$$/LrMediaWiki/Section/User/Username=Benutzername" -- cgit v1.2.1