From c43dfb815a4951b8248f4f0e98babe4f80204f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 3 Apr 2015 13:14:53 +0200 Subject: Imported Upstream version 0.22.0 --- plugins/shotwell-publishing/FacebookPublishing.vala | 18 ++++++++++++++---- plugins/shotwell-publishing/FlickrPublishing.vala | 9 ++++++--- plugins/shotwell-publishing/PicasaPublishing.vala | 4 ++-- plugins/shotwell-publishing/PiwigoPublishing.vala | 4 ++-- plugins/shotwell-publishing/YouTubePublishing.vala | 4 ++-- plugins/shotwell-publishing/shotwell-publishing.vala | 2 +- 6 files changed, 27 insertions(+), 14 deletions(-) (limited to 'plugins/shotwell-publishing') diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala index 79b7a0a..1dd793d 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.vala +++ b/plugins/shotwell-publishing/FacebookPublishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -29,7 +29,7 @@ public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Lucas Beeler"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; @@ -1393,9 +1393,19 @@ internal class GraphSession { if (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) mp_envelope.append_form_string("privacy", resource_privacy); - string publishable_title = publishable.get_publishing_name(); - if (!suppress_titling && publishable_title != "") + //Get photo title and post it as message on FB API + string publishable_title = publishable.get_param_string("title"); + if (!suppress_titling && publishable_title != null) mp_envelope.append_form_string("name", publishable_title); + + //Set 'message' data field with EXIF comment field. Title has precedence. + string publishable_comment = publishable.get_param_string("comment"); + if (!suppress_titling && publishable_comment != null) + mp_envelope.append_form_string("message", publishable_comment); + + //Sets correct date of the picture + if (!suppress_titling) + mp_envelope.append_form_string("backdated_time", publishable.get_exposure_date_time().to_string()); string source_file_mime_type = (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) ? diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala index dcf7971..71f295c 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.vala +++ b/plugins/shotwell-publishing/FlickrPublishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -31,7 +31,7 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Lucas Beeler"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; @@ -1152,7 +1152,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object { string upload_label_text = _("You are logged into Flickr as %s.\n\n").printf(parameters.username); if (parameters.user_kind == UserKind.FREE) { - upload_label_text += _("Your free Flickr account limits how much data you can upload per month.\nThis month, you have %d megabytes remaining in your upload quota.").printf(parameters.quota_free_mb); + upload_label_text += ngettext( + "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabyte remaining in your upload quota.", + "Your free Flickr account limits how much data you can upload per month.\nThis month you have %d megabytes remaining in your upload quota.", + parameters.quota_free_mb).printf(parameters.quota_free_mb); } else { upload_label_text += _("Your Flickr Pro account entitles you to unlimited uploads."); } diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala index c360e59..9749d5a 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.vala +++ b/plugins/shotwell-publishing/PicasaPublishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -29,7 +29,7 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Lucas Beeler"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala index 8deada4..3b6c632 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.vala +++ b/plugins/shotwell-publishing/PiwigoPublishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. @@ -29,7 +29,7 @@ public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Bruno Girin"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala index c84240b..81af039 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.vala +++ b/plugins/shotwell-publishing/YouTubePublishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2009-2014 Yorba Foundation +/* Copyright 2009-2015 Yorba Foundation * * This software is licensed under the GNU LGPL (version 2.1 or later). * See the COPYING file in this distribution. @@ -29,7 +29,7 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service { public void get_info(ref Spit.PluggableInfo info) { info.authors = "Jani Monoses, Lucas Beeler"; - info.copyright = _("Copyright 2009-2014 Yorba Foundation"); + info.copyright = _("Copyright 2009-2015 Yorba Foundation"); info.translators = Resources.TRANSLATORS; info.version = _VERSION; info.website_name = Resources.WEBSITE_NAME; diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala index f9f2080..9af744e 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.vala +++ b/plugins/shotwell-publishing/shotwell-publishing.vala @@ -1,4 +1,4 @@ -/* Copyright 2011-2014 Yorba Foundation +/* Copyright 2011-2015 Yorba Foundation * * This software is licensed under the GNU Lesser General Public License * (version 2.1 or later). See the COPYING file in this distribution. -- cgit v1.2.3