Switchboard

Merge lp:~pantheon-debian/switchboard/update-cmake-modules into lp:~elementary-pantheon/switchboard/switchboard

  1. update-cmake-modules
  2. Merge into switchboard
Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Cody Garver
Approved revision: 469
Merged at revision: 469
Proposed branch: lp:~pantheon-debian/switchboard/update-cmake-modules
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 36 lines (+12/-2)
1 file modified
cmake/Translations.cmake (+12/-2)
To merge this branch: bzr merge lp:~pantheon-debian/switchboard/update-cmake-modules
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+229208@code.launchpad.net

Commit message

Update CMake modules to revision 15 of lp:~elementary-apps/+junk/cmake-modules

Description of the change

Update CMake modules to revision 15 of lp:~elementary-apps/+junk/cmake-modules

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

No fallout detected

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/Translations.cmake'
2--- cmake/Translations.cmake 2014-04-14 20:39:34 +0000
3+++ cmake/Translations.cmake 2014-08-01 12:34:22 +0000
4@@ -3,6 +3,17 @@
5 macro(add_translations_directory NLS_PACKAGE)
6 add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
7 find_program (MSGFMT_EXECUTABLE msgfmt)
8+ # be sure that all languages are present
9+ set (LANGUAGES_NEEDED af am ar ast az be bg bn bs ca ckb cs da de el en_AU en_CA en_GB eo es et eu fa fi fr fr_CA gl he hi hr hu hy id it ja ka ko ky lb lo lt lv ml mr ms nb nl nn pl pt pt_BR ro ru rue si sk sl sma sq sr sv sw ta te th tr uk vi zh_CN zh_HK zh_TW)
10+ foreach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
11+ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po)
12+ file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "msgid \"\"\n")
13+ file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "msgstr \"\"\n")
14+ file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "\"MIME-Version: 1.0\\n\"\n")
15+ file (APPEND ${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE_NEEDED}.po "\"Content-Type: text/plain; charset=UTF-8\\n\"\n")
16+ endif ()
17+ endforeach (LANGUAGE_NEEDED ${LANGUAGES_NEEDED})
18+ # generate .mo from .po
19 file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
20 foreach (PO_INPUT ${PO_FILES})
21 get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
22@@ -15,7 +26,6 @@
23 endforeach (PO_INPUT ${PO_FILES})
24 endmacro(add_translations_directory)
25
26-
27 macro(add_translations_catalog NLS_PACKAGE)
28 add_custom_target (pot COMMENT “Building translation catalog.”)
29 find_program (XGETTEXT_EXECUTABLE xgettext)
30@@ -63,4 +73,4 @@
31 IF(NOT "${GLADE_SOURCE}" STREQUAL "")
32 add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
33 ENDIF()
34-endmacro()
35+endmacro()
36\ No newline at end of file

Subscribers

People subscribed via source and target branches