From b6e556ac711a4324933aa72c1922dcfa34876f52 Mon Sep 17 00:00:00 2001 From: Malphaet Date: Fri, 17 Mar 2017 01:37:50 +0100 Subject: [PATCH] Still ugly, but fixed; Last step before generation --- generator/file_parser.py | 2 ++ generator/model.py | 10 +++++----- generator/model/dual_container.html | 2 +- sites/example_website/_config.txt | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/generator/file_parser.py b/generator/file_parser.py index 5c6a6a1..8db5ad3 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -72,12 +72,14 @@ class WebPage(object): #print "Getting",varname,filter_lang,"in",self.variables #if varname in self.reserved: # return getattr(self,varname) + if varname in self.variables: if filter_lang in self.variables[varname]: return self.variables[varname][filter_lang] else: if filter_lang=="*": return self.variables[varname].values()[0] + return self.variables[varname]["*"] raise KeyError("The variable "+varname+" doens't exist in the language "+filter_lang) def export(self): diff --git a/generator/model.py b/generator/model.py index 908080d..d83538f 100644 --- a/generator/model.py +++ b/generator/model.py @@ -94,12 +94,12 @@ def makeData(node): return c def makePage(node,cont,data): - c=DualData(node.name,node.tree) + c=DualContainer(node.name,node) c.load("generator/model/dual_container.html") - - print cont.export() - print data.export() - print c.export() + c.replace('fr') + cont_t=cont.export() + data_t=data.export() + print c.export().replace("##PAGE##",data_t).replace("##MENU##",cont_t) if __name__ == '__main__': site=makeWebsite("sites/example_website") diff --git a/generator/model/dual_container.html b/generator/model/dual_container.html index e78c094..a2614d8 100644 --- a/generator/model/dual_container.html +++ b/generator/model/dual_container.html @@ -5,7 +5,7 @@ - #_title_# + #_pagetitle_# diff --git a/sites/example_website/_config.txt b/sites/example_website/_config.txt index ba3158b..b3fef6c 100644 --- a/sites/example_website/_config.txt +++ b/sites/example_website/_config.txt @@ -11,6 +11,8 @@ previous_en: Previous articles previous_fr: Articles précédents preferences_en: Preferences preferences_fr: Préférences +websitename_*: Tradiction +pagetitle_*: Mouaulande about_en: About me about_fr: A propos ----