svn: /phpdoc/doc-base/trunk/ configure.php manual.xml.in

bjori Tue, 26 Jul 2011 10:46:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313716 Log: Do not include the english entities twice Changed paths: U phpdoc/doc-base/trunk/configure.php U phpdoc/doc-base/trunk/manual.xml.in Modified: phpdoc/doc-base/trunk/configure.php =================================================================== --- phpdoc/doc-base/trunk/configure.php 2011-07-26 10:45:32 UTC (rev 313715) +++ phpdoc/doc-base/trunk/configure.php 2011-07-26 10:46:10 UTC (rev 313716) @@ -472,6 +472,10 @@ } else if ($ac['LANG'] == 'yes') { $ac['LANG'] = 'en'; } +if ($ac["LANG"] == "en") { + $ac["ENGLISH_ONLY_INCL_BEGIN"] = "<!--"; + $ac["ENGLISH_ONLY_INCL_END"] = "-->"; +} checkvalue($ac['LANG']); checking("whether the language is supported"); Modified: phpdoc/doc-base/trunk/manual.xml.in =================================================================== --- phpdoc/doc-base/trunk/manual.xml.in 2011-07-26 10:45:32 UTC (rev 313715) +++ phpdoc/doc-base/trunk/manual.xml.in 2011-07-26 10:46:10 UTC (rev 313716) @@ -5,6 +5,7 @@ <!-- $Revision$ --> <!-- Add translated specific definitions and snippets --> +@ENGLISH_ONLY_INCL_BEGIN@ <!ENTITY % language-defs SYSTEM "../@LANGDIR@/language-defs.ent"> <!ENTITY % language-snippets SYSTEM "../@LANGDIR@/language-snippets.ent"> <!ENTITY % extensions SYSTEM "../@LANGDIR@/extensions.ent"> @@ -12,6 +13,7 @@ %language-defs; %extensions; %language-snippets; +@ENGLISH_ONLY_INCL_END@ <!-- Fallback to English definitions and snippets (in case of missing translation) --> <!ENTITY % language-defs.default SYSTEM "../@EN_DIR@/language-defs.ent">