[ckan-changes] [ckan/ckan] a60f02: Fix random order of translation files

Tue Jan 3 12:21:53 UTC 2017

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: a60f026588378b2b563d2cc6144aeccb76026d2d
      https://github.com/ckan/ckan/commit/a60f026588378b2b563d2cc6144aeccb76026d2d
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po

  Log Message:
  -----------
  Fix random order of translation files

During the generation of the JS translation files the order of the input
files previously was random by accident, as it implicitly depended on
the order of a normal Python dict. This randomly broke the ability of
extensions to override JS translations from CKAN core.

This commit fixes that issue by using an OrderedDict to ensure that
translation files provided by extensions are loaded after those of CKAN
core.

  Commit: 286a4acff4c6dc997faeeb23fdd7f0709f7b73d1
      https://github.com/ckan/ckan/commit/286a4acff4c6dc997faeeb23fdd7f0709f7b73d1
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-01-03 (Tue, 03 Jan 2017)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po

  Log Message:
  -----------
  Merge pull request #3376 from torfsen/fix-random-translation-files-order

Fix random order of translation files

Compare: https://github.com/ckan/ckan/compare/2c5477c4075d...286a4acff4c6