[ckan-changes] [okfn/ckan] 55c8ff: [#1359, licenses][s]: refactor to remove dependency...

Mon Feb 13 13:43:45 UTC 2012

  Branch: refs/heads/feature-1653-i18n_url_rewriting
  Home:   https://github.com/okfn/ckan
  Commit: 55c8ff6f108a1b9706b01ea68d875042639bfa9e
      https://github.com/okfn/ckan/commit/55c8ff6f108a1b9706b01ea68d875042639bfa9e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,licenses][s]: refactor to remove dependency on external licenses package.

* Inline list of default licenses (those from http://licenses.opendefinition.org/licenses/groups/ckan.json)
* Minor refactoring on initialization of LicenseRegister to support dicts or lists or licenses
* Fix up tests (now that we do not have gpl in our default lists of licenses)


  Commit: 19fc61ac56826407965438bdc5d973e20dc00dc0
      https://github.com/okfn/ckan/commit/19fc61ac56826407965438bdc5d973e20dc00dc0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/tests/forms/test_package.py

  Log Message:
  -----------
  [#1359,tests][xs]: fix up one test missed in previous commit (gpl -> odc-by for demo license).


  Commit: 8b89ced1da1e4a3126cc052dd339c74a090dd194
      https://github.com/okfn/ckan/commit/8b89ced1da1e4a3126cc052dd339c74a090dd194
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M doc/configuration.rst

  Log Message:
  -----------
  [#1359,doc][xs]: minor updates to docs re license_group_url to reflect new setup.


  Commit: a8b0e3b0cd453c2440e7dff5d82feab62e22057c
      https://github.com/okfn/ckan/commit/a8b0e3b0cd453c2440e7dff5d82feab62e22057c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  [#1359,licenses][xs]: remove unused method get_by_title on LicenseRegister.


  Commit: 2f789700af9ba20ed2970674c6504be8a33401d9
      https://github.com/okfn/ckan/commit/2f789700af9ba20ed2970674c6504be8a33401d9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/configuration.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,merge][s]: Merge branch 'feature-1359-license-choice-simplify' thereby fixes #1359.


  Commit: d0db1be367db0d70c007c974aa81d875e78eeb6e
      https://github.com/okfn/ckan/commit/d0db1be367db0d70c007c974aa81d875e78eeb6e
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  simplify get_available_locales()


  Commit: d40fd5eb3937cb3fa683da8ca525ec689a430881
      https://github.com/okfn/ckan/commit/d40fd5eb3937cb3fa683da8ca525ec689a430881
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  add some comments to _get_locals()


  Commit: 4f258ebea5ff145d4975a6e0cc88beb93b61caca
      https://github.com/okfn/ckan/commit/4f258ebea5ff145d4975a6e0cc88beb93b61caca
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  make config.locale_order optional for lib.i18n


  Commit: 394aa57245f1531a973838ce23d9e65c91c27fed
      https://github.com/okfn/ckan/commit/394aa57245f1531a973838ce23d9e65c91c27fed
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/helpers.py

  Log Message:
  -----------
  use available locals not config directly


  Commit: abf1acf0b8e8c7c19e01a1ac9d166a54a833323a
      https://github.com/okfn/ckan/commit/abf1acf0b8e8c7c19e01a1ac9d166a54a833323a
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/tests/lib/test_i18n.py

  Log Message:
  -----------
  remove redundant tests


  Commit: e6d0490aafda54822a6f842d4afd202da6ee39e8
      https://github.com/okfn/ckan/commit/e6d0490aafda54822a6f842d4afd202da6ee39e8
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  remove unused import


  Commit: d1e521a04cce913c57310939dd1e2f225862eec9
      https://github.com/okfn/ckan/commit/d1e521a04cce913c57310939dd1e2f225862eec9
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  cleaner language choosing (remove return_to hack)


  Commit: 43400a9ecc394f74fd320e28536d4156a8187df9
      https://github.com/okfn/ckan/commit/43400a9ecc394f74fd320e28536d4156a8187df9
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  make sure all languages are added when config.locale_order supplied


  Commit: 0ed902d35c9c6a9158cf337655a12af58774994e
      https://github.com/okfn/ckan/commit/0ed902d35c9c6a9158cf337655a12af58774994e
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/lib/search/__init__.py
  M ckan/model/license.py
  M ckan/public/css/style.css
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1653-i18n_url_rewriting


Compare: https://github.com/okfn/ckan/compare/d4b23c0...0ed902d