[ckan-changes] [okfn/ckan] df9d35: [#2375] Add new macros to documentation

[GitHub]

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: df9d354c387f8d8d90fb2ff3e5b0616fcb7b81aa
      https://github.com/okfn/ckan/commit/df9d354c387f8d8d90fb2ff3e5b0616fcb7b81aa
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#2375] Add new macros to documentation


  Commit: 1624f8ed6ce37924a0debcea0a162e9c4d4616ef
      https://github.com/okfn/ckan/commit/1624f8ed6ce37924a0debcea0a162e9c4d4616ef
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js

  Log Message:
  -----------
  [#2803] Update JavaScript strings to use keyword placeholders

So for example _('hello %s', 'jim') becomes _('hello %(name)s', {name:
'jim'}). Which is much clearer for those creating the translations.


  Commit: 074a31f683d3ad8f56d49acccc3f8c137c8fae1b
      https://github.com/okfn/ckan/commit/074a31f683d3ad8f56d49acccc3f8c137c8fae1b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  [#2803] Fix a couple of errors in the test suite


  Commit: f443d9603a4dd70b19f53e5f1571da9a2dbe832a
      https://github.com/okfn/ckan/commit/f443d9603a4dd70b19f53e5f1571da9a2dbe832a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  [#2803] Update the front end docs with locale updates


  Commit: 70d4037a0e4549f5f6a46ff773eb44efe4d64adf
      https://github.com/okfn/ckan/commit/70d4037a0e4549f5f6a46ff773eb44efe4d64adf
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#2375] Add new macros to documentation


  Commit: 3b2427efc820191e7d294239b28acc37bd7d52e5
      https://github.com/okfn/ckan/commit/3b2427efc820191e7d294239b28acc37bd7d52e5
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M doc/frontend-development.rst

  Log Message:
  -----------
  [#2375] Merge translations branch into development


Compare: https://github.com/okfn/ckan/compare/365fb11bc0c2...3b2427efc820