Changeset 807770

Timestamp:

11/20/2013 08:56:46 PM (12 years ago)

Author:

sebstein

Message:

• allow translation of plugin
• add German translation

Location:

g-crossposting/trunk

Files:

• admin.php (modified) (12 diffs)
• g-crossposting.php (moved) (moved from g-crossposting/trunk/gplus-crosspost.php) (7 diffs)
• lang/g-crossposting-de_DE.mo (modified) (previous)
• lang/g-crossposting-de_DE.po (added)
• lang/g-crossposting.pot (modified) (1 diff)
• readme.txt (modified) (2 diffs)

g-crossposting/trunk/admin.php

@@ -12 +12 @@
 }
 
-require_once dirname(__FILE__).'/gplus-crosspost.php';
-
 // register our admin actions
 add_action('admin_init', 'g_crossposting_register_options');
@@ -24 +22 @@
 if (array_key_exists('g_crossposting_manual_import', $_GET)) {
     g_crossposting_update();
-    g_crossposting_add_error('g_crossposting_err_import', __("Manual import of Google+ activities done."));
+    g_crossposting_add_error('g_crossposting_err_import', __('Manual import of Google+ activities done.', 'g-crossposting'));
 }
 
@@ -42 +40 @@
     if (function_exists('add_submenu_page')) {
         // add menu entry for config page
-        add_submenu_page('options-general.php', __('Google+ Crossposting Configuration'), __('Google+ Crossposting'), 'manage_options', 'g-crossposting-key-config', 'g_crossposting_conf');
+        add_submenu_page('options-general.php', __('Google+ Crossposting Configuration', 'g-crossposting'), __('Google+ Crossposting', 'g-crossposting'), 'manage_options', 'g-crossposting-key-config', 'g_crossposting_conf');
     }
 }
@@ -54 +52 @@
 
     // add a section around our options
-    add_settings_section('g_crossposting_section_main', 'Authentication Settings', 'g_crossposting_section_main_text', 'g_crossposting');
-    add_settings_section('g_crossposting_section_options', 'Setup Options', 'g_crossposting_section_options_text', 'g_crossposting');
+    add_settings_section('g_crossposting_section_main', __('Authentication Settings', 'g-crossposting'), 'g_crossposting_section_main_text', 'g_crossposting');
+    add_settings_section('g_crossposting_section_options', __('Setup Options', 'g-crossposting'), 'g_crossposting_section_options_text', 'g_crossposting');
 
     // add field for each option
-    add_settings_field('g_crossposting_gplusid', __('Your Google+ ID'), 'g_crossposting_gplusid_field', 'g_crossposting', 'g_crossposting_section_main');
-    add_settings_field('g_crossposting_apikey', __('Your Google API key'), 'g_crossposting_apikey_field', 'g_crossposting', 'g_crossposting_section_main');
-    add_settings_field('g_crossposting_user', __('Wordpress user to set as author of imported Google+ activities'), 'g_crossposting_author_field', 'g_crossposting', 'g_crossposting_section_options');
-    add_settings_field('g_crossposting_category', __('Category to use for imported Google+ activities'), 'g_crossposting_category_field', 'g_crossposting', 'g_crossposting_section_options');
-    add_settings_field('g_crossposting_comment', __('Enable comments on imported Google+ activities'), 'g_crossposting_comment_field', 'g_crossposting', 'g_crossposting_section_options');
-    add_settings_field('g_crossposting_maxactivities', __('Maximum number of new activities to import'), 'g_crossposting_maxactivities_field', 'g_crossposting', 'g_crossposting_section_options');
-    add_settings_field('g_crossposting_titlelen', __('Maximum length of imported title (set to 0 for full length)'), 'g_crossposting_titlelen_field', 'g_crossposting', 'g_crossposting_section_options');
-    add_settings_field('g_crossposting_addcanonical', __('Add canonical meta tag pointing to Google+'), 'g_crossposting_addcanonical_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_gplusid', __('Your Google+ ID', 'g-crossposting'), 'g_crossposting_gplusid_field', 'g_crossposting', 'g_crossposting_section_main');
+    add_settings_field('g_crossposting_apikey', __('Your Google API key', 'g-crossposting'), 'g_crossposting_apikey_field', 'g_crossposting', 'g_crossposting_section_main');
+    add_settings_field('g_crossposting_user', __('Wordpress user to set as author of imported Google+ activities', 'g-crossposting'), 'g_crossposting_author_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_category', __('Category to use for imported Google+ activities', 'g-crossposting'), 'g_crossposting_category_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_comment', __('Enable comments on imported Google+ activities', 'g-crossposting'), 'g_crossposting_comment_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_maxactivities', __('Maximum number of new activities to import', 'g-crossposting'), 'g_crossposting_maxactivities_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_titlelen', __('Maximum length of imported title (set to 0 for full length)', 'g-crossposting'), 'g_crossposting_titlelen_field', 'g_crossposting', 'g_crossposting_section_options');
+    add_settings_field('g_crossposting_addcanonical', __('Add canonical meta tag pointing to Google+', 'g-crossposting'), 'g_crossposting_addcanonical_field', 'g_crossposting', 'g_crossposting_section_options');
 }
 
