[zypp-commit] r10380 - in /trunk/dialogsolver: ./ cmake/modules/ package/ po/ src/

Author: schubi2 Date: Mon Jun 16 17:48:01 2008 New Revision: 10380 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10380&view=rev Log: added translations Added: trunk/dialogsolver/cmake/modules/FindGettext.cmake trunk/dialogsolver/po/ trunk/dialogsolver/po/CMakeLists.txt trunk/dialogsolver/po/createPot (with props) trunk/dialogsolver/src/getText.cc trunk/dialogsolver/src/getText.h Modified: trunk/dialogsolver/CMakeLists.txt trunk/dialogsolver/VERSION.cmake trunk/dialogsolver/package/libqdialogsolver1.spec.in trunk/dialogsolver/src/CMakeLists.txt Modified: trunk/dialogsolver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/CMakeLists.txt?rev=10380&r1=10379&r2=10380&view=diff ============================================================================== --- trunk/dialogsolver/CMakeLists.txt (original) +++ trunk/dialogsolver/CMakeLists.txt Mon Jun 16 17:48:01 2008 @@ -4,6 +4,7 @@ PROJECT(libqdialogsolver1) SET( PACKAGE libqdialogsolver1) SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} ) +SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wno-deprecated" ) SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) @@ -13,8 +14,17 @@ FIND_PACKAGE(Qt4 REQUIRED) FIND_PACKAGE(Zypp REQUIRED) +FIND_PACKAGE(Gettext REQUIRED) +IF (GETTEXT_FOUND) + MESSAGE(STATUS "Found Gettext: ${GETTEXT_SOURCE}") + INCLUDE_DIRECTORIES(${GETTEXT_INCLUDE_DIR}) +ELSE (GETTEXT_FOUND) + MESSAGE( FATAL_ERROR "Gettext not found" ) +ENDIF (GETTEXT_FOUND) + ADD_SUBDIRECTORY(src) +#ADD_SUBDIRECTORY(po) INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) Modified: trunk/dialogsolver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/VERSION.cmake?rev=10380&r1=10379&r2=10380&view=diff ============================================================================== --- trunk/dialogsolver/VERSION.cmake (original) +++ trunk/dialogsolver/VERSION.cmake Mon Jun 16 17:48:01 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "1") +SET(VERSION_MINOR "2") SET(VERSION_PATCH "0") Added: trunk/dialogsolver/cmake/modules/FindGettext.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/cmake/modules/FindGettext.cmake?rev=10380&view=auto ============================================================================== --- trunk/dialogsolver/cmake/modules/FindGettext.cmake (added) +++ trunk/dialogsolver/cmake/modules/FindGettext.cmake Mon Jun 16 17:48:01 2008 @@ -0,0 +1,63 @@ +# - Find GNU gettext tools +# This module looks for the GNU gettext tools. This module defines the +# following values: +# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. +# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. +# GETTEXT_FOUND: True if gettext has been found. +# +# Additionally it provides the following macros: +# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN ) +# This will create a target "translations" which will convert the +# given input po files into the binary output mo file. If the +# ALL option is used, the translations will also be created when +# building the default target. + +FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) + +FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) + +MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) + + SET(_gmoFiles) + GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE) + GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) + +#MESSAGE( STATUS "pot: ${_potFile} converted to ${_potBasename}") + + SET(_addToAll) + IF(${_firstPoFile} STREQUAL "ALL") + SET(_addToAll "ALL") + SET(_firstPoFile) + ENDIF(${_firstPoFile} STREQUAL "ALL") + + FOREACH (_currentPoFile ${ARGN}) + GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE) + GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) + GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE) + SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) + + ADD_CUSTOM_COMMAND( + OUTPUT ${_gmoFile} +#COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} +#DEPENDS ${_absPotFile} ${_absFile} + DEPENDS ${_absFile} + ) + + INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) + SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) + + ENDFOREACH (_currentPoFile ) + + ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) + +ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) + +IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND TRUE) +ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND FALSE) + IF (GetText_REQUIRED) + MESSAGE(FATAL_ERROR "GetText not found") + ENDIF (GetText_REQUIRED) +ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) \ No newline at end of file Modified: trunk/dialogsolver/package/libqdialogsolver1.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/package/libqdialogsolver1.spec.in?rev=10380&r1=10379&r2=10380&view=diff ============================================================================== --- trunk/dialogsolver/package/libqdialogsolver1.spec.in (original) +++ trunk/dialogsolver/package/libqdialogsolver1.spec.in Mon Jun 16 17:48:01 2008 @@ -19,7 +19,7 @@ Requires: libzypp >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' libzypp`) graphviz Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ libqt4-devel +BuildRequires: gcc-c++ libqt4-devel gettext-devel # API Changes in zypp 2.1 @@ -59,6 +59,7 @@ -DCMAKE_SKIP_RPATH=1 \ .. make %{?jobs:-j %jobs} VERBOSE=1 +make -C po %{?jobs:-j %jobs} translations %install cd build Added: trunk/dialogsolver/po/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/po/CMakeLists.txt?rev=10380&view=auto ============================================================================== --- trunk/dialogsolver/po/CMakeLists.txt (added) +++ trunk/dialogsolver/po/CMakeLists.txt Mon Jun 16 17:48:01 2008 @@ -0,0 +1,2 @@ +FILE( GLOB DIALOGSOLVER_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po ) +GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/opensuseupdater.pot" ALL ${DIALOGSOLVER_PO_FILES} ) Added: trunk/dialogsolver/po/createPot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/po/createPot?rev=10380&view=auto ============================================================================== --- trunk/dialogsolver/po/createPot (added) +++ trunk/dialogsolver/po/createPot Mon Jun 16 17:48:01 2008 @@ -0,0 +1,48 @@ +#!/bin/bash + +### You need a patched xgettext that is able to create kde-like pot files +### See: http://developer.kde.org/documentation/other/makefile_am_howto/de/_translati... +### ftp://ftp.kde.org/pub/kde/devel/gettext-kde/ + +extractrc --tag=cstring ../updater/*.ui ../updater/*.kcfg | grep -v kcfg | grep -v ConfigWidgetUI | grep -v BackendFrame | grep -v l1 | grep -v l2 | grep -v l3 | grep -v l4 > rc.cpp + + +# search for sourcecode-files +SRCFILES=`find .. -type d -name testsuite -prune , \ + -type f -name "*.h" \ + -o -name "*.pm" \ + -o -name "*.c" \ + -o -name "*.cc" \ + -o -name "*.cpp"` + +echo $SRCFILES +#calling xgettext with the sourcefiles +xgettext --add-comments --add-location --keyword=i18n --keyword=i18n:1,2 --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --default-domain=dialogsolver --output=dialogsolver.pot $SRCFILES + + +#( +#cat dialogsolver.pot2 | while read line +#do +# if [ X$line == "Xmsgid \"\"" ]; then +# if [ `echo X$line` == "X " ]; then +# echo -n "msgid " +# fi +#done ) > dialogsolver3.pot +# +# +# +#( +#oldline="" +#cat dialogsolver.pot3 | while read line +#do +# if [ X`echo $line | cut -f1 -d" "` == "Xmsgid_plural" ]; then +# echo $oldline | sed -e "s/^msgid \"/msgid \"_n: /" | sed -e "s/\"$/\\\n\"/" +# oldline=`echo $line | sed -e "s/msgid_plural //"` +# else +# echo $oldline | sed -e "s/msgstr\[0\] \"\"/\"\\\n\"/" | sed -e "s/msgstr\[1\] \"\"/\"\"/" +# oldline=$line +# fi +#done ) > dialogsolver.pot +# +#rm dialogsolver.pot2 +##rm dialogsolver.pot3 Modified: trunk/dialogsolver/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/CMakeLists.txt?rev=10380&r1=10379&r2=10380&view=diff ============================================================================== --- trunk/dialogsolver/src/CMakeLists.txt (original) +++ trunk/dialogsolver/src/CMakeLists.txt Mon Jun 16 17:48:01 2008 @@ -11,6 +11,7 @@ -DQT3_SUPPORT -DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\" -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\" + -DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\" -DTEXTDOMAIN=\\\"dialogsolver\\\" ) SET( libqdialogsolver_SRCS @@ -22,17 +23,11 @@ resgraphview.cpp restreewidget.cpp solvertree.cpp + getText.cc ) SET( libqdialogsolver_HEADERS - drawparams.h - graphtree_defines.h - graphtreelabel.h - pannerview.h QZyppSolverDialog.h - resgraphview.h - restreewidget.h - solvertree.h ) INSTALL( FILES ${libqdialogsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" ) Added: trunk/dialogsolver/src/getText.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/getText.cc?rev=10380&view=auto ============================================================================== --- trunk/dialogsolver/src/getText.cc (added) +++ trunk/dialogsolver/src/getText.cc Mon Jun 16 17:48:01 2008 @@ -0,0 +1,56 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file getText.cc + * +*/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +extern "C" { +#include +} + +#include "getText.h" + + +/////////////////////////////////////////////////////////////////// +namespace dialogsolver +{ ///////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////// +// TEXTDOMAIN and LOCALEDIR must be provided via config.h +// or at compile time using -D. +///////////////////////////////////////////////////////////////// + + inline void assertInit() + { + static bool initialized = false; + if ( ! initialized ) + { + ::bindtextdomain( TEXTDOMAIN, LOCALEDIR ); + ::bind_textdomain_codeset( TEXTDOMAIN, "UTF-8" ); + initialized = true; + } + } + + const char * dgettext( const char * msgid ) + { + assertInit(); + return ::dgettext( TEXTDOMAIN, msgid ); + } + + const char * dngettext( const char * msgid1, const char * msgid2, + unsigned long n ) + { + assertInit(); + return ::dngettext( TEXTDOMAIN, msgid1, msgid2, n ); + } + ///////////////////////////////////////////////////////////////// +} // namespace zypp Added: trunk/dialogsolver/src/getText.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/getText.h?rev=10380&view=auto ============================================================================== --- trunk/dialogsolver/src/getText.h (added) +++ trunk/dialogsolver/src/getText.h Mon Jun 16 17:48:01 2008 @@ -0,0 +1,43 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file getText.h + * + * Interface to getText. + * +*/ +#ifndef DIALOGSOLVER_GETTEXT_H +#define DIALOGSOLVER_GETTEXT_H + +/** Just tag text for translation. */ +#define N_(MSG) MSG + +/** Return translated text. */ +#define _(MSG) ::dialogsolver::dgettext( MSG ) + +/** Return translated text. */ +#define i18n(MSG) ::dialogsolver::dgettext( MSG ) + +/** Return translated text (plural form). */ +#define _PL(MSG1,MSG2,N) ::dialogsolver::dngettext( MSG1; MSG2, N ) + +/////////////////////////////////////////////////////////////////// +namespace dialogsolver +{ ///////////////////////////////////////////////////////////////// + +/** Return translated text. */ + const char * dgettext( const char * msgid ); + +/** Return translated text (plural form). */ + const char * dngettext( const char * msgid1, const char * msgid2, + unsigned long n ); + + ///////////////////////////////////////////////////////////////// +} // namespace dialogsolver + +#endif // DIALOGSOLVER_GETTEXT_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org