Patches...

Mathieu Arnold arn_mat@club-internet.fr
Tue, 02 Oct 2001 12:29:23 +0200
Previous message: patches..
Next message: [chora] Patches...
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
This is a multi-part message in MIME format.
---------------------- multipart/mixed attachment
Hi

I've been updating the fr_FR.po file this week end, and I ran into some
small stuffs covered by this patch.
I've added Text::htmlallspaces instead of htmlspecialchars in some places
where spaces could cause a problem.
I've added lib/Text.php to lib/base.php because it was now needed in most
files.
And I've modified 2 templates which were causing strange behavior because of
white spaces.

ps: I really do have repositories with strange characters in files and
directories, so...
-- 
Mathieu Arnold
---------------------- multipart/mixed attachment
Index: annotate.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/annotate.php,v
retrieving revision 1.18
diff -u -r1.18 annotate.php
--- annotate.php	2001/08/15 04:44:44	1.18
+++ annotate.php	2001/09/30 12:02:47
@@ -31,7 +31,7 @@
 $ann = new CVSLib_Annotate($CVS, $fl);
 checkError($lines = $ann->doAnnotate($rev));
 
-$title = sprintf(_("CVS Annotation of %s for version %s"), $where, $rev);
+$title = sprintf(_("CVS Annotation of %s for version %s"), Text::htmlallspaces($where), $rev);
 include $registry->getTemplatePath() . '/common-header.inc';
 include $registry->getTemplatePath() . '/annotate/header.inc';
 
@@ -45,7 +45,7 @@
         $style = (++$style % 3); 
     }
     $rev = $line['rev'];
-    $line = htmlspecialchars($line['line']);
+    $line = Text::htmlspaces($line['line']);
     include($registry->getTemplatePath() . '/annotate/line.inc');
 }
 
Index: cvs.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/cvs.php,v
retrieving revision 1.113
diff -u -r1.113 cvs.php
--- cvs.php	2001/08/24 06:35:28	1.113
+++ cvs.php	2001/09/30 12:02:47
@@ -13,7 +13,6 @@
 require_once CHORA_BASE . '/lib/base.php';
 require_once HORDE_BASE . '/config/mime_mapping.php';
 require_once HORDE_BASE . '/config/mime_drivers.php';
-require_once HORDE_BASE . '/lib/Text.php';
 require_once HORDE_BASE . '/lib/MIME/Magic.php';
 require_once HORDE_BASE . '/lib/MIME/Viewer.php';
 require_once CHORA_BASE . '/config/mime_drivers.php';
@@ -40,7 +39,7 @@
         $title = $conf['options']['introTitle'];
     }
     else {
-        $title = sprintf(_("CVS Directory of /%s"), $where);
+        $title = sprintf(_("CVS Directory of /%s"), Text::htmlallspaces($where));
     }
 
     if ($acts['sa']) {
@@ -129,7 +128,7 @@
         $cache->store($fullname, serialize($fl));
     }
 
-    $title = sprintf(_("CVS Log for %s"), $where);
+    $title = sprintf(_("CVS Log for %s"), Text::htmlallspaces($where));
 
     $upwhere = preg_replace('|[^/]+$|', '', $where);
 
Index: diff.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/diff.php,v
retrieving revision 1.40
diff -u -r1.40 diff.php
--- diff.php	2001/08/03 20:32:36	1.40
+++ diff.php	2001/09/30 12:02:47
@@ -11,7 +11,6 @@
 
 define('CHORA_BASE', dirname(__FILE__));
 require_once CHORA_BASE . '/lib/base.php';
-require_once HORDE_BASE . '/lib/Text.php';
 
 if ($conf['compress_pages']) {
     include_once 'HTTP/Compress.php';
@@ -85,7 +84,7 @@
     /* Output standard header information for the page */
     $filename = preg_replace('/^.*\//', '', $where);
     $pathname = preg_replace('/[^\/]*$/', '', $where);
-    $title = sprintf(_("Diff for %s between version %s and %s"), $where, $r1, $r2);
+    $title = sprintf(_("Diff for %s between version %s and %s"), Text::htmlallspaces($where), $r1, $r2);
 
     $log = $fl->logs[$r2];
     $log_print = htmlify($log->queryLog());
Index: history.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/history.php,v
retrieving revision 1.19
diff -u -r1.19 history.php
--- history.php	2001/08/18 06:12:08	1.19
+++ history.php	2001/09/30 12:02:47
@@ -158,7 +158,7 @@
     $maxCol = max($val, $maxCol);
 }
 
-$title = sprintf(_("CVS Branching View for %s"), $where);
+$title = sprintf(_("CVS Branching View for %s"), Text::htmlallspaces($where));
 $extraLink = '<a href="' . Chora::url('cvs',$where) . '">' . _("Switch to Log View") . '</a>';
 include $registry->getTemplatePath() . '/common-header.inc';
 include $registry->getTemplatePath() . '/history/header.inc';
