trans-coord/gnun/server/gnun gnun-diff-po.in Ch...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/12/17 06:52:00

Modified files:
        gnun/server/gnun: gnun-diff-po.in ChangeLog 

Log message:
        Eliminate a msgattrib invocation; remove obsolete strings before
        the final msgcatting.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-diff-po.in?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.320&r2=1.321

Patches:
Index: gnun-diff-po.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-diff-po.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnun-diff-po.in     16 Dec 2012 07:36:33 -0000      1.2
+++ gnun-diff-po.in     17 Dec 2012 06:51:59 -0000      1.3
@@ -107,12 +107,13 @@
 # File to count msgid number, since msgexec doesn't provide
 # a variable for it, and for POT when merging is needed.
 temp=`mktemp gnun-diff-po.XXXXXXXXXX`
-# We could create these files in po-msg-diff, but 
-# then mktemp and rm would run for every compared msgstr pair.
+# Files for po-msg-diff use; we could create them in po-msg-diff,
+# but then mktemp and rm would run for every compared msgstr pair.
 temp1=`mktemp gnun-diff-po1.XXXXXXXXXX`
 temp2=`mktemp gnun-diff-po2.XXXXXXXXXX`
-# File for the merged PO (when needed).
+# File for the merged PO.
 temp3=`mktemp gnun-diff-po3.XXXXXXXXXX`
+# Temporary file with cleared ``fuzzy'' flags and removed obsolete entries.
 temp4=`mktemp gnun-diff-po4.XXXXXXXXXX`
 trap 'rm -f "$temp" "$temp1" "$temp2" "$temp3" "$temp4"' EXIT
 
@@ -147,8 +148,7 @@
 # Replace all other translations with empty strings.
 /^msgstr /{ s/.*/msgstr ""/; p; :egin; s/.*//; N; /^\n$/!begin; s/.// }' \
      "$merge_to" > $temp
-  if @MSGMERGE@ -q "$merge_from" "$temp" \
-      | @MSGATTRIB@ --clear-fuzzy > "$temp3" ; then
+  if @MSGMERGE@ -q "$merge_from" "$temp" > "$temp3" ; then
     cat <<EOF
 <p><em>Note:</em> the files have been merged in order to compare them (their
 set of original strings didn't coincide).</p>
@@ -168,8 +168,12 @@
 
 echo "<table border=\"1\">"
 
address@hidden@ --clear-fuzzy "$to_file" > "$temp4"
address@hidden@ --clear-fuzzy "$from_file" | @MSGCAT@ - "$temp4" \
+# We clear fuzzy in order to make the script compare the updated translations
+# with their previous versions; the obsolete strings are removed because
+# the script can confuse them with current versions and provide the diffs
+# against the translations of obsolete strings.
address@hidden@ --clear-fuzzy --no-obsolete "$to_file" > "$temp4"
address@hidden@ --clear-fuzzy --no-obsolete "$from_file" | @MSGCAT@ - "$temp4" \
   | @MSGEXEC@ @pkglibexecdir@/po-msg-diff "$temp" "$temp1" "$temp2"
 
 cat <<EOF

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -b -r1.320 -r1.321
--- ChangeLog   16 Dec 2012 12:50:04 -0000      1.320
+++ ChangeLog   17 Dec 2012 06:51:59 -0000      1.321
@@ -1,3 +1,8 @@
+2012-12-17  Pavel Kharitonov  <address@hidden>
+
+       * gnun-diff-po.in: Eliminate a msgattrib invocation; remove
+       obsolete strings before the final msgcatting.
+
 2012-12-16  Pavel Kharitonov  <address@hidden>
 
        * gnun-diff-po.in: Fix a bug - the translations were