[ckan-changes] [ckan/ckan] c7677b: [#3196] Add Flask-babel requirement, hook into Fla...

[GitHub]

  Branch: refs/heads/3229-api-blueprint
  Home:   https://github.com/ckan/ckan
  Commit: c7677b94fdc018db77e3ae1832b7ee2aeebae77f
      https://github.com/ckan/ckan/commit/c7677b94fdc018db77e3ae1832b7ee2aeebae77f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-24 (Wed, 24 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3196] Add Flask-babel requirement, hook into Flask middleware


  Commit: b1e5681f28ce3f74700998a72befc99b84c044a2
      https://github.com/ckan/ckan/commit/b1e5681f28ce3f74700998a72befc99b84c044a2
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-24 (Wed, 24 Aug 2016)

  Changed paths:
    M ckan/common.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#3196] Common translation functions for Flask and Pylons

Wrappers in ckan.common for `_` and `ungettext`. Flask-babel provides
the `gettext` and `ngettext` functions but they really use the unicode
versions internally so they are consitent with the current behaviour. We
ketp the `u...` names.


  Commit: d6aad5d1b6f7a231ced4a6996010b0d6b6948181
      https://github.com/ckan/ckan/commit/d6aad5d1b6f7a231ced4a6996010b0d6b6948181
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-24 (Wed, 24 Aug 2016)

  Changed paths:
    M ckan/lib/base.py
    M ckan/logic/action/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M doc/contributing/string-i18n.rst

  Log Message:
  -----------
  [#3196] Consolidate i18n imports, update docs


  Commit: 2ef2c572039804f4cb36da3cfc8e9c4f4d6352d4
      https://github.com/ckan/ckan/commit/2ef2c572039804f4cb36da3cfc8e9c4f4d6352d4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-02 (Fri, 02 Sep 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/lib/base.py
    M ckan/logic/action/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/plugins/toolkit.py
    M doc/contributing/string-i18n.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch '3196-i18n' into 3229-api-blueprint

Conflicts:
	ckan/common.py


Compare: https://github.com/ckan/ckan/compare/621763fba1e5...2ef2c5720398