Merge branch 'develop' into groovy/JAL-2074_upgradeto2.4.4

[jalview.git] / utils / i18nAnt.xml

diff --git a/utils/i18nAnt.xml b/utils/i18nAnt.xml
index eaabc47..47c404e 100755 (executable)
--- a/utils/i18nAnt.xml
+++ b/utils/i18nAnt.xml
@@ -19,6 +19,7 @@
         var logger = project.getBuildListeners( ).firstElement( );
         logger.setMessageOutputLevel( 1 );
     </script>
+       <echo message="Missing message labels compared to Messages.properties"/>
        <foreach target="compareProperties" param="file2">
                <path>
                        <fileset dir="${basedir}/resources/lang">
@@ -35,6 +36,8 @@
     <propertyselector property="file1.list" delimiter="," match="prefixfile1\.(.+)" select="\1"/>
     <propertyselector property="file2.list" delimiter="," match="prefixfile2\.(.+)" select="\1"/>
        
+       <echo message=" "/>
+       <echo message="*** ${file2}:" />
     <for list="${file1.list}" param="file1.property">
         <sequential>
             <if>
@@ -42,15 +45,6 @@
                     <matches pattern=",@{file1.property}," string=",${file2.list}," />
                 </not>
                 <then>
-                    <if>
-                        <not>
-                            <isset property="some_missing"/>
-                        </not>
-                           <then>
-                               <echo message=" "/>
-                               <echo>**** Missing in ${file2}: ****</echo>
-                           </then>
-                    </if>
                     <property name="some_missing" value="true"/>
                        <antcall target="reportMissingProperty">
                                <param name="textLabel" value="@{file1.property}"/>
@@ -60,6 +54,14 @@
             </if>
         </sequential>
     </for>
+    <if>
+        <not>
+            <isset property="some_missing"/>
+        </not>
+        <then>
+               <echo>No labels missing :-)</echo>
+        </then>
+    </if>
 </target>
 
 <target name="reportMissingProperty" description="double dereference 'prefixedPropertyName' and report missing language property">