Merge pull request #2966 from getnikola/remove-googleplus

Remove googleplus comments
getnikola · Feb 22, 2018 · 3811f57 · 3811f57
2 parents 504feec + 5f19efe
commit 3811f57
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 55 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -63,6 +63,7 @@ Bugfixes
 Removed features
 ----------------
 
+* Removed ``googleplus`` comments (no longer supported) (Issue #635)
 * Removed the slides directive for docutils, it will now be a separate plugin.
 * Dropped Python 2 and Python 3.3 support (oldest supported version is 3.4)
 * Removed ``nikola install_theme`` — use ``nikola theme`` instead

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -1741,13 +1741,11 @@ Nikola supports several third party comment systems:
 * `IntenseDebate <http://www.intensedebate.com/>`_
 * `LiveFyre <http://www.livefyre.com/>`_
 * `Moot <http://moot.it>`_
-* `Google+ <http://plus.google.com>`_
 * `Facebook <http://facebook.com/>`_
 * `isso <http://posativ.org/isso/>`_
 
 By default it will use DISQUS, but you can change by setting ``COMMENT_SYSTEM``
-to one of "disqus", "intensedebate", "livefyre", "moot", "googleplus",
-"facebook" or "isso"
+to one of "disqus", "intensedebate", "livefyre", "moot", "facebook" or "isso"
 
 .. sidebar:: ``COMMENT_SYSTEM_ID``
 
@@ -1758,7 +1756,6 @@ to one of "disqus", "intensedebate", "livefyre", "moot", "googleplus",
    * In IntenseDebate it's the **IntenseDebate site acct**
    * In LiveFyre it's the **siteId**
    * In Moot it's your **username**
-   * For Google Plus, ``COMMENT_SYSTEM_ID`` need not be set. WARNING: this will not work correctly in the test server, needs to be deployed to a real server/URL.
    * For Facebook, you need to `create an app
      <https://developers.facebook.com/apps>`_ (turn off sandbox mode!)
      and get an **App ID**

diff --git a/nikola/data/themes/base-jinja/templates/comments_helper.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper.tmpl
@@ -4,7 +4,6 @@
 {% import 'comments_helper_livefyre.tmpl' as livefyre with context %}
 {% import 'comments_helper_intensedebate.tmpl' as intensedebate with context %}
 {% import 'comments_helper_muut.tmpl' as muut with context %}
-{% import 'comments_helper_googleplus.tmpl' as googleplus with context %}
 {% import 'comments_helper_facebook.tmpl' as facebook with context %}
 {% import 'comments_helper_isso.tmpl' as isso with context %}
 
@@ -17,8 +16,6 @@
         {{ intensedebate.comment_form(url, title, identifier) }}
     {% elif comment_system == 'muut' %}
         {{ muut.comment_form(url, title, identifier) }}
-    {% elif comment_system == 'googleplus' %}
-        {{ googleplus.comment_form(url, title, identifier) }}
     {% elif comment_system == 'facebook' %}
         {{ facebook.comment_form(url, title, identifier) }}
     {% elif comment_system == 'isso' %}
@@ -35,8 +32,6 @@
         {{ intensedebate.comment_link(link, identifier) }}
     {% elif comment_system == 'muut' %}
         {{ muut.comment_link(link, identifier) }}
-    {% elif comment_system == 'googleplus' %}
-        {{ googleplus.comment_link(link, identifier) }}
     {% elif comment_system == 'facebook' %}
         {{ facebook.comment_link(link, identifier) }}
     {% elif comment_system == 'isso' %}
@@ -53,8 +48,6 @@
         {{ intensedebate.comment_link_script() }}
     {% elif comment_system == 'muut' %}
         {{ muut.comment_link_script() }}
-    {% elif comment_system == 'googleplus' %}
-        {{ googleplus.comment_link_script() }}
     {% elif comment_system == 'facebook' %}
         {{ facebook.comment_link_script() }}
     {% elif comment_system == 'isso' %}

diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_googleplus.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_googleplus.tmpl
diff --git a/nikola/data/themes/base/templates/comments_helper.tmpl b/nikola/data/themes/base/templates/comments_helper.tmpl
@@ -4,7 +4,6 @@
 <%namespace name="livefyre" file="comments_helper_livefyre.tmpl"/>
 <%namespace name="intensedebate" file="comments_helper_intensedebate.tmpl"/>
 <%namespace name="muut" file="comments_helper_muut.tmpl"/>
-<%namespace name="googleplus" file="comments_helper_googleplus.tmpl"/>
 <%namespace name="facebook" file="comments_helper_facebook.tmpl"/>
 <%namespace name="isso" file="comments_helper_isso.tmpl"/>
 
@@ -17,8 +16,6 @@
         ${intensedebate.comment_form(url, title, identifier)}
     % elif comment_system == 'muut':
         ${muut.comment_form(url, title, identifier)}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_form(url, title, identifier)}
     % elif comment_system == 'facebook':
         ${facebook.comment_form(url, title, identifier)}
     % elif comment_system == 'isso':
@@ -35,8 +32,6 @@
         ${intensedebate.comment_link(link, identifier)}
     % elif comment_system == 'muut':
         ${muut.comment_link(link, identifier)}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_link(link, identifier)}
     % elif comment_system == 'facebook':
         ${facebook.comment_link(link, identifier)}
     % elif comment_system == 'isso':
@@ -53,8 +48,6 @@
         ${intensedebate.comment_link_script()}
     % elif comment_system == 'muut':
         ${muut.comment_link_script()}
-    % elif comment_system == 'googleplus':
-        ${googleplus.comment_link_script()}
     % elif comment_system == 'facebook':
         ${facebook.comment_link_script()}
     % elif comment_system == 'isso':

diff --git a/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl b/nikola/data/themes/base/templates/comments_helper_googleplus.tmpl
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -95,12 +95,11 @@
 
 __all__ = ('Nikola',)
 
-# We store legal values for some setting here.  For internal use.
+# We store legal values for some settings here.  For internal use.
 LEGAL_VALUES = {
     'COMMENT_SYSTEM': [
         'disqus',
         'facebook',
-        'googleplus',
         'intensedebate',
         'isso',
         'livefyre',

diff --git a/tests/data/translated_titles/conf.py b/tests/data/translated_titles/conf.py
@@ -420,7 +420,7 @@
 
 # To use comments, you can choose between different third party comment
 # systems, one of "disqus", "livefyre", "intensedebate", "moot",
-#                 "googleplus", "facebook" or "isso"
+#                 "facebook" or "isso"
 COMMENT_SYSTEM = "disqus"
 # And you also need to add your COMMENT_SYSTEM_ID which
 # depends on what comment system you use. The default is