From 089a9f71529c8895578375c361b3436b6912f380 Mon Sep 17 00:00:00 2001 From: Andrew Ekstedt Date: Fri, 27 Apr 2018 21:33:49 -0700 Subject: [PATCH] Import dexlib in templates that are about to need it A bunch of helper functions are moving to dexlib, so there are a lot of templates that are going to need to import dexlib now. Updates #117. --- splinext/pokedex/templates/pokedex/ability_list.mako | 1 + splinext/pokedex/templates/pokedex/conquest/kingdom.mako | 1 + splinext/pokedex/templates/pokedex/conquest/kingdom_list.mako | 1 + splinext/pokedex/templates/pokedex/conquest/lib.mako | 1 + splinext/pokedex/templates/pokedex/gadgets/compare_pokemon.mako | 1 + splinext/pokedex/templates/pokedex/location.mako | 2 +- splinext/pokedex/templates/pokedex/lookup_results.mako | 1 + splinext/pokedex/templates/pokedex/move_list.mako | 2 +- splinext/pokedex/templates/pokedex/nature_list.mako | 1 + splinext/pokedex/templates/pokedex/pokemon_list.mako | 1 + splinext/pokedex/templates/pokedex/type_list.mako | 2 +- 11 files changed, 11 insertions(+), 3 deletions(-) diff --git a/splinext/pokedex/templates/pokedex/ability_list.mako b/splinext/pokedex/templates/pokedex/ability_list.mako index d11ef417..3a852d11 100644 --- a/splinext/pokedex/templates/pokedex/ability_list.mako +++ b/splinext/pokedex/templates/pokedex/ability_list.mako @@ -1,4 +1,5 @@ <%inherit file="/base.mako"/> +<%namespace name="dexlib" file="lib.mako" /> <%! from splinext.pokedex import i18n %>\ <%def name="title()">Abilities diff --git a/splinext/pokedex/templates/pokedex/conquest/kingdom.mako b/splinext/pokedex/templates/pokedex/conquest/kingdom.mako index e341a879..53d0a44c 100644 --- a/splinext/pokedex/templates/pokedex/conquest/kingdom.mako +++ b/splinext/pokedex/templates/pokedex/conquest/kingdom.mako @@ -1,4 +1,5 @@ <%inherit file="/base.mako"/> +<%namespace name="dexlib" file="/pokedex/lib.mako" /> <%! from splinext.pokedex import i18n %> <%def name="title()"> diff --git a/splinext/pokedex/templates/pokedex/conquest/kingdom_list.mako b/splinext/pokedex/templates/pokedex/conquest/kingdom_list.mako index 990c6263..5cb825b4 100644 --- a/splinext/pokedex/templates/pokedex/conquest/kingdom_list.mako +++ b/splinext/pokedex/templates/pokedex/conquest/kingdom_list.mako @@ -1,4 +1,5 @@ <%inherit file="/base.mako"/> +<%namespace name="dexlib" file="/pokedex/lib.mako" /> <%! from splinext.pokedex import i18n %>\ diff --git a/splinext/pokedex/templates/pokedex/conquest/lib.mako b/splinext/pokedex/templates/pokedex/conquest/lib.mako index a40264f1..3bcf35da 100644 --- a/splinext/pokedex/templates/pokedex/conquest/lib.mako +++ b/splinext/pokedex/templates/pokedex/conquest/lib.mako @@ -1,3 +1,4 @@ +<%namespace name="dexlib" file="/pokedex/lib.mako" /> <%! from splinext.pokedex import i18n %> <%def name="pokemon_page_header()"> diff --git a/splinext/pokedex/templates/pokedex/gadgets/compare_pokemon.mako b/splinext/pokedex/templates/pokedex/gadgets/compare_pokemon.mako index 38f616af..990d0825 100644 --- a/splinext/pokedex/templates/pokedex/gadgets/compare_pokemon.mako +++ b/splinext/pokedex/templates/pokedex/gadgets/compare_pokemon.mako @@ -1,4 +1,5 @@ <%inherit file="/base.mako" /> +<%namespace name="dexlib" file="/pokedex/lib.mako" /> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_(u"Compare Pokémon")} diff --git a/splinext/pokedex/templates/pokedex/location.mako b/splinext/pokedex/templates/pokedex/location.mako index 29b7ae19..394885d3 100644 --- a/splinext/pokedex/templates/pokedex/location.mako +++ b/splinext/pokedex/templates/pokedex/location.mako @@ -1,5 +1,5 @@ <%inherit file="/base.mako"/> -<%namespace name="lib" file="lib.mako"/> +<%namespace name="dexlib" file="lib.mako"/> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_("%s - Locations") % c.location_name} diff --git a/splinext/pokedex/templates/pokedex/lookup_results.mako b/splinext/pokedex/templates/pokedex/lookup_results.mako index 7bcda675..0b40fa38 100644 --- a/splinext/pokedex/templates/pokedex/lookup_results.mako +++ b/splinext/pokedex/templates/pokedex/lookup_results.mako @@ -1,4 +1,5 @@ <%inherit file="/base.mako"/> +<%namespace name="dexlib" file="lib.mako"/> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_("Disambiguation")} diff --git a/splinext/pokedex/templates/pokedex/move_list.mako b/splinext/pokedex/templates/pokedex/move_list.mako index 16a32b95..4a861302 100644 --- a/splinext/pokedex/templates/pokedex/move_list.mako +++ b/splinext/pokedex/templates/pokedex/move_list.mako @@ -1,5 +1,5 @@ <%inherit file="/base.mako"/> -<%namespace name="lib" file="/lib.mako"/> +<%namespace name="dexlib" file="lib.mako"/> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_("Moves")} diff --git a/splinext/pokedex/templates/pokedex/nature_list.mako b/splinext/pokedex/templates/pokedex/nature_list.mako index 746fdba6..75a6f106 100644 --- a/splinext/pokedex/templates/pokedex/nature_list.mako +++ b/splinext/pokedex/templates/pokedex/nature_list.mako @@ -1,5 +1,6 @@ <%inherit file="/base.mako"/> <%namespace name="lib" file="/lib.mako"/> +<%namespace name="dexlib" file="lib.mako" /> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_("Natures")} diff --git a/splinext/pokedex/templates/pokedex/pokemon_list.mako b/splinext/pokedex/templates/pokedex/pokemon_list.mako index 95464179..50b1d001 100644 --- a/splinext/pokedex/templates/pokedex/pokemon_list.mako +++ b/splinext/pokedex/templates/pokedex/pokemon_list.mako @@ -1,5 +1,6 @@ <%inherit file="/base.mako"/> <%namespace name="lib" file="/lib.mako"/> +<%namespace name="dexlib" file="lib.mako"/> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_(u"Pokémon")} diff --git a/splinext/pokedex/templates/pokedex/type_list.mako b/splinext/pokedex/templates/pokedex/type_list.mako index 5072a1a9..05d4be00 100644 --- a/splinext/pokedex/templates/pokedex/type_list.mako +++ b/splinext/pokedex/templates/pokedex/type_list.mako @@ -1,5 +1,5 @@ <%inherit file="/base.mako"/> -<%namespace name="lib" file="/lib.mako"/> +<%namespace name="dexlib" file="lib.mako"/> <%! from splinext.pokedex import i18n %>\ <%def name="title()">${_(u"Types")}