[gimp-web/migrate/testing: 63/63] Finish merge migrate/py3

[Pat David <patdavid src gnome org>]

commit 6ec5583ec74ecda0af1ececcdf862e049995bfe5
Merge: 08ba6579 5536cfa0
Author: Pat David <patdavid gmail com>
Date:   Fri Apr 24 14:38:47 2020 -0500

    Finish merge migrate/py3

 README.md                                          |  87 ++++++++++++++----
 .../meta/building/{index.fr.md => index.fr.md.old} |   0
 .../about/meta/{index.fr.md => index.fr.md.old}    |   0
 .../{translating.fr.md => translating.fr.md.old}   |   0
 .../{translations.fr.md => translations.fr.md.old} |   0
 content/docs/{userfaq.ar.md => userfaq.ar.md.old}  |   0
 pelicanconf_common.py                              | 101 +++++++++++++++++----
 plugins/gimp_mirrors/gimp_mirrors.py               |   2 +-
 plugins/random_header/random_header.py             |   2 +-
 py3-requirements.txt                               |   6 ++
 themes/newgimp/templates/base.html                 |   4 +-
 11 files changed, 163 insertions(+), 39 deletions(-)
---
diff --cc pelicanconf_common.py
index d92bd65c,b1613f22..cfdc8c59
--- a/pelicanconf_common.py
+++ b/pelicanconf_common.py
@@@ -21,46 -25,56 +25,93 @@@ TRANSLATION_FEED_RSS = Non
  AUTHOR_FEED_ATOM = None
  AUTHOR_FEED_RSS = None
  
- DELETE_OUTPUT_DIRECTORY = False
+ # BEGIN: Pat testing feeds being generated
  RELATIVE_URLS = False
+ FEED_DOMAIN = SITEURL
+ FEED_ATOM = 'feeds/atom.xml'
+ FEED_RSS = 'feeds/rss.xml'
+ # END:   Pat testing feeds being generated
+ 
+ DELETE_OUTPUT_DIRECTORY = False
+ 
+ # def customize_environment(environment):
+ #     global SITEURL, SITEMAP_SITEURL
+ #     global LOAD_CONTENT_CACHE, CHECK_MODIFIED_METHOD, CACHE_CONTENT
+ #     global FEED_DOMAIN, FEED_ATOM, FEED_RSS
+ #     global DELETE_OUTPUT_DIRECTORY
+ #     global RELATIVE_URLS
+ 
+ #     valid_environments = [ 'local', 'testing', 'static', 'production' ]
+ #     if environment not in valid_environments:
+ #         print("customize_environment() must be called with one of: {}".format(', 
'.join(valid_environments)))
+ #         exit(1)
+ 
+ #     if environment == 'testing':
+ #         SITEURL = 'https://testing.gimp.org'
+ #         SITEMAP_SITEURL = 'https://testing.gimp.org'
+ #     elif environment == 'static':
+ #         SITEURL = 'https://static.gimp.org'
+ #         SITEMAP_SITEURL = 'https://static.gimp.org'
+ #     else:
+ #         SITEURL = 'https://www.gimp.org'
+ #         SITEMAP_SITEURL = 'https://www.gimp.org'
+ 
+ #     if environment == 'local':
+ #         #
+ #         # Caching build for faster regeneration
+ #         #
+ #         LOAD_CONTENT_CACHE = True
+ #         CHECK_MODIFIED_METHOD = 'mtime'
+ #         CACHE_CONTENT = True
+ #     else:
+ #         # Feed generation is usually not desired when developing
+ #         FEED_DOMAIN = SITEURL
+ #         FEED_ATOM = 'feeds/atom.xml'
+ #         FEED_RSS = 'feeds/rss.xml'
+ 
+ #         DELETE_OUTPUT_DIRECTORY = True
+ 
+ #     # When developing, you probably want document relative URLs - so set this to True
+ #     # When publishing, set to False
+ #     RELATIVE_URLS = True if environment == 'local' else False
  
 +#def customize_environment(environment):
 +#    global SITEURL, SITEMAP_SITEURL
 +#    global LOAD_CONTENT_CACHE, CHECK_MODIFIED_METHOD, CACHE_CONTENT
 +#    global FEED_DOMAIN, FEED_ATOM, FEED_RSS
 +#    global DELETE_OUTPUT_DIRECTORY
 +#    global RELATIVE_URLS
 +#
 +#    valid_environments = [ 'local', 'testing', 'production' ]
 +#    if environment not in valid_environments:
 +#        print("customize_environment() must be called with one of: {}".format(', 
'.join(valid_environments)))
 +#        exit(1)
 +#
 +#    if environment == 'testing':
 +#        SITEURL = 'https://testing.gimp.org'
 +#        SITEMAP_SITEURL = 'https://testing.gimp.org'
 +#    else:
 +#        SITEURL = 'https://www.gimp.org'
 +#        SITEMAP_SITEURL = 'https://www.gimp.org'
 +#
 +#    if environment == 'local':
 +#        #
 +#        # Caching build for faster regeneration
 +#        #
 +#        LOAD_CONTENT_CACHE = True
 +#        CHECK_MODIFIED_METHOD = 'mtime'
 +#        CACHE_CONTENT = True
 +#    else:
 +#        # Feed generation is usually not desired when developing
 +#        FEED_DOMAIN = SITEURL
 +#        FEED_ATOM = 'feeds/atom.xml'
 +#        FEED_RSS = 'feeds/rss.xml'
 +#
 +#        DELETE_OUTPUT_DIRECTORY = True
 +#
 +#    # When developing, you probably want document relative URLs - so set this to True
 +#    # When publishing, set to False
 +#    RELATIVE_URLS = True if environment == 'local' else False
  
  #######################################
  ## Values common to all environments ##