diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-01 20:22:51 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-01 20:22:51 -0500 |
| commit | a800c2b65d865542954f67334ba28f14e1b129bc (patch) | |
| tree | 3b63322e55202b7d768d8c4b5a0f97412c9d61fe /lib | |
| parent | v2: changelog fix (diff) | |
v3: urls, param, two unrelated regex fixes, check
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v3/param.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v3/urls.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index be870235..41879a16 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -923,7 +923,7 @@ module SiSU_Param skip unless fns_array # consider @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/ #check markup and markup version - if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:[0-9]+)?(?:\.[0-9]+)?(?:\.[0-9]+)?$/ #check markup and markup version + if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:(?:[0-9]+?)(?:\.[0-9]+?)(?:\.[0-9]+))?$/ #check markup and markup version @markup_version_declared=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1] sm_a,sm_b,sm_c=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?$/)[1..3] sm_c ||=0 diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index 5cc69e7b..d90e609a 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -243,7 +243,7 @@ module SiSU_urls if x=~/^P/ \ and @opt.cmd =~/P/ if @opt.fns =~/\S+?~\S{2}(?:_\S{2})?\.ss[mt]/ - f=y.gsub(/\pot/,'po') + f=y.gsub(/\.pot$/,'.po') SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@md.file.output_path.po}/#{f}").result else SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.text_editor} #{@md.file.output_path.pot}/#{y}").result |