Index: openacs-4/packages/acs-lang/bin/check-catalog.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/bin/check-catalog.sh,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/bin/check-catalog.sh	24 Oct 2002 09:06:39 -0000	1.1
+++ openacs-4/packages/acs-lang/bin/check-catalog.sh	25 Oct 2002 14:40:39 -0000	1.2
@@ -19,10 +19,31 @@
 cd $package_path
 
 # Check that all keys in the catalog file are either in tcl or adp or info files
-for catalog_key in $(${script_path}/mygrep '<msg key="([^"]+)"' catalog/${package_key}.en_US.ISO-8859-1.xml); do find -iname '*.tcl'|xargs ${script_path}/mygrep "(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?\"?${package_key}\.$catalog_key\"?" || find -regex '.*\.\(info\|adp\)'|xargs ${script_path}/mygrep "#${package_key}\.[a-zA-Z0-9_\.]+#" || echo "Warning key $catalog_key in catalog file not found in any adp or tcl file"; done
+for catalog_key in $(${script_path}/mygrep '<msg key="([^"]+)"' catalog/${package_key}.en_US.ISO-8859-1.xml) 
+do 
+  find -iname '*.tcl' | xargs ${script_path}/mygrep \
+    "(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?\"?${package_key}\.$catalog_key\"?" \
+    || \
+  find -regex '.*\.\(info\|adp\)' | xargs ${script_path}/mygrep \
+    "#${package_key}\.$catalog_key#" \
+    || \
+  echo "Warning key $catalog_key in catalog file not found in any adp or tcl file"
+done
 
 # Check that all message lookups in tcl files have entries in the message catalog
-for tcl_message_key in $(find -iname '*.tcl'|xargs ${script_path}/mygrep '(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?"?${package_key}\.([a-zA-Z0-9_\.]+)"?'); do grep -L $tcl_message_key catalog/${package_key}.en_US.ISO-8859-1.xml || echo "Warning: key $tcl_message_key not in catalog file"; done
+for tcl_message_key in $(find -iname '*.tcl'|xargs ${script_path}/mygrep \
+                         '(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?"?${package_key}\.([a-zA-Z0-9_\.]+)"?')
+do 
+    grep -L $tcl_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
+      || \
+    echo "Warning: key $tcl_message_key not in catalog file" 
+done
 
 # Check that all message lookups in adp and info files are in the catalog file
-for adp_message_key in $(find -regex '.*\.\(info\|adp\)'|xargs ${script_path}/mygrep '#${package_key}\.([a-zA-Z0-9_\.]+)#'); do grep -L $adp_message_key catalog/${package_key}.en_US.ISO-8859-1.xml || echo "Warning: key $adp_message_key not in catalog file"; done
+for adp_message_key in $(find -regex '.*\.\(info\|adp\)'|xargs ${script_path}/mygrep \
+                        '#${package_key}\.([a-zA-Z0-9_\.]+)#')
+do 
+    grep -L $adp_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
+      || \
+    echo "Warning: key $adp_message_key not in catalog file"
+done