diff options
Diffstat (limited to 'lib/sisu/v3/param.rb')
-rw-r--r-- | lib/sisu/v3/param.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb index d8aa3e8a..77b4e8e7 100644 --- a/lib/sisu/v3/param.rb +++ b/lib/sisu/v3/param.rb @@ -1063,9 +1063,16 @@ module SiSU_Param @flv,@lang,@seg_names,@tags,@tag_array,@tag_a,@ec[:image],@ec[:audio],@ec[:multimedia]=Array.new(9){[]} @authors,@topic_register_array,@papersize_array=[],[],[] @lvs=[nil,0,0,0,0,0,0] - @lang_code_insert=(@opt.dir_structure_by ==:language) \ - ? '' - : ".#{@opt.lng}" + @lang_code_insert=if @opt.act[:output_by][:set]==:language + '' + elsif @opt.act[:output_by][:set]==:filetype \ + or @opt.act[:output_by][:set]==:filename + ".#{@opt.lng}" + elsif @opt.dir_structure_by ==:language + '' + else + ".#{@opt.lng}" + end @rgx_image=/(?:^|[^_\\])\{(?:\s*|\~\^\s+)(\S+?\.(?:png|jpg|gif)\b)/m @rgx_audio=/\{\s*(\S+?\.(?:mp3|ogg))/ @rgx_mm=/\{\s*(\S+?\.(?:ogg|mpeg))/ #expand and distinguish ogg |