Skip to content
Permalink
Browse files

remove qgscontexthelp_texts.cpp from i18n

  • Loading branch information
jef-n committed Sep 28, 2017
1 parent 69f370e commit cafe9d46c7990e4e3ad8fd09d92a93f075bda794
Showing with 3 additions and 5 deletions.
  1. +0 −1 .gitignore
  2. +1 −1 scripts/update_ts.sh
  3. +2 −3 scripts/update_ts_files.sh
@@ -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
@@ -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
@@ -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"

0 comments on commit cafe9d4

Please sign in to comment.
You can’t perform that action at this time.