diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:11:15 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-17 18:11:15 -0400 |
commit | bdd62aba95cba6aa4930e14cee00d2dcc6d43f96 (patch) | |
tree | 8d21a7cdfb403be11afd7cca82af564a4fec7c53 /lib/sisu/v3/git.rb | |
parent | v3: options, expand name of source file for selected language directories (diff) |
v3: po4a re-enabled, related fixes (issues persist)sisu_3.0.9
Diffstat (limited to 'lib/sisu/v3/git.rb')
-rw-r--r-- | lib/sisu/v3/git.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v3/git.rb b/lib/sisu/v3/git.rb index bef93bc3..45eb3f75 100644 --- a/lib/sisu/v3/git.rb +++ b/lib/sisu/v3/git.rb @@ -68,8 +68,8 @@ module SiSU_Git @md=SiSU_Param::Parameters.new(@opt).get @file=SiSU_Env::SiSU_file.new(@md) l=SiSU_Env::Standardise_language.new(@md.opt.lng).language - unless @md.i18n[0]==l[:c] - p "using: #{@md.i18n[0]} (@make: :language:); filename #{@md.fns} filename language: #{l[:c]}, mismatch" + unless @opt.lng==l[:c] # @md.i18n[0]==l[:c] + p "using: #{@opt.lng} (@make: :language:); filename #{@md.fns} filename language: #{l[:c]}, mismatch" end if @env.output_dir_structure.multilingual? m=/((.+?)(?:\~\w{2,3})?)\.((?:-|ssm\.)?sst|ssm)$/ #watch added match for sss @@ -85,7 +85,7 @@ module SiSU_Git # : SiSU_Screen::Ansi.new(@opt.cmd,'Git path',@git_path[:fnb]).green_title_hi # SiSU_Screen::Ansi.new(@opt.cmd,"Git path","#{@opt.fns} -> #{@git_path[:fnb]}").warn if @opt.cmd =~/[MVv]/ #end - lng=(@md.opt.f_pth[:lng]) ? (@md.opt.f_pth[:lng]) : (@md.i18n[0]) + lng=(@md.opt.lng) ? (@md.opt.lng) : (@md.i18n[0]) @git_path={ fnb: git_path_fnb, src: git_path_fnb + '/' + Gt[:src] + '/' + lng, |