Author: timopollmeier
Date: 2016-10-18 17:49:33 +0200 (Tue, 18 Oct 2016)
New Revision: 26425
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/po/CMakeLists.txt
trunk/gsa/tools/js2pot
Log:
* src/po/CMakeLists.txt: Adjust gsad_js.pot target to new js2pot
parameters.
* tools/js2pot: Split the input directory param into two params, a base
directory and subdirectory. Change to base directory to make paths in
the .pot file relative to the source directory.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-10-18 10:43:08 UTC (rev 26424)
+++ trunk/gsa/ChangeLog 2016-10-18 15:49:33 UTC (rev 26425)
@@ -1,5 +1,14 @@
2016-10-18 Timo Pollmeier <timo.pollme...@greenbone.net>
+ * src/po/CMakeLists.txt: Adjust gsad_js.pot target to new js2pot
+ parameters.
+
+ * tools/js2pot: Split the input directory param into two params, a base
+ directory and subdirectory. Change to base directory to make paths in
+ the .pot file relative to the source directory.
+
+2016-10-18 Timo Pollmeier <timo.pollme...@greenbone.net>
+
* src/po/gsad_js-de.po, src/po/gsad_xsl-de.po: Update to latest version
from translate.greenbone.net.
Modified: trunk/gsa/src/po/CMakeLists.txt
===================================================================
--- trunk/gsa/src/po/CMakeLists.txt 2016-10-18 10:43:08 UTC (rev 26424)
+++ trunk/gsa/src/po/CMakeLists.txt 2016-10-18 15:49:33 UTC (rev 26425)
@@ -119,7 +119,8 @@
add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gsad_js.pot
COMMAND "${CMAKE_SOURCE_DIR}/tools/js2pot"
- ARGS "${CMAKE_SOURCE_DIR}/src/html/classic/js"
+ ARGS "${CMAKE_SOURCE_DIR}"
+ "src/html/classic/js"
"${CMAKE_CURRENT_BINARY_DIR}/gsad_js.pot"
DEPENDS ${CMAKE_SOURCE_DIR}/src/html/classic/js/*.js
COMMENT "Creating translation template (.pot) file
from JS")
Modified: trunk/gsa/tools/js2pot
===================================================================
--- trunk/gsa/tools/js2pot 2016-10-18 10:43:08 UTC (rev 26424)
+++ trunk/gsa/tools/js2pot 2016-10-18 15:49:33 UTC (rev 26425)
@@ -24,8 +24,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-SOURCE_DIR=$1
-POT_FILE=$2
+SOURCE_BASEDIR=$1
+SOURCE_SUBDIR=$2
+POT_FILE=$3
if [ -z "$SOURCE_DIR" ]; then
SOURCE_DIR=`dirname $0`/../src/html/classic/js
@@ -38,4 +39,5 @@
mkdir -p `dirname $POT_FILE`
-xgettext --from-code=UTF-8 -o $POT_FILE -L JavaScript $SOURCE_DIR/*.js
+cd "$SOURCE_BASEDIR"
+xgettext --from-code=UTF-8 -o $POT_FILE -L JavaScript ./$SOURCE_SUBDIR/*.js
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