Index: lib/Chora.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/lib/Chora.php,v
retrieving revision 1.9
diff -u -r1.9 Chora.php
--- lib/Chora.php	2001/08/24 21:40:01	1.9
+++ lib/Chora.php	2001/09/30 12:02:47
@@ -28,7 +28,7 @@
         foreach (explode('/', $where) as $dir) {
             $wherePath .= "/$dir"; 
             if (!empty($dir) && ($dir != 'Attic')) {
-                $bar .= '/ <a href="' . Chora::url('cvs', $wherePath) . '">'. $dir . '</a>';
+                $bar .= '/ <a href="' . Chora::url('cvs', $wherePath) . '">'. Text::htmlallspaces($dir) . '</a>';
             }
         }
         return $bar;
Index: lib/base.php
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/lib/base.php,v
retrieving revision 1.62
diff -u -r1.62 base.php
--- lib/base.php	2001/09/13 20:29:15	1.62
+++ lib/base.php	2001/09/30 12:02:47
@@ -24,6 +24,7 @@
 require_once CHORA_BASE . '/config/conf.php';
 require_once CHORA_BASE . '/config/cvsroots.php';
 require_once CHORA_BASE . '/config/mime_drivers.php';
+require_once HORDE_BASE . '/lib/Text.php';
 
 /* Spawn the Horde registry object */
 $registry = &Registry::singleton();
ndex: po/fr_FR.po
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/po/fr_FR.po,v
retrieving revision 1.1
diff -u -r1.1 fr_FR.po
--- po/fr_FR.po	2001/08/14 21:17:20	1.1
+++ po/fr_FR.po	2001/09/30 12:02:47
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Chora 1\n"
 "POT-Creation-Date: 2001-08-07 15:00+0200\n"
-"PO-Revision-Date: 2001-08-12 20:33+0200\n"
+"PO-Revision-Date: 2001-09-28 17:58+0200\n"
 "Last-Translator: Mathieu Arnold <mat@absolight.net>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,9 +21,13 @@
 " Ce formulaire vous permet de demander des diff entre n'importequelle "
 "r&eacute;vision d'un fichier. Vous pouvez selectionner un nom de "
 "r&eacute;vision symbolique en utilisant le menu de selection ou vous pouvez "
-"inscrire un num&eacute;ro de r&eacute;vision dansle champ texte."
+"inscrire un num&eacute;ro de r&eacute;vision dans le champ texte."
 
 #, c-format
+msgid "%s ago"
+msgstr "il y a %s"
+
+#, c-format
 msgid "Added in v.%s"
 msgstr "Ajout&eacute; dans v.%s"
 
@@ -82,6 +86,9 @@
 msgid "Chora Homepage"
 msgstr "Site de Chora"
 
+msgid "Chora is not properly configured"
+msgstr "Chora n'est pas correctement configuré"
+
 msgid "Context"
 msgstr "Contexte"
 
@@ -96,6 +103,10 @@
 msgstr "Diff de %s entre les versions %s et %s"
 
 #, c-format
+msgid "Diffs to selected version %s"
+msgstr "Diff avec la version %s"
+
+#, c-format
 msgid "Diffs to version %s"
 msgstr "Diff avec la version %s"
 
@@ -108,6 +119,12 @@
 msgid "Ed Script"
 msgstr "Script Ed"
 
+msgid "Error Encountered"
+msgstr "Une erreur est survenue"
+
+msgid "Error"
+msgstr "Erreur"
+
 msgid "File"
 msgstr "Fichier"
 
@@ -146,8 +163,11 @@
 msgid "Other Repositories"
 msgstr "Autres D&eacute;p&ocirc;ts"
 
+msgid "Please contact"
+msgstr "Contactez"
+
 msgid "Previous Directory"
-msgstr "R&eacute;pertoire Parent"
+msgstr "R&eacute;pertoire&nbsp;Parent"
 
 #, c-format
 msgid "Removed in v.%s"
@@ -159,15 +179,49 @@
 msgid "Rev"
 msgstr "Rev"
 
+msgid "Select for Diff"
+msgstr "Select. pour Diff"
+
 msgid "Show Deleted Files"
 msgstr "Afficher les fichiers supprim&eacute;s"
 
 msgid "Side-by-Side"
 msgstr "Cote à Cote"
 
+msgid "Some of Chora's configuration files are missing:"
+msgstr "Les fichiers de configuration suivants sont manquantnbsp;"
+
 msgid "Sort Order"
 msgstr "Ordre de tri"
 
