[ckan-changes] [ckan/ckan] 47c05f: [#2736] Fix bad merge in check_po_files.py

[GitHub]

  Branch: refs/heads/1651-ubuntu-14.04
  Home:   https://github.com/ckan/ckan
  Commit: 47c05fdd035a86c3967b5e543c2070b56bfee230
      https://github.com/ckan/ckan/commit/47c05fdd035a86c3967b5e543c2070b56bfee230
  Author: amercader <amercadero at gmail.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  [#2736] Fix bad merge in check_po_files.py

`entity` is no longer used after #2613. Also removes the encoding bit as
it doesn't display the characters properly.

And it fixes a PEP8 breakage on master.


  Commit: e8c31ccfb750226ff1b1e26b5218be9b44d05e2d
      https://github.com/ckan/ckan/commit/e8c31ccfb750226ff1b1e26b5218be9b44d05e2d
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge pull request #2737 from ckan/2736-bad-merge-check-po-files

[#2736] Fix bad merge in check_po_files.py (Fixes master failures)


  Commit: 8a19b6680386c590b684b59b62ca276974a9d8f0
      https://github.com/ckan/ckan/commit/8a19b6680386c590b684b59b62ca276974a9d8f0
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Merge branch 'master' into 1651-ubuntu-14.04


Compare: https://github.com/ckan/ckan/compare/13d2e889e41f...8a19b6680386