add missing targetTa for pofilter. generate bilingual target files only supports xliff

Author: xulihang

BasicCAT/BasicCAT.b4j

@@ -179,9 +179,9 @@ Module1=FileChooserUtils
 Module10=preTranslateDialog
 Module11=xliffFilter
 Module12=filterGenericUtils
-Module13=idmlFilter
-Module14=idmlUtils
-Module15=Utils
+Module13=Utils
+Module14=idmlFilter
+Module15=idmlUtils
 Module16=MT
 Module17=TMX
 Module18=Xml2Map
@@ -243,7 +243,7 @@ Module9=ProjectSettings
 NumberOfFiles=75
 NumberOfLibraries=24
 NumberOfModules=65
-Version=7.51
+Version=7.32
 @EndOfDesignText@
 #Region Project Attributes 
 	#MainFormWidth: 600

BasicCAT/BasicCAT.b4j.meta

@@ -196,6 +196,5 @@ ModuleClosedNodes65=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Main,MenuBar1_Action,298,0,Project,saveWorkFile,2179,0,Project,readWorkFile,2152,0,Utils,shouldAddSpace,120,0,Utils,splitByFind,18,0,Utils,getList,383,0,Utils,appendSource,368,0,Utils,appendSourceToTarget,343,0,Utils,mergeTransUnits,361,6,filterGenericUtils,mergeInternalSegment,36,6
 SelectedBuild=0
-VisibleModules=1,2,3,4,5,6,7,8,9,10,11,12,15
+VisibleModules=1,2,3,4,5,6,7,8,9,10,13,11,12

BasicCAT/Project.bas

@@ -2258,6 +2258,9 @@ End Sub
 Public Sub generateBilingualTargetFiles
 	For Each filename As String In files
 		Dim extension As String=filename.SubString2(filename.LastIndexOf(".")+1,filename.Length)
+		If extension.EndsWith("xlf")=False Then
+			Continue
+		End If
 		Dim fileSegments As List
 		fileSegments.Initialize
 		File.Copy(File.Combine(path,"work"),filename&".json",File.Combine(path,"work"),filename&".json.bak")
@@ -2271,8 +2274,10 @@ Public Sub generateBilingualTargetFiles
 		saveWorkFile(filename,fileSegments,path)
 		generateTargetFileForOne(filename)
 	Next
-	Return
 	For Each filename As String In files
+		If extension.EndsWith("xlf")=False Then
+			Continue
+		End If
 		File.Copy(File.Combine(path,"work"),filename&".json.bak",File.Combine(path,"work"),filename&".json")
 		File.Delete(File.Combine(path,"work"),filename&".json.bak")
 	Next

BasicCAT/filterGenericUtils.bas

@@ -54,12 +54,12 @@ Sub mergeInternalSegment(segments As List,index As Int,targetLang As String,exte
 		source=tagsAtBothSidesRemovedText(source)
 	End If
 
-	If extension="po" Then
-		If tagsNum(source)>=2 And Regex.IsMatch("<.*?>",source) Then
+	If extension="xlf" Then
+		If tagsNum(source)=2 And Regex.IsMatch("<.*?>",source) Then
 			source=tagsAtBothSidesRemovedText(source)
 		End If
 	Else
-		If tagsNum(source)=2 And Regex.IsMatch("<.*?>",source) Then
+		If tagsNum(source)>=2 And Regex.IsMatch("<.*?>",source) Then
 			source=tagsAtBothSidesRemovedText(source)
 		End If
 	End If

plugins/poFilter/poFilter.b4j

@@ -23,7 +23,7 @@ Module8=Utils
 NumberOfFiles=2
 NumberOfLibraries=7
 NumberOfModules=8
-Version=7.51
+Version=7.32
 @EndOfDesignText@
 #Region Project Attributes 
 	#MainFormWidth: 600

plugins/poFilter/poFilter.b4j.meta

@@ -25,6 +25,5 @@ ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
-NavigationStack=poFilterPlugin,generateFile,346,6,poFilterPlugin,mergeInternalSegment,463,6,Main,AppStart,22,0,poFilterPlugin,Class_Globals,0,0,poFilterPlugin,GetNiceName,16,0,poFilterPlugin,Run,28,0,Utils,splitByFind,21,0,filterGenericUtils,mergeInternalSegment,36,0,poFilterPlugin,createWorkFile,39,0,poFilterPlugin,mergeSegment,392,6
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8

plugins/poFilter/poFilterPlugin.bas

@@ -400,6 +400,7 @@ Sub mergeSegment(MainForm As Form,sourceTextArea As TextArea,editorLV As ListVie
 	pane=editorLV.Items.Get(index)
 	nextPane=editorLV.Items.Get(index+1)
 	Dim targetTa,nextTargetTa As TextArea
+	targetTa=pane.GetNode(1)
 	nextTargetTa=nextPane.GetNode(1)
 
 	bitext.Set(1,targetTa.Text)