+msgid "Switch to Branch View"
+msgstr "Vue par Branches"
+
+msgid "Switch to Log View"
+msgstr "Vue par Logs"
+
+msgid ""
+"This file controls the stylesheet that is used to set colors and fonts in "
+"addition to or overriding Horde defaults."
+msgstr ""
+"Ce fichier controle la feuille de style qui est utilisée pour mettre les "
+"Couleurs et les polices en plus d'écraser les parametres par défaut d'Horde"
+
+msgid ""
+"This file defines all of the cvs repositories that you wish Chora to display."
+msgstr ""
+"Ce fichier définis tous les dépots cvs que vous voulez afficher dans Chora"
+
+msgid "This file defines any special MIME-type handling for Chora."
+msgstr "Ce fichier définis des traitements spécifiques des types MIME par Chora"
+
+msgid ""
+"This is the main Chora configuration file. It contains paths and options for "
+"all Chora scripts."
+msgstr ""
+"Ceci est le fichier de configuration principal de Cora. Il contient les chemins et "
+"les options pour tous les scripts de Chora"
+
 msgid "Tracking Branch"
 msgstr "Branche Affich&eacute;e"
 
@@ -177,6 +231,9 @@
 msgid "Unified"
 msgstr "Unifi&eacute;"
 
+msgid "Unselect"
+msgstr "D&eacute;selectionner"
+
 msgid "Use Text Field"
 msgstr "Utiliser le champ texte"
 
@@ -189,6 +246,9 @@
 msgid "View"
 msgstr "Voir "
 
+msgid "and:"
+msgstr "et&nbsp;:"
+
 #, c-format
 msgid "by %s"
 msgstr "par %s"
@@ -196,15 +256,64 @@
 msgid "changed lines"
 msgstr "lignes modifi&eacute;es"
 
+msgid "day"
+msgstr "jour"
+
+msgid "days"
+msgstr "jours"
+
+msgid "for further information."
+msgstr "pour de plus amples informations."
+
+msgid "hour"
+msgstr "heure"
+
+msgid "hours"
+msgstr "heures"
+
 msgid "long"
 msgstr "long"
 
+msgid "minute"
+msgstr "minute"
+
+msgid "minutes"
+msgstr "minutes"
+
+msgid "month"
+msgstr "mois"
+
+msgid "months"
+msgstr "mois"
+
+#, c-format
 msgid "revision %s"
 msgstr "r&eacute;vision %s"
 
+msgid "second"
+msgstr "seconde"
+
+msgid "seconds"
+msgstr "secondes"
+
 msgid "unified"
 msgstr "unifi&eacute;"
 
 #, c-format
 msgid "version %s"
 msgstr "version %s"
+
+msgid "very little time"
+msgstr "tres peu de temps"
+
+msgid "week"
+msgstr "semaine"
+
+msgid "weeks"
+msgstr "semaines"
+
+msgid "year"
+msgstr "année"
+
+msgid "years"
+msgstr "années"
Index: templates/directory/back.inc
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/templates/directory/back.inc,v
retrieving revision 1.6
diff -u -r1.6 back.inc
--- templates/directory/back.inc	2001/08/10 22:29:26	1.6
+++ templates/directory/back.inc	2001/09/30 12:02:47
@@ -1,8 +1,7 @@
 <tr class="item0">
  <td>
    <a href="<?= $url ?>">
-   <?= Horde::img('back.gif', 'width="16" height="16" alt="' . _("Back") . '"') ?>
-   <?= _("Previous Directory") ?></a>
+   <?= Horde::img('back.gif', 'width="16" height="16" alt="' . _("Back") . '"') ?>&nbsp;<?= _("Previous Directory") ?></a>
  </td>
  <td> &nbsp; </td>
  <td> &nbsp; </td>
Index: templates/directory/dir.inc
===================================================================
RCS file: /home/cvs/cvs/dup/horde/chora/templates/directory/dir.inc,v
retrieving revision 1.6
diff -u -r1.6 dir.inc
--- templates/directory/dir.inc	2001/08/10 22:29:26	1.6
+++ templates/directory/dir.inc	2001/09/30 12:02:47
@@ -1,8 +1,7 @@
 <tr class="item<?= $dirrow ?>">
  <td>
    <a href="<?= $url ?>">
-   <?= Horde::img('folder.gif', 'width="16" height="16" alt="' . _("Directory") . '"') ?>
-   <?= $currDir ?>/</a>
+   <?= Horde::img('folder.gif', 'width="16" height="16" alt="' . _("Directory") . '"') ?>&nbsp;<?= $currDir ?>/</a>
  </td>
  <td> &nbsp; </td>
  <td> &nbsp; </td>

---------------------- multipart/mixed attachment--
Previous message: patches..
Next message: [chora] Patches...
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]