@@ -155 +153 @@
 function g_crossposting_section_main_text() {
     echo '<p>';
-    _e("The following settings specify your Google+ ID and your Google API key. Without those settings, the plugin won't work.");
+    _e('The following settings specify your Google+ ID and your Google API key. Without those settings, the plugin won\'t work.', 'g-crossposting');
     echo '</p>';
 }
@@ -164 +162 @@
 function g_crossposting_section_options_text() {
     echo '<p>';
-    _e("The following settings let you configure the behaviour of this plugin.");
+    _e('The following settings let you configure the behaviour of this plugin.', 'g-crossposting');
     echo '</p>';
 }
@@ -177 +175 @@
     // trim Google API key
     $new_input['apikey'] = trim($input['apikey']);
-
-    // if API key and Google+ are given, check if they are valid
-    if (! empty($new_input['gplusid']) && ! empty($new_input['apikey'])) {
-        if (g_crossposting_api_activities_list($new_input['gplusid'], $new_input['apikey'], 1) == null) {
-            // at least one of both must be wrong
-            $new_input['gplusid'] = '';
-            $new_input['apikey'] = '';
-        }
-    }
 
     // validate number of maximum activities to import
@@ -191 +180 @@
     if (! g_crossposting_check_maxactivities($new_input['maxactivities'])) {
         $new_input['maxactivities'] = 1;
-        g_crossposting_add_error('g_crossposting_err_maxactivities', __("The maximum number of activities to import must be a number between 1 and 100."));
+        g_crossposting_add_error('g_crossposting_err_maxactivities', __('The maximum number of activities to import must be a number between 1 and 100.', 'g-crossposting'));
     }
 
@@ -198 +187 @@
     if (! g_crossposting_check_titlelen($new_input['titlelen'])) {
         $new_input['titlelen'] = 0;
-        g_crossposting_add_error('g_crossposting_err_titlelen', __("The maximum length of post title should be a number between 0 and 100."));
+        g_crossposting_add_error('g_crossposting_err_titlelen', __('The maximum length of post title should be a number between 0 and 100.', 'g-crossposting'));
     }
 
@@ -242 +231 @@
 ?>
 <div class="wrap">
-<h2><?php _e('Google+ Crossposting Configuration'); ?></h2>
+<h2><?php _e('Google+ Crossposting Configuration', 'g-crossposting'); ?></h2>
 <form action="options.php" method="post">
 <?php
@@ -249 +238 @@
 ?>
 <p class="submit">
-    <input type="submit" class='button-primary' name="Submit" value="<?php _e('Save Changes')?> &raquo;" />
+    <input type="submit" class='button-primary' name="Submit" value="<?php _e('Save Changes', 'g-crossposting') ?> &raquo;" />
 </p>
 </form>
@@ -255 +244 @@
     // add link to start manual mass import
     echo '<div id="g-crossposting-manual-import"><strong>';
-    _e('Manual mass import:');
+    _e('Manual mass import:', 'g-crossposting');
     echo '</strong> <a href="?page=g-crossposting-key-config&amp;g_crossposting_manual_import=true">';
-    _e('manually check for new activities and import them');
+    _e('manually check for new activities and import them', 'g-crossposting');
     echo '</a></div>';
 /*

g-crossposting/trunk/g-crossposting.php

@@ -4 +4 @@
     Plugin URI: http://wordpress.org/extend/plugins/g-crossposting/
     Description: Imports your public Google+ activities in your Wordpress blog.
-    Version: 1.1.4
+    Version: 1.2.0
     Author: Sebastian Stein
     Author URI: http://sebstein.hpfsc.de/
     Text Domain: g-crossposting
-    Domain Path: /lang/
+    Domain Path: /lang
     License: GPL2
 */
