Comment 7 for bug 1606837

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to horizon (master)

Reviewed: https://review.openstack.org/349758
Committed: https://git.openstack.org/cgit/openstack/horizon/commit/?id=5e00cc5e92f86264e428443e7776716c657d247a
Submitter: Jenkins
Branch: master

commit 5e00cc5e92f86264e428443e7776716c657d247a
Author: Kenji Ishii <email address hidden>
Date: Tue Aug 2 11:26:14 2016 +0900

    Revert "i18n: trim whitespaces in extracted messages"

    This reverts commit f87b58fcabf84c9b73b07b587416cc0b6cc814b1.
    In https://bugs.launchpad.net/horizon/+bug/1592965,
    extracted messages are stored with trimming.
    After this change, strings with multi lines cannot be translated.

    This change cause the difference between the real strings in html
    and a key in pot, from the view point of extra spaces and break lines.
    Message extraction is done by babel (with horizon specific extractor),
    but translation message lookup is done by angular-gettext.
    As a result, a key used in translation lookup becomes different from
    a key generated by the message extraction.
    Keys in both steps should be same.
    So this patch reverts the corresponding commit to make translation
    work, even though it may be annoying for translators again.

    Regarding the comment from i18n perspective, see Akihiro's comment
    in patch set 3 in https://review.openstack.org/#/c/347725

    Closes-Bug: #1606837
    Change-Id: I651a2f39fdc0209f702cb9cf45691c944382b897