Merge branch 'terencehill/name_tag_fix'

[xonotic/xonotic-data.pk3dir.git] / check-translations.sh

diff --git a/check-translations.sh b/check-translations.sh
index b036cd4d29ee37a4e477cba9009f4cd9dbb2d93f..6a55b5ef732f3dff77418a4c06ead7660a8b2a6b 100755 (executable)
--- a/check-translations.sh
+++ b/check-translations.sh
@@ -57,7 +57,7 @@ if [ x"$mode" = x"pot" ]; then
                        echo "$name"
                done | sort -u
        } | xgettext -LC -k_ -f- --from-code utf-8 -F -o common.pot.new >&2
-       if msgcmp --use-untranslated common.pot common.pot.new; then
+       if msgcmp -N --use-untranslated common.pot common.pot.new; then
                echo "No contentful changes to common.pot - OK."
                rm -f common.pot.new
        else
@@ -81,6 +81,7 @@ if [ x"$mode" = x"txt" ]; then
                                        continue
                                fi
                        fi
+                       # Note: we're only reporting EXISTING fuzzy matches in the Fuzzy count, thus -N.
                        po=`msgmerge -N "$X" common.pot`
                        ne=`printf "%s\n" "$po" | msgfmt -o /dev/null --check-format --check-header --use-fuzzy - 2>&1 | grep . | wc -l`
                        nu=`printf "%s\n" "$po" | msgattrib --untranslated - | grep -c ^#:`
@@ -100,11 +101,11 @@ if [ x"$mode" = x"txt" ]; then
                                if [ "$p" -lt 50 ]; then
                                        continue
                                fi
-                               item="$l $l \"$l\" 0%"
+                               item="$l \"$l\" \"$l\" 0%"
                        fi
                        printf "%s\n" "$item" | sed -e "s/[0-9][0-9]*%/$p%/"
                done
-       } | tr '"' '\t' | sort -k3 | tr '\t' '"'
+       } | LC_ALL=C sort -t '"' -k4,4
 fi
 
 if [ x"$mode" = x"po" ]; then
@@ -119,6 +120,7 @@ if [ x"$mode" = x"po" ]; then
                                continue
                        fi
                fi
+               # Note: no -N here, this is the point where we allow fuzzy matching.
                msgmerge -F -U "$X" common.pot >&2
                msgfmt -o /dev/null --check-format --check-header --use-fuzzy "$X" 2>&1 \
                                              | grep . > "$X".errors       || rm -f "$X".errors
@@ -270,6 +272,7 @@ EOF
                                continue
                        fi
                fi
+               # Note: no -N here, this is the point where we allow fuzzy matching.
                msgmerge -F -U "$X" common.pot >/dev/null 2>&1
        done
 fi