Merge branch 'release/1.3.9'

getnikola · Mar 3, 2016 · 321f041 · 321f041
2 parents b76c3d0 + 29468f3
commit 321f041
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 30 deletions.
diff --git a/.pypt/commitlog b/.pypt/commitlog
@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 # Kw’s Release Tools/Python Project Template
 # Commit and Changelog Parser
-# Copyright © 2013-2015, Chris Warrick.
+# Copyright © 2013-2016, Chris Warrick.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/.pypt/ghrel b/.pypt/ghrel
@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 # Kw’s Release Tools/Python Project Template
 # GitHub Release Creator
-# Copyright © 2013-2015, Chris Warrick.
+# Copyright © 2013-2016, Chris Warrick.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/.pypt/hooks/post-release.hook b/.pypt/hooks/post-release.hook
@@ -0,0 +1,2 @@
+#!/bin/zsh
+. .pypt/config
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.8
+:Version: 1.3.9
+
+1.3.9
+    * Work on non-English sites (fix #45)
 
 1.3.8
     * Clean up requirements (issue #40)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-08-27
-:Version: 1.3.8
+:Date: 2016-03-03
+:Version: 1.3.9
 
 .. index:: contributing
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.8'
+__version__ = '1.3.9'
diff --git a/coil/__main__.py b/coil/__main__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated

diff --git a/coil/data/coil_assets/css/coil.css b/coil/data/coil_assets/css/coil.css
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+ * Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
  * See /LICENSE for licensing information.
  */
 

diff --git a/coil/data/coil_assets/js/coil.js b/coil/data/coil_assets/js/coil.js
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+ * Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
  * See /LICENSE for licensing information.
  */
 

diff --git a/coil/forms.py b/coil/forms.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated

diff --git a/coil/init.py b/coil/init.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated

diff --git a/coil/tasks.py b/coil/tasks.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated

diff --git a/coil/utils.py b/coil/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated

diff --git a/coil/web.py b/coil/web.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Coil CMS v1.2.0
-# Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+# Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 # Permission is hereby granted, free of charge, to any
 # person obtaining a copy of this software and associated
@@ -140,19 +140,19 @@ def configure_site():
 
     app.config['NIKOLA_URL'] = _site.config['SITE_URL']
     _site.config['NAVIGATION_LINKS'] = {
-        'en': (
+        _site.default_lang: (
             (app.config['NIKOLA_URL'],
              '<i class="fa fa-globe"></i> View Site'),
             ('https://coil.readthedocs.org/en/latest/user/',
              '<i class="fa fa-question-circle"></i> Help'),
         )
     }
     _site.GLOBAL_CONTEXT['navigation_links'] = _site.config['NAVIGATION_LINKS']
-    TITLE = _site.GLOBAL_CONTEXT['blog_title']('en') + ' Administration'
+    TITLE = _site.GLOBAL_CONTEXT['blog_title']() + ' Administration'
     _site.config['BLOG_TITLE'] = TranslatableSetting(
         'BLOG_TITLE', TITLE, _site.config['TRANSLATIONS'])
     _site.GLOBAL_CONTEXT['blog_title'] = _site.config['BLOG_TITLE']
-    _site.GLOBAL_CONTEXT['lang'] = 'en'
+    _site.GLOBAL_CONTEXT['lang'] = _site.default_lang
     _site.GLOBAL_CONTEXT['extra_head_data'] = TranslatableSetting(
         'EXTRA_HEAD_DATA',
         """<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/"""
@@ -310,7 +310,7 @@ def _author_get(post):
     :return: Author real name
     :rtype: str
     """
-    a = post.meta['en']['author']
+    a = post.meta('author')
     return a if a else current_user.realname
 
 
@@ -321,7 +321,7 @@ def _author_uid_get(post):
     :return: Author UID
     :rtype: str
     """
-    u = post.meta['en']['author.uid']
+    u = post.meta('author.uid')
     return u if u else str(current_user.uid)
 
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.8
+:Version: 1.3.9
+
+1.3.9
+    * Work on non-English sites (fix #45)
 
 1.3.8
     * Clean up requirements (issue #40)

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <chris@chriswarrick.com>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-08-27
-:Version: 1.3.8
+:Date: 2016-03-03
+:Version: 1.3.9
 
 .. index:: contributing
 

diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst
@@ -2,7 +2,7 @@
 Appendix B. License
 ===================
 
-Copyright © 2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
+Copyright © 2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al.
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,16 +48,16 @@
 
 # General information about the project.
 project = 'Coil CMS'
-copyright = '2014-2015 Chris Warrick, Roberto Alsina, Henry Hirsch et al'
+copyright = '2014-2016 Chris Warrick, Roberto Alsina, Henry Hirsch et al'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.8'
+version = '1.3.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.8'
+release = '1.3.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/release b/release
@@ -1,7 +1,7 @@
 #!/bin/zsh
 # The Release Script
 # Part of the Python Project Template.
-# Copyright © 2013-2015, Chris Warrick.
+# Copyright © 2013-2016, Chris Warrick.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -206,3 +206,4 @@ git push --tags
 cleanup_cmfn
 
 status "Done!"
+. .pypt/hooks/post-release.hook
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='coil',
-      version='1.3.8',
+      version='1.3.9',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',