diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
| commit | a9642d67f69d83d3fdb56ab115ef3c10bcd1895c (patch) | |
| tree | 352c633d6b60a54a9ef74ff143162ac07c981b18 /lib/sisu/v3/shared_metadata.rb | |
| parent | debian/changelog (3.0.7-1) (diff) | |
| parent | v3: i18n, sysenv, class variable to prevent unnecessary re-construction of hash (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v3/shared_metadata.rb')
| -rw-r--r-- | lib/sisu/v3/shared_metadata.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v3/shared_metadata.rb b/lib/sisu/v3/shared_metadata.rb index 167af5c4..c40bf68d 100644 --- a/lib/sisu/v3/shared_metadata.rb +++ b/lib/sisu/v3/shared_metadata.rb @@ -67,8 +67,8 @@ module Metadata meta,tag=[],[] dir=SiSU_Env::Info_env.new(@md.fns) base_html="#{dir.url.root}/#{@md.fnb}" - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] tr=SiSU_Translate::Source.new(@md,language) @attrib='md' if @display_heading @@ -997,8 +997,8 @@ WOK meta=[] dir=SiSU_Env::Info_env.new(@md.fns) base_html="#{dir.url.root}/#{@md.fnb}" - l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) - language=l[:l] + l=SiSU_Env::Standardise_language.new(@md.opt.lng).language + language=l[:n] tr=SiSU_Translate::Source.new(@md,language) tag="Document Manifest @" inf="#{@br}#{base_html}/#{@md.fn[:manifest]}" |