Really compare strings with the related en-US translations

* Version 2.1.4

* bin/stat-localizations: really compare strings with the related
en-US translations

3 files changed, 46 insertions, 26 deletions

diff --git a/NEWS b/NEWS
index 0dcc2a573..5f26c5980 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+ooo-build-2.1.4
+
+    + bug fixes:
+	+ improved workaround for media:// files (Jan)
+	+ removed problematic %%Title in the generated postscript (Michael)
+    + VBA bits:
+	+ fix core with Range.Areas collection (Noel)
+	+ fix erase for redim (Noel)
+	+ improve 'like' implementation (Caolan, Noel)
+	+ problem with compare of objects (Noel)
+    + build bits:
+	+ optional build with system libwpd and libwps (Hanno, Fridrich)
+    + Win32 bits:
+	+ installer support for more languages (Tor)
+	+ versioning (Tor)
+    + updated Debian, Mandriva, Giuseppe, Novell bits (Rene, Tor)
+
 ooo-build-2.1.3
 
     + bug fixes:
diff --git a/bin/stat-localizations b/bin/stat-localizations
index ddd9e842c..103feeeae 100755
--- a/bin/stat-localizations
+++ b/bin/stat-localizations
@@ -28,59 +28,62 @@ fi
 extract_gsi()
 {
    echo "Extracting $1 strings..."
-   localize -e -f "$2" -l "$1" >/dev/null 2>&1
+   localize -e -f "$2" -l "$1=$primary_lang" >/dev/null 2>&1
 }
 
+primary_lang="en-US"
+
 final_stat=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
 
-primary_lang="en-US"
 
 primary_gsi=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
 extract_gsi $primary_lang $primary_gsi
-primary_strings=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
-cat $primary_gsi | cut -f 1,11 >$primary_strings
+primary_strings_ui=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
+grep -v "^helpcontent2" $primary_gsi | sort | cut -f 1,2,5,11 >$primary_strings_ui
+primary_strings_help=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
+grep "^helpcontent2" $primary_gsi | sort | cut -f 1,2,5,11 >$primary_strings_help
 
-primary_single_num=`grep -v "^helpcontent2" $primary_strings | sort -u | wc -l`
-primary_single_num_help=`grep "^helpcontent2" $primary_strings | sort -u | wc -l`
+primary_num_ui=`cat $primary_strings_ui | wc -l`
+primary_num_help=`cat $primary_strings_help | wc -l`
 
 
 for secondary_lang in $* ; do
 
     secondary_gsi=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
     extract_gsi $secondary_lang $secondary_gsi
-    secondary_strings=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
-    cat $secondary_gsi | cut -f 1,11 >$secondary_strings
+    secondary_strings_ui=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
+    grep -v "^helpcontent2" $secondary_gsi | sort | cut -f 1,2,5,11 >$secondary_strings_ui
+    secondary_strings_help=`mktemp /tmp/ooo-stat-localizationse.XXXXXXXX`
+    grep "^helpcontent2" $secondary_gsi | sort | cut -f 1,2,5,11 >$secondary_strings_help
 
-    echo "Counting $secondary_lang strings..."
+    echo "Counting $secondary_lang localized strings..."
 
-    single_num=`grep -h -v "^helpcontent2" $primary_strings $secondary_strings | sort -u | wc -l`
-    secondary_single_num=`grep -v "^helpcontent2" $secondary_strings | sort -u | wc -l`
-    single_num_help=`grep -h "^helpcontent2" $primary_strings $secondary_strings | sort -u | wc -l`
-    secondary_single_num_help=`grep "^helpcontent2" $secondary_strings | sort -u | wc -l`
+    secondary_diff_num_ui=`diff $primary_strings_ui $secondary_strings_ui | grep "^>" | wc -l`
+    secondary_diff_num_help=`diff $primary_strings_help $secondary_strings_help | grep "^>" | wc -l`
 
-    #echo single_num=$single_num
-    #echo primary_single_num=$primary_single_num
-    #echo secondary_single_num=$secondary_single_num
+    #echo primary_num_ui=$primary_num_ui
+    #echo secondary_diff_num_ui=$secondary_num_ui
 
-    #echo single_num_help=$single_num_help
-    #echo primary_single_num_help=$primary_single_num_help
-    #echo secondary_single_num_help=$secondary_single_num_help
+    #echo primary_num_help=$primary_num_help
+    #echo secondary_diff_num_help=$secondary_num_help
 
-    localized=$((($single_num-$primary_single_num) * 100 / $primary_single_num))
-    localized_help=$((($single_num_help-$primary_single_num_help) * 100 / $primary_single_num_help))
+    localized_ui=$(($secondary_diff_num_ui * 100 / $primary_num_ui))
+    localized_help=$(($secondary_diff_num_help * 100 / $primary_num_help))
 
     echo
-    echo "Locale:$secondary_lang	ui:${localized}%		help:${localized_help}%"
+    echo "Locale:$secondary_lang	ui:${localized_ui}%		help:${localized_help}%"
     echo
 
     # 
-    echo "Locale:$secondary_lang	ui:${localized}%		help:${localized_help}%" >>$final_stat
+    echo "Locale:$secondary_lang	ui:${localized_ui}%		help:${localized_help}%" >>$final_stat
     
-    rm $secondary_strings
+    rm $secondary_strings_ui
+    rm $secondary_strings_help
     rm $secondary_gsi
 done
 
-rm $primary_strings
+rm $primary_strings_ui
+rm $primary_strings_help
 rm $primary_gsi
 
 echo
diff --git a/configure.in b/configure.in
index 4937bedf3..15e197ca2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 2.1.3)
+AC_INIT(ooo-build, 2.1.4)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)