diff options
author | Ralph Amissah <ralph@amissah.com> | 2010-07-28 14:42:08 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2010-07-28 14:42:08 -0400 |
commit | 84b346542ac88cdbcf97d0aaff15ba49ddffe83a (patch) | |
tree | 11a8b1824fcabd05d1cc039812492eda912a3e09 /lib/sisu/v2/git.rb | |
parent | debian/control Maintainer changed, Uploaders added, Homepage moved (diff) | |
parent | sisu-2.6.3 changelog, date, version (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/git.rb')
-rw-r--r-- | lib/sisu/v2/git.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/sisu/v2/git.rb b/lib/sisu/v2/git.rb index 2d7629fd..b5dc403e 100644 --- a/lib/sisu/v2/git.rb +++ b/lib/sisu/v2/git.rb @@ -65,9 +65,17 @@ module SiSU_Git def initialize(opt) @opt=opt @env=SiSU_Env::Info_env.new + l=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @git_path={} - @git_path[:fnb]=@env.path.processing_path_git + '/' + @opt.fnb - @git_path[:src]=@git_path[:fnb] + '/' + Gt[:txt] + if @env.i18n.multilingual + m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss + fnn,fnb,fnt=@opt.fns[m,1],@opt.fns[m,2],@opt.fns[m,3] + else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/ + fnb=@fnn=@opt.fns[m,1] + fnt=@opt.fns[m,2] + end + @git_path[:fnb]=@env.path.processing_path_git + '/' + fnb # + @opt.fnb + @git_path[:src]=@git_path[:fnb] + '/' + Gt[:txt] + '/' + l[:c] @git_path[:image]=@git_path[:fnb] + '/' + Gt[:image] @git_path[:conf]=@git_path[:fnb] + '/' + Gt[:conf] @md=SiSU_Param::Parameters.new(@opt).get |