aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2015-02-18 20:27:20 +0100
committerfilip <filip.komar@gmail.com>2015-02-18 20:27:20 +0100
commit8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19 (patch)
tree0a1ce1bee0d9f861e61fcf91b70401b2438fae5c
parent7b0ae16382659569c8ae52fd1f080ec58a59c657 (diff)
downloadwww-8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19.tar
www-8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19.tar.gz
www-8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19.tar.bz2
www-8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19.tar.xz
www-8e3e35710bc6b8fc6cd7bae924a8b862bbb65f19.zip
ignore changed line numbers too
-rwxr-xr-xtools/rebuild_gettext_catalogs.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/rebuild_gettext_catalogs.sh b/tools/rebuild_gettext_catalogs.sh
index e3b15bfc2..96bc9111a 100755
--- a/tools/rebuild_gettext_catalogs.sh
+++ b/tools/rebuild_gettext_catalogs.sh
@@ -31,7 +31,7 @@ do
errors[$php_source]=$php_error_level
# if there are no real differences restore copy
if [ -f "$path_and_filename.pot" ] && [ -f "$path_and_filename.copy" ]; then
- diff --ignore-matching-lines='^"POT-Creation-Date:' --ignore-matching-lines='^# Copyright (C) 2014 - ' $path_and_filename.pot $path_and_filename.copy
+ diff --ignore-matching-lines='^"POT-Creation-Date:' --ignore-matching-lines='^# Copyright (C) 2014 - ' --ignore-matching-lines='^#: "/web/en/' $path_and_filename.pot $path_and_filename.copy
if [ $? -eq 0 ]; then
cp $path_and_filename.copy $path_and_filename.pot
fi
@@ -45,12 +45,12 @@ do
rm $path_and_filename.tmp
fi
if [ -f "$path_and_filename.copy" ] && [ -f "$path_and_filename.tmp" ]; then
- diff --ignore-matching-lines='^"POT-Creation-Date:' --ignore-matching-lines='^# Copyright (C) 2014 - ' $path_and_filename.tmp $path_and_filename.copy
+ diff --ignore-matching-lines='^"POT-Creation-Date:' --ignore-matching-lines='^# Copyright (C) 2014 - ' --ignore-matching-lines='^#: "/web/en/' $path_and_filename.tmp $path_and_filename.copy
if [ $? -eq 1 ]; then # there are differences
errors[$php_source]=0
mv $path_and_filename.tmp $path_and_filename.pot
rm $path_and_filename.copy
- echo Changes in $path_and_filename.pot
+ echo Changes in $path_and_filename.pot are listed above
else # Cleanup as there are no changes in $resource
errors[$php_source]=5
rm $path_and_filename.tmp