cvs: smarty /docs/scripts file-entities.php.in
"Mehdi Achour" <[email protected]>
| Newsgroups | gmane.comp.php.cvs.smarty |
|---|---|
| Message-ID | <cvsdidou1081858756@cvsserver> |
didou Tue Apr 13 08:19:16 2004 EDT
Modified files:
/smarty/docs/scripts file-entities.php.in
Log:
cleaning
http://cvs.php.net/diff.php/smarty/docs/scripts/file-entities.php.in?r1=1.4&r2=1.5&ty=u
Index: smarty/docs/scripts/file-entities.php.in
diff -u smarty/docs/scripts/file-entities.php.in:1.4 smarty/docs/scripts/file-entities.php.in:1.5
--- smarty/docs/scripts/file-entities.php.in:1.4 Tue Apr 13 04:48:51 2004
+++ smarty/docs/scripts/file-entities.php.in Tue Apr 13 08:19:16 2004
@@ -17,7 +17,7 @@
| Gabor Hojtsy <[email protected]> |
+----------------------------------------------------------------------+
- $Id: file-entities.php.in,v 1.4 2004/04/13 08:48:51 didou Exp $
+ $Id: file-entities.php.in,v 1.5 2004/04/13 12:19:16 didou Exp $
*/
/**
@@ -25,7 +25,6 @@
* Create smarty/docs/entities/file-entities.ent with respect
* to all the specialities needed:
*
- * . CHM only appendix integration
* . Translated language files with English ones as fallbacks
*
* Also take in account, that if XSLT style sheets are used,
@@ -81,7 +80,7 @@
fputs($fp, "<!-- DON'T TOUCH - AUTOGENERATED BY file-entities.php -->\n\n");
-// Write out all other entities
+// Write out all entities
foreach ($entities as $entity) {
fputs($fp, $entity);
}
@@ -94,7 +93,7 @@
/**
* Generate absolute path from a relative path, taking accout
- * the current wokring directory.
+ * the current working directory.
*
* @param string $path Relative path
* @return string Absolute path generated
@@ -182,22 +181,7 @@
if (isset($function_entities)) {
$function_entities[] = "&$name;";
}
-
- // Special treatment for function reference entities if splitted version available
- if (strstr($work_dir,"/functions")) {
- $splitfile = str_replace(".xml", "/reference.xml", $file);
- $splitpath = str_replace("/functions", "/reference", $trans_path) . "/" . $splitfile;
- if (file_exists($splitpath)) {
- $entities[] = entstr($name, $splitpath);
- continue;
- }
- $splitpath = str_replace("/functions", "/reference", $trans_path) . "/" . $splitfile;
- if (file_exists($splitpath)) {
- $entities[] = entstr($name, $splitpath);
- continue;
- }
- }
-
+
// If we have a translated file, use it, otherwise fall back to English
if (file_exists("$trans_path/$file")) {
$path = "$trans_path/$file";
@@ -304,4 +288,3 @@
function strip_cygdrive($path){
return preg_replace("!^/cygdrive/(\\w)/!", "\\1:/", $path);
}
-?>
--
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php