sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove qgscontexthelp_texts.cpp from i18n

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-09-28 23:36:22 +02:00
parent 69f370e4f2
commit cafe9d46c7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,7 +52,6 @@ scripts/astyle.exe
scripts/Debug scripts/Debug
scripts/qgisstyle* scripts/qgisstyle*
scripts/RelWithDebInfo scripts/RelWithDebInfo
src/core/qgscontexthelp_texts.cpp
src/core/qgsexpression_texts.cpp src/core/qgsexpression_texts.cpp
tests/testdata/cache/ tests/testdata/cache/
tests/testdata/checker360by180.asc.aux.xml tests/testdata/checker360by180.asc.aux.xml

2
scripts/update_ts.sh
View File

@ -78,7 +78,7 @@ files=
if [ -d "$2" ]; then if [ -d "$2" ]; then
builddir=$(realpath $2) builddir=$(realpath $2)
textcpp= 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 if [ -f $i ]; then
textcpp="$textcpp $i" textcpp="$textcpp $i"
elif [ "$action" != "pull" ]; then elif [ "$action" != "pull" ]; then

5
scripts/update_ts_files.sh
View File

@ -22,7 +22,6 @@
# name is reserved for the Windows qmake project file # name is reserved for the Windows qmake project file
echo "deprecated - use push_ts.sh and pull_ts.sh" >&2 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 set -e
@ -112,7 +111,7 @@ if [ -d "$builddir" ]; then
exit 1 exit 1
fi 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 echo Generated help files not found
exit 1 exit 1
fi fi
@ -140,7 +139,7 @@ for i in \
do do
[ -f "$i" ] && mv "$i" "$i.save" [ -f "$i" ] && mv "$i" "$i.save"
done 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 if [ -n "$add" ]; then
for i in $add; do for i in $add; do
echo "Adding translation for $i" echo "Adding translation for $i"