File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed
cli/resource-mover-cli/src/main/kotlin/net/thunderbird/cli/resource/mover Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -48,12 +48,20 @@ class StringResourceMover {
4848 println (" \n Found key in file: ${sourceFile.path} \n " )
4949
5050 val targetFile = getOrCreateTargetFile(targetPath, sourceFile, isTargetComposeResources)
51- val keyDeclaration = extractKeyDeclaration(sourceFile, key)
51+ val originalKeyDeclaration = extractKeyDeclaration(sourceFile, key)
52+ val keyDeclaration = originalKeyDeclaration.let { keyDeclaration ->
53+ if (isTargetComposeResources && keyDeclaration.contains(" <xliff:g id" )) {
54+ val regex = """ (<xliff:g\s+id="[^"]+">)(.*?)(</xliff:g>)""" .toRegex()
55+ keyDeclaration.replace(regex, " $2" )
56+ } else {
57+ keyDeclaration
58+ }
59+ }
5260
5361 println (" Key declaration: $keyDeclaration " )
5462
5563 copyKeyToTarget(targetFile, keyDeclaration, key)
56- deleteKeyFromSource(sourceFile, keyDeclaration )
64+ deleteKeyFromSource(sourceFile, originalKeyDeclaration )
5765
5866 if (isSourceFileEmpty(sourceFile)) {
5967 println (" Source file is empty: ${sourceFile.path} -> deleting it." )
You can’t perform that action at this time.
0 commit comments