diff options
author | Ralph Amissah <ralph@amissah.com> | 2008-05-10 12:15:04 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2008-05-10 12:15:04 -0400 |
commit | 61a533c385db51965fb85148a5791ded161ec639 (patch) | |
tree | 4e64a0d1cf78ed5cfca03687219350695c0f1226 /lib/sisu/v0/urls.rb | |
parent | use debhelper 7, add vcs info to debian/control (diff) | |
parent | update changelog (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/urls.rb')
-rw-r--r-- | lib/sisu/v0/urls.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index 1d401f12..794270f6 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -59,11 +59,11 @@ =end module SiSU_urls + require "#{SiSU_lib}/particulars" + include SiSU_Particulars require "#{SiSU_lib}/sysenv" include SiSU_Env include SiSU_Screen - require "#{SiSU_lib}/param" - include SiSU_Param class Source attr_reader :opt def initialize(opt) @@ -78,15 +78,15 @@ module SiSU_urls end end class Output_urls - include SiSU_Param attr_reader :fns,:fnb,:cmd,:dir,:m_regular,:u def initialize(opt) @opt=opt + @particulars=SiSU_Particulars::Combined_singleton.instance.get_env_md(opt) fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @cmd=@opt.cmd - env=SiSU_Env::Env_call.new(@opt.fns) - @fnb=env.fnb - @env=SiSU_Env::Info_env.new(@opt.fns) + @md=@particulars.md + @env=@particulars.env + @fnb=@env.fnb fn_set_lang=SiSU_Env::Standardise_language.new.file_to_language(@opt.fns) @fnl=@env.i18n.lang_filename(fn_set_lang[:c]) @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) |