Unity

Merge lp:~brandontschaefer/unity/xgettest-unity-FTBFS-fix into lp:unity

  1. xgettest-unity-FTBFS-fix
  2. Merge into trunk
Proposed by Brandon Schaefer
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3228
Proposed branch: lp:~brandontschaefer/unity/xgettest-unity-FTBFS-fix
Merge into: lp:unity
Diff against target: 11 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~brandontschaefer/unity/xgettest-unity-FTBFS-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone (community) Approve
Review via email: mp+153966@code.launchpad.net

Commit message

Set xgettext to encode its input using UTF-8.

Description of the change

Tell xgettext to use UTF-8. (by default it assumes all text is ASCII).

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-03-07 16:48:26 +0000
3+++ CMakeLists.txt 2013-03-19 00:35:25 +0000
4@@ -153,7 +153,7 @@
5 set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
6
7 add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/unity.pot
8- COMMAND xgettext -c --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="ayatana-dev@lists.launchpad.net" --no-wrap --no-location
9+ COMMAND xgettext -c --from-code=UTF-8 --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="ayatana-dev@lists.launchpad.net" --no-wrap --no-location
10 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
11 )
12