From 0a65ec9d14f98c80272bccbe6c61fb16189a53cd Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Sun, 2 Jan 2005 15:53:35 +0000 Subject: [PATCH] _(...) -> _b_(...) --- article.php | 14 +++++++------- disconnect.php | 5 +++-- include/misc.inc.php | 20 +++++++++++--------- index.php | 19 ++++++++++--------- install.d/error.inc.php | 10 +++++----- install.d/format.inc.php | 14 +++++++------- install.d/profile_form.inc.php | 24 ++++++++++++------------ post.php | 16 ++++++++-------- subscribe.php | 11 ++++++----- thread.php | 20 ++++++++++---------- 10 files changed, 79 insertions(+), 74 deletions(-) diff --git a/article.php b/article.php index f5564a2..2c7faeb 100644 --- a/article.php +++ b/article.php @@ -50,21 +50,21 @@ $ndx = $spool->getndx($id); ?>

- +

headers))) { ?>

- +

- +
+summary=""> @@ -99,7 +99,7 @@ foreach ($news['headdisp'] as $nick) { diff --git a/disconnect.php b/disconnect.php index f3fe78c..ad08ba7 100644 --- a/disconnect.php +++ b/disconnect.php @@ -8,6 +8,7 @@ ********************************************************************************/ require_once("include/session.inc.php"); +require_once("include/misc.inc.php"); require_once("include/profile.inc.php"); require_once("include/error.inc.php"); @@ -18,10 +19,10 @@ session_destroy(); require_once("include/header.inc.php"); ?>
- +

- profil'); ?> + profil'); ?>

- +

" cellspacing="0" cellpadding="2"> overview as $g => $d) { if (count($newgroups->overview) and count($profile['subscribe'])) { ?>

- +

- +
- +
- +
- + - + - + - +
" cellspacing="0" cellpadding="2"> '._('Impossible de se connecter au serveur de forums').'

'; + echo '

'._b_('Impossible de se connecter au serveur de forums').'

'; require_once("include/footer.inc.php"); exit; case "nntpauth": - echo '

'._('L\'authentification sur le serveur de forums a échoué').'

'; + echo '

'._b_('L\'authentification sur le serveur de forums a échoué').'

'; require_once("include/footer.inc.php"); exit; case "nntpgroups": echo "

"; - echo _('Il n\'y a pas de forum sur ce serveur').'

'; + echo _b_('Il n\'y a pas de forum sur ce serveur').'

'; require_once("include/footer.inc.php"); exit; @@ -33,7 +33,7 @@ function error($_type) { echo "
\n"; echo "[Liste des forums]\n"; echo "
\n"; - echo '

'._('Impossible d\'accéder au forum').'

'; + echo '

'._b_('Impossible d\'accéder au forum').'

'; require_once("footer.inc.php"); exit; @@ -42,7 +42,7 @@ function error($_type) { echo "[Liste des forums] \n"; echo "[$group] \n"; echo "\n"; - echo '

'._('Impossible d\'accéder au message. Le message a peut-être été annulé').'

'; + echo '

'._b_('Impossible d\'accéder au message. Le message a peut-être été annulé').'

