Mercurial > hg > nginx-site
changeset 104:3ae68fe2e938
A nicer look for the directive's synopsis section, including i18n
for "syntax", "default", "context", and "any (context)" strings.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Wed, 19 Oct 2011 08:29:21 +0000 |
| parents | b2e9c172a156 |
| children | 1aa4f50144e4 |
| files | xml/i18n.xml xml/ru/docs/ngx_core_module.xml xsls/directive.xsls |
| diffstat | 3 files changed, 72 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/i18n.xml Wed Oct 19 08:18:31 2011 +0000 +++ b/xml/i18n.xml Wed Oct 19 08:29:21 2011 +0000 @@ -7,10 +7,18 @@ <item id="editor">edited by</item> <item id="translator">translated by</item> <item id="none">none</item> +<item id="syntax">syntax</item> +<item id="default">default</item> +<item id="context">context</item> +<item id="context.any">any</item> </text> <text lang="ru"> <item id="none">нет</item> +<item id="syntax">синтаксис</item> +<item id="default">умолчание</item> +<item id="context">контекст</item> +<item id="context.any">любой</item> </text> <text lang="ja">
--- a/xml/ru/docs/ngx_core_module.xml Wed Oct 19 08:18:31 2011 +0000 +++ b/xml/ru/docs/ngx_core_module.xml Wed Oct 19 08:29:21 2011 +0000 @@ -97,7 +97,7 @@ <directive name="include"> <syntax><value>файл|маска</value></syntax> <default/> -<context>везде</context> +<context/> <para> Директива позволяет включить в конфигурацию другой файл.
--- a/xsls/directive.xsls Wed Oct 19 08:18:31 2011 +0000 +++ b/xsls/directive.xsls Wed Oct 19 08:29:21 2011 +0000 @@ -4,11 +4,13 @@ <a name="{@name}"/> <!-- <center><h4> !{@name} </h4></center> --> <div class="directive"> + <table cellspacing="0"> !! "syntax"; !! "default"; !! "context"; + </table> X:if "(@appeared-in)" { - <strong>appeared in version</strong>: !{@appeared-in} + <p>This directive appeared in version !{@appeared-in}.</p> } </div> !! "para"; @@ -16,9 +18,19 @@ X:template = "syntax" { X:if "position() = 1" { - <strong>syntax</strong>: - } else { - <code>       </code> + X:text disable-output-escaping="yes" { + <tr valign="top"> + <td> + } + <strong> + !{document(concat($XML, '/i18n.xml')) + /i18n/text[@lang = $LANG]/item[@id='syntax']} + </strong>: + X:text disable-output-escaping="yes" { + </td> + <td> + } + <strong>​</strong> } <code> !{../@name} @@ -27,11 +39,28 @@ } </code> <br/> + X:if "position() = last()" { + X:text disable-output-escaping="yes" { + </td> + </tr> + } + } } X:template = "default" { X:if "position() = 1" { - <strong>default</strong>: + X:text disable-output-escaping="yes" { + <tr valign="top"> + <td> + } + <strong> + !{document(concat($XML, '/i18n.xml')) + /i18n/text[@lang = $LANG]/item[@id='default']} + </strong>: + X:text disable-output-escaping="yes" { + </td> + <td> + } } X:if "count(node()) = 0" { <strong> @@ -39,17 +68,39 @@ /i18n/text[@lang = $LANG]/item[@id='none']} </strong> } else { + <strong>​</strong> <code> !{../@name} X:text{ } !!; </code> } <br/> + X:if "position() = last()" { + X:text disable-output-escaping="yes" { + </td> + </tr> + } + } } X:template = "context" { X:if "position() = 1" { - <strong>context</strong>: + X:text disable-output-escaping="yes" { + <tr valign="top"> + <td> + } + <strong> + !{document(concat($XML, '/i18n.xml')) + /i18n/text[@lang = $LANG]/item[@id='context']} + </strong>: + X:text disable-output-escaping="yes" { + </td> + <td> + } + <strong>​</strong> } - X:if "count(text()) = 0" { - <strong>any</strong> + X:if "count(node()) = 0" { + <strong> + !{document(concat($XML, '/i18n.xml')) + /i18n/text[@lang = $LANG]/item[@id='context.any']} + </strong> } else { <code> !!; </code> } @@ -57,6 +108,10 @@ X:text{, } } else { <br/> + X:text disable-output-escaping="yes" { + </td> + </tr> + } } }