v3: options, language setting, based on directory structure or filename

* affects multiple libraries

1 files changed, 12 insertions, 11 deletions

diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index 8aa543db..357bc725 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -272,7 +272,7 @@ module SiSU_Param
           l,n=Db[:col_language],'title.language'
           validate_length(s,l,n)
         end
-        def language_char
+        def language_char # look into, this must be set, from 1 directory stub (.fi), 2 filename (~fi), [3 (not used) document header (@title:\n  :language_char: fi)]
           s=@h['language_char']
           l,n=Db[:col_language_char],'title.language_char'
           validate_length(s,l,n)
@@ -1232,7 +1232,7 @@ module SiSU_Param
           end
         end
         @publisher ||= "#@@publisher (this copy)"
-        fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@fns)
+        fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language
         unless @language[:code] \
         and @language[:name]
           lang=@env.i18n.language #default language settings for directory by name, or in sysrc.yml
@@ -1244,15 +1244,16 @@ module SiSU_Param
           @language[:name]=fn_set_lang[:l]
         end
         @fnl=@env.i18n.lang_filename(fn_set_lang[:c])
-        @flv.each do |l|
-          lang=SiSU_Env::Standardise_language.new.file_to_language(l)
-          c={ a: '', b: '', c: '' }
-          if @fnl[:pre] =~/\S/;     c[:a]="#{lang[:c]}."
-          elsif @fnl[:mid] =~/\S/;  c[:b]=".#{lang[:c]}"
-          elsif @fnl[:post] =~/\S/; c[:c]=".#{lang[:c]}"
-          end
-          @lang << [lang[:l],"#{c[:a]}sisu_manifest#{c[:b]}.html#{c[:c]}"]
-        end if @flv
+#fix
+#       @flv.each do |l|
+#         lang=SiSU_Env::Standardise_language.new.file_to_language(l)
+#         c={ a: '', b: '', c: '' }
+#         if @fnl[:pre] =~/\S/;     c[:a]="#{lang[:c]}."
+#         elsif @fnl[:mid] =~/\S/;  c[:b]=".#{lang[:c]}"
+#         elsif @fnl[:post] =~/\S/; c[:c]=".#{lang[:c]}"
+#         end
+#         @lang << [lang[:l],"#{c[:a]}sisu_manifest#{c[:b]}.html#{c[:c]}"]
+#       end if @flv
         @lang.uniq!
         @fn=SiSU_Env::Env_call.new(@fns).lang(fn_set_lang[:c])
         @identifier="#{@env.url.root}/#{@fnb}/#{@fn[:toc]}" #DC note constructed dc identifier