From cafe9d46c7990e4e3ad8fd09d92a93f075bda794 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 28 Sep 2017 23:36:22 +0200 Subject: [PATCH] remove qgscontexthelp_texts.cpp from i18n --- .gitignore | 1 - scripts/update_ts.sh | 2 +- scripts/update_ts_files.sh | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 217ccbd0560..f8d3ce9263c 100644 --- a/.gitignore +++ b/.gitignore @@ -52,7 +52,6 @@ scripts/astyle.exe scripts/Debug scripts/qgisstyle* scripts/RelWithDebInfo -src/core/qgscontexthelp_texts.cpp src/core/qgsexpression_texts.cpp tests/testdata/cache/ tests/testdata/checker360by180.asc.aux.xml diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh index f72fb5852b8..811fb29ba9e 100755 --- a/scripts/update_ts.sh +++ b/scripts/update_ts.sh @@ -78,7 +78,7 @@ files= if [ -d "$2" ]; then builddir=$(realpath $2) textcpp= - for i in $builddir/src/core/qgsexpression_texts.cpp $builddir/src/core/qgscontexthelp_texts.cpp; do + for i in $builddir/src/core/qgsexpression_texts.cpp; do if [ -f $i ]; then textcpp="$textcpp $i" elif [ "$action" != "pull" ]; then diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh index 5bee36f6bf8..a1b91183fa5 100755 --- a/scripts/update_ts_files.sh +++ b/scripts/update_ts_files.sh @@ -22,7 +22,6 @@ # name is reserved for the Windows qmake project file echo "deprecated - use push_ts.sh and pull_ts.sh" >&2 -echo "deprecated - src/core/qgscontexthelp_texts.cpp are no longer used" >&2 set -e @@ -112,7 +111,7 @@ if [ -d "$builddir" ]; then exit 1 fi -if [ ! -f "$builddir/src/core/qgsexpression_texts.cpp" -o ! -f "$builddir/src/core/qgscontexthelp_texts.cpp" ]; then +if [ ! -f "$builddir/src/core/qgsexpression_texts.cpp" ]; then echo Generated help files not found exit 1 fi @@ -140,7 +139,7 @@ for i in \ do [ -f "$i" ] && mv "$i" "$i.save" done -$QMAKE -project -o qgis_ts.pro -nopwd src python i18n "$builddir/src/core/qgsexpression_texts.cpp" "$builddir/src/core/qgscontexthelp_texts.cpp" +$QMAKE -project -o qgis_ts.pro -nopwd src python i18n "$builddir/src/core/qgsexpression_texts.cpp" if [ -n "$add" ]; then for i in $add; do echo "Adding translation for $i"