From 83a739bd898094af5837d2b29863d8e988929e1b Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 18 Aug 2004 19:57:27 +0000
Subject: - Code improvements by Stefan: made all status messages consistent
 (and easier to translate).

---
 modules/drupal/drupal.module | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules/drupal/drupal.module')

diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index 05bdcf9df..bae7ebfbd 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -29,13 +29,13 @@ function drupal_help($section) {
 function drupal_settings() {
   // Check if all required fields are present for the Drupal directory
   if ((variable_get('site_name', 'drupal') == 'drupal') || (variable_get('site_name', 'drupal') == ''))
-    form_set_error('drupal_directory', t("You must set your site's name on the <a href=\"%url\">administer &raquo; settings</a> page.", array('%url' => url('admin/settings'))));
+    form_set_error('drupal_directory', t('You must set the name of your site on the <a href="%url">administer &raquo; settings</a> page.', array('%url' => url('admin/settings'))));
   else if (variable_get('site_mail', ini_get('sendmail_from')) == '')
-    form_set_error('drupal_directory', t("You must set your site's e-mail address on the <a href=\"%url\">administer &raquo; settings</a> page.", array('%url' => url('admin/settings'))));
+    form_set_error('drupal_directory', t('You must set an e-mail address for your site on the <a href="%url">administer &raquo; settings</a> page.', array('%url' => url('admin/settings'))));
   else if (variable_get('site_slogan', '') == '')
-    form_set_error('drupal_directory', t("You must set your site's slogan on the <a href=\"%url\">administer &raquo; settings</a> page.", array('%url' => url('admin/settings'))));
+    form_set_error('drupal_directory', t('You must set your site slogan on the <a href="%url">administer &raquo; settings</a> page.', array('%url' => url('admin/settings'))));
   else if (variable_get('site_mission', '') == '')
-    form_set_error('drupal_directory', t("You must set your site's mission on the <a href=\"%url\">administer &raquo; settings</a> page.", array('%url' => url('admin/settings'))));
+    form_set_error('drupal_directory', t('You must set your site mission on the <a href="%url">administer &raquo; settings</a> page.' , array('%url' => url('admin/settings'))));
 
   $output = form_textfield(t('Drupal XML-RPC server'), 'drupal_server', variable_get('drupal_server', 'http://www.drupal.org/xmlrpc.php'), 55, 128, t('The URL of your root Drupal XML-RPC server.'));
   $output .= form_radios(t('Drupal directory'), 'drupal_directory', variable_get('drupal_directory', 0), array(t('Disabled'), t('Enabled')), t("If enabled, your Drupal site will make itself known to the Drupal directory at the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will get listed on the <a href=\"%drupal-sites\">Drupal sites</a> page. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://www.drupal.org/xmlrpc.php", "%drupal-sites" => "http://www.drupal.org/sites/")));
@@ -90,7 +90,7 @@ function drupal_directory_ping($arguments) {
     db_query("DELETE FROM {directory} WHERE link = '%s' OR mail = '%s'", $link, $mail);
     db_query("INSERT INTO {directory} (link, name, mail, slogan, mission, timestamp) VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $link, $name, $mail, $slogan, $mission, time());
 
-    watchdog('regular', t('directory: ping from "%name" (%link)', array('%name' => $name, '%link' => $link)));
+    watchdog('regular', t('Directory: ping from %name (%link).', array('%name' => "<em>$name</em>", '%link' => "<em>$link</em>")));
 
     return new xmlrpcresp(new xmlrpcval(1, 'int'));
   }
@@ -138,7 +138,7 @@ function drupal_notify($server) {
   $result = $client->send($message, 5);
 
   if (!$result || $result->faultCode()) {
-    watchdog('error', t('failed to notify "%url" at "%path": %error', array('%url' => $url["host"], '%path' => $url["path"], '%error' => $result->faultString())));
+    watchdog('error', t('Failed to notify %url at %path: %error.', array('%url' => '<em>'. $url["host"] .'</em>', '%path' => '<em>'. $url["path"] .'</em>', '%error' => '<em>'. $result->faultString() .'</em>')));
   }
 
 }
-- 
cgit v1.2.3