aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2016-06-30 22:14:29 +0200
committerfilip <filip.komar@gmail.com>2016-06-30 22:14:29 +0200
commit8ec474b564f7de5923ac96f945f80fe72ae745f9 (patch)
treec9fa36455a6bff7965fc1ab6521d400093ab59bf
parentf16abe2f926dd0a01eae7ab7c565a4e28575b6d5 (diff)
downloadwww-8ec474b564f7de5923ac96f945f80fe72ae745f9.tar
www-8ec474b564f7de5923ac96f945f80fe72ae745f9.tar.gz
www-8ec474b564f7de5923ac96f945f80fe72ae745f9.tar.bz2
www-8ec474b564f7de5923ac96f945f80fe72ae745f9.tar.xz
www-8ec474b564f7de5923ac96f945f80fe72ae745f9.zip
fix for ignore-matching-lines in 404.po*
-rwxr-xr-xtools/rebuild_gettext_catalogs.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/rebuild_gettext_catalogs.sh b/tools/rebuild_gettext_catalogs.sh
index 4b689f29b..d3b264ae6 100755
--- a/tools/rebuild_gettext_catalogs.sh
+++ b/tools/rebuild_gettext_catalogs.sh
@@ -38,7 +38,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 - ' --ignore-matching-lines='^#: "/web/en/' $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/' $path_and_filename.pot $path_and_filename.copy
if [ $? -eq 0 ]; then
cp $path_and_filename.copy $path_and_filename.pot
fi
@@ -52,7 +52,7 @@ 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 - ' --ignore-matching-lines='^#: "/web/en/' $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/' $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