From d26b7680b7c3559fcf5e3e65c858ba76c3b18f44 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Tue, 19 Jan 2010 16:41:53 +0100 Subject: [PATCH] recuperation item en fonction de la langue --- config.yaml | 8 +++++++- layouts/default.html | 3 +-- lib/multi.rb | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index a7a92b3bd..9090ad1d0 100644 --- a/config.yaml +++ b/config.yaml @@ -40,4 +40,10 @@ translations: en: "comments" onlyin: fr: "Seulement en" - fr: "Only in" + en: "Only in" + whatsthis: + fr: "?" + en: "?" + loading: + fr: "Chargement en cours..." + en: "loading..." diff --git a/layouts/default.html b/layouts/default.html index 1344d3423..9f61d626f 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -17,8 +17,7 @@ end conf=LocalConf.new -language=@item_rep.path -language.sub!(/\/Scratch\//,'').sub!(/\/.*$/,'') +language=@item_rep.path.sub(/\/Scratch\//,'').sub(/\/.*$/,'') conf.language=language # the current item is an article diff --git a/lib/multi.rb b/lib/multi.rb index 9955212df..b0815213a 100644 --- a/lib/multi.rb +++ b/lib/multi.rb @@ -23,6 +23,7 @@ def tradOfKeywordIn(keyword, language) end def item_of_language(language) - puts %{lib/multi::item_of_language not implemented yet} - return @item + searched_path=@item_rep.path.sub(@conf.language,language) + puts %{source path = #{@item_rep.path}, searched_path = #{searched_path}} + @items.find { |i| i.reps[0].path == searched_path } end