@@ -36 +36 @@
 }
 
+// load text domain for translations
+load_plugin_textdomain('g-crossposting', false, basename(dirname(__FILE__)).'/lang');
+
 // load admin UI only if current user is an admin
 if (is_admin()) {
     require_once dirname(__FILE__).'/admin.php';
 }
-
-// load text domain for translations
-load_plugin_textdomain('g-crossposting', false, basename(dirname(__FILE__)).'/lang');
 
 // add our own 5 minute scheduler
@@ -87 +87 @@
     $schedules['5minutes'] = array(
             'interval' => 300,
-            'display' => __('Once every 5 minutes'),
+            'display' => __('Once every 5 minutes', 'g-crossposting'),
         );
 
@@ -292 +292 @@
         $att_article = null;
         $att_url = null;
-        if ($activity->object->attachments) {
+        if (isset($activity->object->attachments)) {
             foreach ($activity->object->attachments as $attachment) {
                 switch ($attachment->objectType) {
                     case 'article':
                         $att_title = $attachment->displayName;
-                        $att_article = $attachment->content;
                         $att_url = $attachment->url;
+
+                        $att_article = "";
+                        if (isset($attachment->content)) {
+                            $att_article = $attachment->content;
+                        }
+
                         if (isset($attachment->image, $attachment->image->url)) {
                             $att_photo = $attachment->image->url;
@@ -325 +330 @@
             $post_content .= '</div>';
         }
-        $post_content .= '<div class="g-crossposting-backlink"><a href="'.$activity->url.'" target="_blank">This was posted on Google+&hellip;</a></div>';
+        $post_content .= '<div class="g-crossposting-backlink"><a href="'.$activity->url.'" target="_blank">'.__('This was posted on Google+', 'g-crossposting').'</a></div>';
 
 
@@ -334 +339 @@
             $post_title = $att_title;
         } else {
-            $post_title = 'Google+ post: No title available&hellip;';
+            $post_title = __('Google+ post: No title available&hellip;', 'g-crossposting');
         }
         // shorten post title if required
@@ -420 +425 @@
 function g_crossposting_check_category($given_category) {
     $cat_obj = get_category($given_category);
-    if ($cat_obj && $given_category == $cat_obj->cat_ID) {
+    if (isset($cat_obj) && isset($cat_obj->cat_ID) && $given_category == $cat_obj->cat_ID) {
         return TRUE;
     }

g-crossposting/trunk/lang/g-crossposting.pot

@@ -1 @@
-# Copyright (C) 2010 
-# This file is distributed under the same license as the  package.
+# Copyright (C) 2013 Google+ Crossposting
+# This file is distributed under the same license as the Google+ Crossposting package.
 msgid ""
 msgstr ""
-"Project-Id-Version:  \n"
+"Project-Id-Version: Google+ Crossposting 1.2.0\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/g-crossposting\n"
-"POT-Creation-Date: 2011-09-28 21:59:12+00:00\n"
+"POT-Creation-Date: 2013-11-20 16:47:09+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2013-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 
-#: gplus-crosspost.php:71
+#. #-#-#-#-#  g-crossposting.pot (Google+ Crossposting 1.2.0)  #-#-#-#-#
+#. Plugin Name of the plugin/theme
+#: admin.php:26
+msgid "Manual import of Google+ activities done."
+msgstr ""
+
+#: admin.php:54
+msgid "Authentication Settings"
+msgstr ""
+
+#: admin.php:55
+msgid "Setup Options"
+msgstr ""
+
+#: admin.php:44 admin.php:244
+msgid "Google+ Crossposting Configuration"
+msgstr ""
+
+#: admin.php:44
+msgid "Google+ Crossposting"
+msgstr ""
+
+#: admin.php:60
+msgid "Your Google+ ID"
+msgstr ""
+
+#: admin.php:61
+msgid "Your Google API key"
+msgstr ""
+
+#: admin.php:62
+msgid "Wordpress user to set as author of imported Google+ activities"
+msgstr ""
+
+#: admin.php:63
+msgid "Category to use for imported Google+ activities"
+msgstr ""
+
+#: admin.php:64
+msgid "Enable comments on imported Google+ activities"
+msgstr ""
+
+#: admin.php:65
+msgid "Maximum number of new activities to import"
+msgstr ""
+
+#: admin.php:66
+msgid "Maximum length of imported title (set to 0 for full length)"
+msgstr ""
+
+#: admin.php:67
+msgid "Add canonical meta tag pointing to Google+"
+msgstr ""
+
+#: admin.php:157
+msgid "The following settings specify your Google+ ID and your Google API key. Without those settings, the plugin won't work."
+msgstr ""
+
+#: admin.php:166
+msgid "The following settings let you configure the behaviour of this plugin."
+msgstr ""
+
+#: admin.php:193
+msgid "The maximum number of activities to import must be a number between 1 and 100."
+msgstr ""
+
+#: admin.php:200
+msgid "The maximum length of post title should be a number between 0 and 100."
+msgstr ""
+
+#: admin.php:249
+msgid "Save Changes"
+msgstr ""
+
+#: admin.php:257
+msgid "Manual mass import:"
+msgstr ""
+
+#: admin.php:259
+msgid "manually check for new activities and import them"
+msgstr ""
+
+#: g-crossposting.php:89
 msgid "Once every 5 minutes"
 msgstr ""
 
-#: admin.php:24
-msgid "Manual import of Google+ activities done."
+#: g-crossposting.php:327
+msgid "This was posted on Google+&hellip;"
 msgstr ""
 
-#: admin.php:42 admin.php:226
-msgid "Google+ Crossposting Configuration"
+#: g-crossposting.php:336
+msgid "Google+ post: No title available&hellip;"
 msgstr ""
 
-#: admin.php:42
-msgid "Google+ Crossposting"
+#. Plugin URI of the plugin/theme
+msgid "http://wordpress.org/extend/plugins/g-crossposting/"
 msgstr ""
 
-#: admin.php:58
-msgid "Your Google+ ID"
+#. Description of the plugin/theme
+msgid "Imports your public Google+ activities in your Wordpress blog."
 msgstr ""
 
-#: admin.php:60
-msgid "Your Google API key"
+#. Author of the plugin/theme
+msgid "Sebastian Stein"
 msgstr ""
 
-#: admin.php:61
-msgid "Wordpress user to set as author of imported Google+ activities"
+#. Author URI of the plugin/theme
+msgid "http://sebstein.hpfsc.de/"
 msgstr ""
-
-#: admin.php:62
-msgid "Category to use for imported Google+ activities"
-msgstr ""
-
-#: admin.php:63
-msgid "Enable comments on imported Google+ activities"
-msgstr ""
-
-#: admin.php:64
-msgid "Maximum number of new activities to import"
-msgstr ""
-
-#: admin.php:65
-msgid "Add canonical meta tag pointing to Google+"
-msgstr ""
-
-#: admin.php:147
-msgid ""
-"The following settings specify your Google+ ID and your Google API key. "
-"Without those settings, the plugin won't work."
-msgstr ""
-
-#: admin.php:156
-msgid "The following settings let you configure the behaviour of this plugin."
-msgstr ""
-
-#: admin.php:168
-msgid "You provided an invalid Google+ ID."
-msgstr ""
-
-#: admin.php:175
-msgid "You provided an invalid Google API key."
-msgstr ""
-
-#: admin.php:182
-msgid ""
-"The maximum number of activities to import must be a number between 1 and "
-"100."
-msgstr ""
-
-#: admin.php:233
-msgid "Save Changes"
-msgstr ""
-
-#: admin.php:239
-msgid "Manual mass import:"
-msgstr ""
-
-#: admin.php:241
-msgid "manually check for new activities and import them"
-msgstr ""

g-crossposting/trunk/readme.txt

@@ -1 +1 @@
 === Google+ Crossposting ===
 Contributors: sebstein
-Donate link: http://www.icrc.org/eng/
-Tags: google, googleplus, posts
+Donate link: bitcoin:18dNV4mZyQMDdgd1ebe2Gm4f9MNZMLuNNb
+Tags: google, googleplus, posts, g+
 Requires at least: 3.0.0
 Tested up to: 3.7.1
-Stable tag: 1.1.4
+Stable tag: 1.2.0
 
 Imports your public Google+ activities in your Wordpress blog.
@@ -103 +103 @@
 == Changelog ==
 
+= 1.2.0 =
+
+* plugin can now be translated
+* provide German translation
+
 = 1.1.4 =