[ckan-changes] [ckan/ckan] 6e4c91: [#1409] Fix the e-mail bodies' translation strings

GitHub noreply at github.com
Fri Jan 31 11:10:48 UTC 2014


  Branch: refs/heads/1471-delete-unowned-datasets
  Home:   https://github.com/ckan/ckan
  Commit: 6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
      https://github.com/ckan/ckan/commit/6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Fix the e-mail bodies' translation strings

We ended up creating a string with extra whitespace before the paragraphs,
like "...to be reset\n\n Please click the following...".

But the i18n message key doesn't have these whitespaces, so we always send
that in English. To solve it, we could either fix the message key in all .po
files, or change how we construct the string in mailer.py. I prefer the
latter.


  Commit: b90d2810eeb6acfea39aeaec2215bb12afb7f74a
      https://github.com/ckan/ckan/commit/b90d2810eeb6acfea39aeaec2215bb12afb7f74a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Remove pdb breakpoint


  Commit: 56d2857e6bd04ee4a63bf96bac6a5cf278143e25
      https://github.com/ckan/ckan/commit/56d2857e6bd04ee4a63bf96bac6a5cf278143e25
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Change string formatting to use "{foo}".format(foo="bar")


  Commit: a8417e970498e02be56f9b54acaa5d3615960c65
      https://github.com/ckan/ckan/commit/a8417e970498e02be56f9b54acaa5d3615960c65
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1473] allow empty string in owner org when there is no previous package or owner org


  Commit: 2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
      https://github.com/ckan/ckan/commit/2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Merge branch '1473-create-unowned-dataset-when-org-member'


  Commit: 866b0b620e24ba36f3a4316d33fd93f60b25ccac
      https://github.com/ckan/ckan/commit/866b0b620e24ba36f3a4316d33fd93f60b25ccac
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1409-reset-password-email-i18n-bug'


  Commit: b7cd0c5db240d428585f696b0780af77dd1d14a1
      https://github.com/ckan/ckan/commit/b7cd0c5db240d428585f696b0780af77dd1d14a1
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  Merge branch 'master' into 1471-delete-unowned-datasets


Compare: https://github.com/ckan/ckan/compare/af52ce4740d8...b7cd0c5db240


More information about the ckan-changes mailing list