Git commit 14e488bca545e8461534f01bce9da12865649576 by Thomas Eschenbacher. Committed on 28/01/2015 at 05:33. Pushed by eschenbacher into branch 'master'.
added Messages.sh for Skripty removed translations from kwave/kwave.desktop.in renamed doc/help_en.docbook -> doc/index.docbook disabled cmake rules for "doc", "messages" etc. and removed standalone localization support - now rely on Skripty to do that job M +14 -12 CMakeLists.txt A +46 -0 Messages.sh M +36 -29 doc/CMakeLists.txt R +0 -0 doc/index.docbook [from: doc/help_en.docbook - 100% similarity] M +3 -15 kwave/kwave.desktop.in M +11 -10 po/CMakeLists.txt http://commits.kde.org/kwave/14e488bca545e8461534f01bce9da12865649576 diff --git a/CMakeLists.txt b/CMakeLists.txt index cbcec5f..d28adf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,14 +20,15 @@ PROJECT(kwave) -SET(KWAVE_LINGUAS - cs:?e?tina - de:Deutsch - en:English - es:Espa?ol - fr:Francais - # <- add new languages here... -) +# TODO add auto detect for standalone build +# SET(KWAVE_LINGUAS +# cs:?e?tina +# de:Deutsch +# en:English +# es:Espa?ol +# fr:Francais +# # <- add new languages here... +# ) ############################################################################# ### build options: ### @@ -137,7 +138,7 @@ INCLUDE(CheckCCompilerFlag) INCLUDE(CheckCXXCompilerFlag) INCLUDE(CheckTypeSize) INCLUDE(CheckFunctionExists) -INCLUDE(KwaveL10N) +# INCLUDE(KwaveL10N) <= TODO find a replacement for standalone build ############################################################################# @@ -293,9 +294,9 @@ ADD_SUBDIRECTORY( libgui ) ADD_SUBDIRECTORY( libkwave ) ADD_SUBDIRECTORY( kwave ) ADD_SUBDIRECTORY( plugins ) -ADD_SUBDIRECTORY( po ) +# ADD_SUBDIRECTORY( po ) TODO find a replacement for standalone build -SET(KWAVE_BUILD_LINGUAS ${KWAVE_BUILD_LINGUAS}) +# SET(KWAVE_BUILD_LINGUAS ${KWAVE_BUILD_LINGUAS}) OPTION(WITH_DOC "build online documentation [default=on]" ON) IF (WITH_DOC) ADD_SUBDIRECTORY( doc ) @@ -304,7 +305,8 @@ ENDIF (WITH_DOC) ############################################################################# ### target package-messages ### -INCLUDE(KwavePackageMessages) +# TODO find a replacement for standalone build +# INCLUDE(KwavePackageMessages) ############################################################################# ### RPM support ### diff --git a/Messages.sh b/Messages.sh new file mode 100755 index 0000000..933f445 --- /dev/null +++ b/Messages.sh @@ -0,0 +1,46 @@ +#!/bin/sh +############################################################################ +# Messages.sh - script to extract translatable messages +# ------------------- +# begin : Mon Jan 26 2015 +# copyright : (C) 2015 by Thomas Eschenbacher +# email : Thomas.Eschenbacher at gmx.de +############################################################################ +# +############################################################################ +# # +# This program is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +############################################################################ + +# collect all messages from the .ui files +$EXTRACTRC `find . -name \*.ui | sort` > _kwave-i18n-ui.cpp + +# get the strings from the .desktop file +intltool-extract --quiet --type=gettext/ini kwave/kwave.desktop.in + +# fetch all messages from the C++ source and header files +$XGETTEXT --from-code=UTF-8 -C --kde \ + -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \ + -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 \ + -kki18np:1,2 -kki18ncp:1c,2,3 -kN_:1 \ + `find . -name \*.cpp -o -name \*.h | sort` \ + -o _kwave-i18n-src.pot + +# create a pot file from menus.config +perl bin/menusconfig2pot.pl kwave/menus.config _kwave-i18n-menu.pot + +# put all parts together +cat _kwave-i18n-src.pot > _kwave-i18n-all.pot +cat _kwave-i18n-menu.pot >> _kwave-i18n-all.pot + +# copy the result to the output directory +cp _kwave-i18n-all.pot $podir/kwave.pot + +# clean up +rm -f _kwave-i18n* kwave/kwave.desktop.in.h + +### EOF ### diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index a3a98c6..fdb4888 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -17,11 +17,11 @@ FIND_PACKAGE(RequiredProgram REQUIRED) -SET(_help_en_docbook ${CMAKE_CURRENT_SOURCE_DIR}/help_en.docbook) -SET(_help_en_updated ${CMAKE_CURRENT_BINARY_DIR}/help_en-updated.docbook) -SET(_help_en_shifted ${CMAKE_CURRENT_BINARY_DIR}/help_en-shifted.docbook) -SET(_help_en_pot_raw ${CMAKE_CURRENT_BINARY_DIR}/help_en.pot.raw) -SET(_help_en_pot ${CMAKE_CURRENT_BINARY_DIR}/help_en.pot) +SET(_index_docbook ${CMAKE_CURRENT_SOURCE_DIR}/index.docbook) +SET(_index_updated ${CMAKE_CURRENT_BINARY_DIR}/index-updated.docbook) +SET(_index_shifted ${CMAKE_CURRENT_BINARY_DIR}/index-shifted.docbook) +SET(_index_pot_raw ${CMAKE_CURRENT_BINARY_DIR}/index.pot.raw) +SET(_index_pot ${CMAKE_CURRENT_BINARY_DIR}/index.pot) SET(_version ${PROJECT_SOURCE_DIR}/VERSION) FIND_REQUIRED_PROGRAM(CP_EXECUTABLE cp) @@ -119,29 +119,29 @@ ENDIF (NOT RSVG_AVAILABLE) FILE(REMOVE "${CMAKE_BINARY_DIR}/${_png_file}") ############################################################################# -### help_en.pot.raw -> help_en.pot ### +### index.pot.raw -> index.pot ### -ADD_CUSTOM_COMMAND(OUTPUT ${_help_en_pot} - COMMAND ${FILTER_POT} ${_help_en_pot_raw} ${_help_en_pot} - DEPENDS ${FILTER_POT} ${_help_en_pot_raw} +ADD_CUSTOM_COMMAND(OUTPUT ${_index_pot} + COMMAND ${FILTER_POT} ${_index_pot_raw} ${_index_pot} + DEPENDS ${FILTER_POT} ${_index_pot_raw} ) ############################################################################# -### help_en.docbook -> help_en.pot.raw ### +### index.docbook -> index.pot.raw ### -ADD_CUSTOM_COMMAND(OUTPUT ${_help_en_pot_raw} - COMMAND ${XML2POT_EXECUTABLE} ${_help_en_docbook} > ${_help_en_pot_raw} - DEPENDS ${_help_en_docbook} +ADD_CUSTOM_COMMAND(OUTPUT ${_index_pot_raw} + COMMAND ${XML2POT_EXECUTABLE} ${_index_docbook} > ${_index_pot_raw} + DEPENDS ${_index_docbook} ) ############################################################################# -### help_en.docbook -> help_en-shifted.docbook ### +### index.docbook -> index-shifted.docbook ### -ADD_CUSTOM_COMMAND(OUTPUT ${_help_en_shifted} - COMMAND ${CAT_EXECUTABLE} ${_help_en_docbook} | +ADD_CUSTOM_COMMAND(OUTPUT ${_index_shifted} + COMMAND ${CAT_EXECUTABLE} ${_index_docbook} | ${SED_EXECUTABLE} s/^[[:blank:]]*// > - ${_help_en_shifted} - DEPENDS ${_help_en_docbook} + ${_index_shifted} + DEPENDS ${_index_docbook} ) ############################################################################# @@ -192,22 +192,22 @@ MACRO(KWAVE_TRANSLATE_DOC _sources _html_sources) ADD_CUSTOM_COMMAND(OUTPUT ${_po} COMMAND ${MSGMERGE_EXECUTABLE} -C ${_gui_po} - -o ${_po} ${_po_orig} ${_help_en_pot} + -o ${_po} ${_po_orig} ${_index_pot} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_po} ${_po_orig} DEPENDS ${_po_orig} - DEPENDS ${_help_en_pot} + DEPENDS ${_index_pot} DEPENDS ${_gui_po} ) # translated docbook file ADD_CUSTOM_COMMAND(OUTPUT ${_docbook} - COMMAND ${PO2XML_EXECUTABLE} ${_help_en_shifted} ${_po} | + COMMAND ${PO2XML_EXECUTABLE} ${_index_shifted} ${_po} | ${SED_EXECUTABLE} s/^\\<\\!ENTITY\\ %\\ English\\ /\\<\\!ENTITY\\ %\\ ${_lang_name}\\ /g > ${_docbook} COMMAND ${CHECKXML_EXECUTABLE} ${_docbook} DEPENDS ${_po} - DEPENDS ${_help_en_shifted} + DEPENDS ${_index_shifted} COMMENT STATUS "Building ${_docbook_basename} (${_lang_name})" ) @@ -225,7 +225,7 @@ MACRO(KWAVE_TRANSLATE_DOC _sources _html_sources) ENDFOREACH (_image_file) ELSE (NOT "${_lang}" STREQUAL "en") - SET(_docbook ${_help_en_docbook}) + SET(_docbook ${_index_docbook}) GET_FILENAME_COMPONENT(_docbook_basename ${_docbook} NAME) ENDIF (NOT "${_lang}" STREQUAL "en") @@ -329,14 +329,15 @@ ENDMACRO(KWAVE_TRANSLATE_DOC) ############################################################################# -KWAVE_TRANSLATE_DOC(_docs _html_files ${KWAVE_BUILD_LINGUAS}) +# TODO find a replacement for standalone build +# KWAVE_TRANSLATE_DOC(_docs _html_files ${KWAVE_BUILD_LINGUAS}) ############################################################################# ### "make update-handbook" ### ADD_CUSTOM_TARGET(update-handbook - COMMAND ${UPDATE_COMMAND_XREF} ${CMAKE_SOURCE_DIR} ${_help_en_docbook} ${_help_en_updated} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_help_en_updated} ${_help_en_docbook} + COMMAND ${UPDATE_COMMAND_XREF} ${CMAKE_SOURCE_DIR} ${_index_docbook} ${_index_updated} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_index_updated} ${_index_docbook} ) @@ -355,9 +356,15 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ############################################################################# ### "make doc" ### -ADD_CUSTOM_TARGET(doc ALL - DEPENDS ${_docbook_all} ${_index_all} ${_missing_images} ${_toolbar_pngs} -) +# TODO find a replacement for standalone build +# ADD_CUSTOM_TARGET(doc ALL +# DEPENDS ${_docbook_all} ${_index_all} ${_missing_images} ${_toolbar_pngs} +# ) + +############################################################################# +### generate the handbook, KDE environment ### + +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kwave) ############################################################################# ############################################################################# diff --git a/doc/help_en.docbook b/doc/index.docbook similarity index 100% rename from doc/help_en.docbook rename to doc/index.docbook diff --git a/kwave/kwave.desktop.in b/kwave/kwave.desktop.in index 8dd9d2a..8434e6f 100644 --- a/kwave/kwave.desktop.in +++ b/kwave/kwave.desktop.in @@ -1,21 +1,9 @@ [Desktop Entry] Version=1.0 Type=Application -GenericName=Sound Editor -GenericName[cs]=editor zvuku pro prost?ed? -GenericName[de]=Sound-Editor -GenericName[es]=editor de sonido -GenericName[fr]=?diteur de sons -Name=Kwave Sound Editor -Name[cs]=Kwave editor zvuku pro prost?ed? -Name[de]=Kwave Sound-Editor -Name[es]=Kwave editor de sonido para KDE -Name[fr]=Kwave ?diteur de sons -Comment=A sound editor for KDE -Comment[cs]=Editor zvuku pro prost?ed? KDE -Comment[de]=Ein Sound-Editor f?r KDE -Comment[es]=Un editor de sonido para KDE -Comment[fr]=Un ?diteur de sons pour KDE +_GenericName=Sound Editor +_Name=Kwave Sound Editor +_Comment=A sound editor for KDE TryExec=kwave Exec=kwave %F Icon=kwave diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index d602567..020238e 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -18,16 +18,17 @@ ############################################################################# ### build list of .po files ### -FOREACH(_lang ${KWAVE_BUILD_LINGUAS}) - STRING(REGEX MATCH "^[^:]+" _lang_short ${_lang}) - IF (NOT "${_lang_short}" STREQUAL "en") - SET(_po_files ${_po_files} ${_lang_short}.po) - ENDIF (NOT "${_lang_short}" STREQUAL "en") -ENDFOREACH(_lang ${KWAVE_BUILD_LINGUAS}) - -IF (DEFINED _po_files ) - GETTEXT_CREATE_TRANSLATIONS(kwave.pot ALL ${_po_files}) -ENDIF (DEFINED _po_files ) +# TODO find a replacement for standalone build +# FOREACH(_lang ${KWAVE_BUILD_LINGUAS}) +# STRING(REGEX MATCH "^[^:]+" _lang_short ${_lang}) +# IF (NOT "${_lang_short}" STREQUAL "en") +# SET(_po_files ${_po_files} ${_lang_short}.po) +# ENDIF (NOT "${_lang_short}" STREQUAL "en") +# ENDFOREACH(_lang ${KWAVE_BUILD_LINGUAS}) +# +# IF (DEFINED _po_files ) +# GETTEXT_CREATE_TRANSLATIONS(kwave.pot ALL ${_po_files}) +# ENDIF (DEFINED _po_files ) ############################################################################# #############################################################################
