Commit00a6a12

authored

Merge pull request#13 from wilson8507/update/fix_diff

Update/fix diff

2 parentsf2a1078 +3765d1d commit00a6a12Copy full SHA for 00a6a12

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 15 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ def get_msgs(lines):`
`53`	`53`	`lineno+=1`
`54`	`54`	`returnmsgids,msgstrs`
`55`	`55`
`56`		`-defmain(fp):`
`57`		`-p=subprocess.Popen(['git','show','HEAD:'+fp],stdout=subprocess.PIPE)`
	`56`	`+defmain(fp,original_po_commit='HEAD'):`
	`57`	`+p=subprocess.Popen(['git','show',f'{original_po_commit}:{fp}'],stdout=subprocess.PIPE)`
`58`	`58`	`out,err=p.communicate()`
`59`	`59`	`head_po=out.decode().splitlines()`
`60`	`60`	`msgids,msgstrs=get_msgs(head_po)`
`@@ -94,11 +94,21 @@ def main(fp):`
`94`	`94`
`95`	`95`	`if__name__=='__main__':`
`96`	`96`	`importsys`
	`97`	`+`
`97`	`98`	`iflen(sys.argv)<2:`
`98`		`-print('Usage: python fix_diffs.py <po_file_path>')`
	`99`	`+print('Usage:')`
	`100`	`+print('\tpython fix_diffs.py <po_file_path> [<original_po_file_commit>]')`
	`101`	`+print('Option:')`
	`102`	`+print('\t<original_po_file_commit>: The original .po file(s) commit record (default to HEAD).')`
	`103`	`+sys.exit(1)`
`99`	`104`
`100`		`-fp=sys.argv[1]`
`101`		`-output_lines=main(fp)`
	`105`	`+fp='./'+sys.argv[1]`
	`106`	`+output_lines=None`
	`107`	`+iflen(sys.argv)==3:`
	`108`	`+original_commit=sys.argv[2]`
	`109`	`+output_lines=main(fp,original_commit)`
	`110`	`+else:`
	`111`	`+output_lines=main(fp)`
`102`	`112`
`103`	`113`	`withopen(fp,'w')asf:`
`104`	`114`	`f.writelines([s+'\n'forsinoutput_lines])`

Comments

(0)