'; require_once("footer.inc.php"); exit; } diff --git a/install.d/format.inc.php b/install.d/format.inc.php index 36b7be7..7c28242 100644 --- a/install.d/format.inc.php +++ b/install.d/format.inc.php @@ -64,12 +64,12 @@ function displayshortcuts() { $sname = basename($_SERVER['SCRIPT_NAME']); echo '
'; - echo '['._('Déconnexion').'] '; + echo '['._b_('Déconnexion').'] '; switch ($sname) { case 'thread.php' : - echo '['._('Liste des forums').'] '; - echo "["._('Nouveau message')."] "; + echo '['._b_('Liste des forums').'] '; + echo "["._b_('Nouveau message')."] "; if (sizeof($spool->overview)>$news['max']) { for ($ndx=1; $ndx<=sizeof($spool->overview); $ndx += $news['max']) { if ($first==$ndx) { @@ -83,15 +83,15 @@ function displayshortcuts() { } break; case 'article.php' : - echo '['._('Liste des forums').'] '; + echo '['._b_('Liste des forums').'] '; echo "[$group] "; - echo "["._('Répondre')."] "; + echo "["._b_('Répondre')."] "; if (checkcancel($post->headers)) { - echo "["._('Annuler ce message')."] "; + echo "["._b_('Annuler ce message')."] "; } break; case 'post.php' : - echo '['._('Liste des forums').'] '; + echo '['._b_('Liste des forums').'] '; echo "[$group]"; break; } diff --git a/install.d/profile_form.inc.php b/install.d/profile_form.inc.php index cc3b18e..b700b96 100644 --- a/install.d/profile_form.inc.php +++ b/install.d/profile_form.inc.php @@ -8,7 +8,7 @@ ********************************************************************************/ ?>
- +
@@ -16,12 +16,12 @@ summary="Profile">
diff --git a/subscribe.php b/subscribe.php index 95f1fb2..36be609 100644 --- a/subscribe.php +++ b/subscribe.php @@ -8,6 +8,7 @@ ********************************************************************************/ require_once("include/session.inc.php"); +require_once("include/misc.inc.php"); require_once("include/password.inc.php"); require_once("include/NetNNTP.inc.php"); require_once("include/groups.inc.php"); @@ -30,7 +31,7 @@ $groups = new groups($nntp,2); ?>

- +

" cellspacing="0" cellpadding="2"> post($message); if ($result) { $spool->delid($id); - $text = "

"._('Message annulé')."

"; + $text = "

"._b_('Message annulé')."

"; } else { - $text = "

"._('Impossible d\'annuler le message')."

"; + $text = "

"._b_('Impossible d\'annuler le message')."

"; } } else { - $text="

\n\t"._('Vous n\'avez pas les permissions pour annuler ce message')."\n

"; + $text="

\n\t"._b_('Vous n\'avez pas les permissions pour annuler ce message')."\n

"; } break; case 'new': @@ -90,9 +90,9 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) && .wrap($body,"",$news['wrap']); $result = $nntp->post($message); if ($result) { - $text="

"._('Message posté')."

"; + $text="

"._b_('Message posté')."

"; } else { - $text="

"._('Impossible de poster le message')."

"; + $text="

"._b_('Impossible de poster le message')."

"; } break; case 'followupok': @@ -117,9 +117,9 @@ if (isset($_REQUEST['action']) && (isset($_REQUEST['type'])) && .wrap($body,"",$news['wrap']); $result = $nntp->post($message); if ($result) { - $text="

"._('Message posté')."

"; + $text="

"._b_('Message posté')."

"; } else { - $text="

"._('Impossible de poster le message')."

"; + $text="

"._b_('Impossible de poster le message')."

"; } break; } @@ -145,13 +145,13 @@ displayshortcuts();
- + - + - +
- +
- + @@ -29,7 +29,7 @@
- + @@ -37,7 +37,7 @@
- + @@ -45,7 +45,7 @@
- + @@ -53,29 +53,29 @@
- +
- +
- +
- +
- + @@ -83,7 +83,7 @@
- + diff --git a/post.php b/post.php index a3273ce..4dfbf06 100644 --- a/post.php +++ b/post.php @@ -66,7 +66,7 @@ if (isset($group) && isset($id) && isset($_REQUEST['type']) && $nntp->quit(); ?>

- +

" cellpadding="0" cellspacing="0" border="0">
- +
- + @@ -91,7 +91,7 @@ displayshortcuts();
- + "> - + "> - + @@ -117,7 +117,7 @@ displayshortcuts();
- + @@ -125,7 +125,7 @@ displayshortcuts();
- +
- + - + - + - +
- + - + - +