Commit: 90 - miranda-jp (svn) - Miranda IM Japanization

OSDN > Finden Software > Communications > Chat > Jabber > Miranda IM Japanization > SCM > SVN > Commit

miranda-jp: Commit

add optional feature

--- trunk/miranda-tools/lpgen/lpgen.pl (revision 89)

+++ trunk/miranda-tools/lpgen/lpgen.pl (revision 90)

		@@ -48,48 +47,37 @@
48	47	}
49	48	else
50	49	{
51		-#Get default version no. from m_version.h
	50	+#Get default version number from m_version.h
52	51	($vermaj, $vermin, $build) = get_version( $version_file );
53	52	}
54	53
55		-# 1st arg version major i.e. 07 for "0.7"
56		-if ($vermaj =~ /^([0-9]*)([0-9])$/)
57		-{
58		- if ($1 eq "")
59		- {
60		- $version = $2;
61		- }
62		- else
63		- {
64		- $version = "$1.$2";
65		- }
66		-}
67		-else
68		-{
69		- $version = $vermaj;
70		-}
71		-# 2nd arg version minor i.e. 1 for "0.7.1"
72		-if ($vermin =~ /^[0-9]+$/)
73		-{
74		- $version .= ".$vermin";
75		-}
76		-else
77		-{
78		- $version .= $vermin;
79		-}
	54	+ # 1st arg version major i.e. 07 for "0.7"
	55	+ if ($vermaj =~ /^([0-9]*)([0-9])$/) {
	56	+ if ($1 eq "") {
	57	+ $version = $2;
	58	+ } else {
	59	+ $version = "$1.$2";
	60	+ }
	61	+ } else {
	62	+ $version = $vermaj;
	63	+ }
	64	+ # 2nd arg version minor i.e. 1 for "0.7.1"
	65	+ if ($vermin =~ /^[0-9]+$/) {
	66	+ $version .= ".$vermin";
	67	+ } else {
	68	+ $version .= $vermin;
	69	+ }
80	70
81		-# 3rd arg build number i.e. 36 for "0.7.1 build 36"
82		-if ($build =~ /^[0-9]+$/)
83		-{
84		- $version .= " build $build";
85		-}
86		-else
87		-{
88		- $version .= $build;
89		-}
	71	+ # 3rd arg build number i.e. 36 for "0.7.1 build 36"
	72	+ if ($build =~ /^[0-9]+$/) {
	73	+ $version .= " build $build";
	74	+ } else {
	75	+ $version .= $build;
	76	+ }
90	77
91	78	#Language Files
92		-if (!@ARGV) {
	79	+#If you want to get keywords from trans.txt also, set Options '/all' or 'version xx xx xx /all'.
	80	+if (!@ARGV \|\| $ARGV[0] eq "/all" ) {
93	81	create_langfile(
94	82	'../../miranda',
95	83	'../../miranda/i18n/langpack_english.txt',

		@@ -138,7 +126,10 @@
138	126	print "Building language file for $rootdir:\n";
139	127	find({ wanted => \&csearch, preprocess => \&pre_dir }, $rootdir);
140	128	find({ wanted => \&rcsearch, preprocess => \&pre_dir }, $rootdir);
141		- find({ wanted => \&txtsearch, preprocess => \&pre_dir }, $rootdir);
	129	+ if( @ARGV && $ARGV[0] eq "/all" )
	130	+ {
	131	+ find({ wanted => \&txtsearch, preprocess => \&pre_dir }, $rootdir);
	132	+ }
142	133
143	134	open(WRITE, "> $outfile") or die;
144	135	print WRITE <<HEADER;

		@@ -191,7 +182,6 @@
191	182	sub append_str {
192	183	my $str = shift(@_);
193	184	my $found = shift(@_);
194		-# $str = substr($str, 1, length($str) - 2);
195	185	if (length($str) gt 0 and $str ne "List1" and $str ne "Tree1" and $str =~ /[a-zA-Z]+/g) {
196	186	my $path = $File::Find::name;
197	187	$path =~ s/(\.\.\/)+miranda\///;

		@@ -222,6 +212,7 @@
222	212	}
223	213	close(READ);
224	214	$_ = $all;
	215	+ s/\\\n//g;
225	216	while (/(?:Button_SetIcon_IcoLib\|Translate[A-Z]{0,2}\|LPGENT?\|ICQTranslateUtfStatic)\s$\s\"([^\\]?(\\.[^\\]?))\"\s[,$]/g) {
226	217	$found += append_str($1, $found);
227	218	}