diff options
| author | Robin Krahl <me@robin-krahl.de> | 2014-09-02 15:35:38 +0200 | 
|---|---|---|
| committer | Robin Krahl <me@robin-krahl.de> | 2014-09-02 15:35:38 +0200 | 
| commit | e4b9313b7b6d6edcffcd6ce8e547e2a165042e51 (patch) | |
| tree | 6d74377263768ec20b353bcde96980ec20f43dfb | |
| parent | a1ff27606ca1afb86230b0b76d35fa82c08efb06 (diff) | |
| download | LrMediaWiki-e4b9313b7b6d6edcffcd6ce8e547e2a165042e51.tar.gz LrMediaWiki-e4b9313b7b6d6edcffcd6ce8e547e2a165042e51.tar.bz2 | |
Fix #14: Add ‘Other templates’ field to metadata.
| -rwxr-xr-x | mediawiki.lrdevplugin/MediaWikiExportServiceProvider.lua | 6 | ||||
| -rw-r--r-- | mediawiki.lrdevplugin/MediaWikiMetadataProvider.lua | 9 | ||||
| -rwxr-xr-x | 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"
 | 
