--- recipe.module 2007-09-05 19:39:05.000000000 +0200 +++ recipe.module.new 2007-09-08 18:05:53.000000000 +0200 @@ -145,7 +145,7 @@ '#default_value' => $node->body, '#cols' => 60, '#rows' => 2, - '#description' => 'A short description or "teaser" for the recipe.', + '#description' => t('A short description or "teaser" for the recipe.'), '#required' => TRUE, ); $form['yield'] = array( @@ -154,7 +154,7 @@ '#default_value' => $node->yield, '#size' => 10, '#maxlength' => 10, - '#description' => 'The number of servings the recipe will make.', + '#description' => t('The number of servings the recipe will make.'), '#attributes' => NULL, '#required' => TRUE, ); @@ -179,12 +179,12 @@ $system = variable_get('recipe_ingredient_system','complex'); if ($system == 'complex') { $form['ingredients']['headings'] = array( - '#value' => '
'."\n".'', + '#value' => '
QuantityUnitsIngredient Name
'."\n".'', ); } else { $form['ingredients']['headings'] = array( - '#value' => '
'.t('Quantity').''.t('Units').''.t('Ingredient Name').'
'."\n".'', + '#value' => '
Ingredients
'."\n".'', ); } $rows = array(); @@ -341,7 +341,7 @@ '#default_value' => $node->instructions, '#cols' => 60, '#rows' => 10, - '#description' => 'Step by step instructions on how to prepare and cook the recipe.', + '#description' => t('Step by step instructions on how to prepare and cook the recipe.'), ); $form['notes'] = array( '#type' => 'textarea', @@ -377,7 +377,7 @@ ); $form['recipe_recent_box_title'] = array( '#type' => 'textfield', - '#title' => 'Box Title', + '#title' => t('Box Title'), '#default_value' => variable_get('recipe_recent_box_title', t('Latest Recipes')), '#size' => 35, '#maxlength' => 255, @@ -456,7 +456,7 @@ ); $items[] = array( 'path' => 'recipe/ingredient/autocomplete', - 'title' => 'Ingredient autocomplete', + 'title' => t('Ingredient autocomplete'), 'callback' => 'recipe_autocomplete_page', 'type' => MENU_CALLBACK, 'access' => user_access('access content') @@ -469,7 +469,7 @@ ); $items[] = array( 'path' => 'recipe/importolddb', - 'title' => 'import old recipes', + 'title' => t('import old recipes'), 'callback' => 'recipe_import_from_46', 'type' => MENU_SUGGESTED_ITEM, 'access' => user_access('create recipes') @@ -542,7 +542,7 @@ */ function recipe_view(&$node, $teaser = FALSE, $page = FALSE) { if ($page) { - drupal_set_breadcrumb(array(l(t('Home'), ''), l('Recipes', 'recipe'))); + drupal_set_breadcrumb(array(l(t('Home'), ''), l(t('Recipes'), 'recipe'))); drupal_add_css(drupal_get_path('module', 'recipe') . '/recipe.css'); } $node = recipe_node_prepare($node, $teaser); @@ -804,7 +804,7 @@ AND ri.unit_id = u.id AND ri.nid=%d ORDER BY - ri.id', $node->nid); + ri.id', $node->nid); $ingredients = array(); while ($ingredient = db_fetch_object($rs)) { $ingredients[] = $ingredient; @@ -870,7 +870,7 @@ echo call_user_func($export_function, $nid); } else { - drupal_set_message('Unknown export format'); + drupal_set_message(t('Unknown export format')); drupal_not_found(); } } @@ -959,7 +959,7 @@ $ingredient = recipe_parse_ingredient_string($ingredient->name); } if ($ingredient->name && _in_array($ingredient,$ingredients)) { - form_set_error("recipe", "Duplicate ingredients are not allowed."); + form_set_error('recipe', t('Duplicate ingredients are not allowed.')); } else { $ingredients[] = $ingredient; @@ -1440,9 +1440,9 @@ // Construct the summary $summary = '
'.t('Ingredients').'
'; - $summary .= ''; + $summary .= ''; if ($node->source) { - $summary .= ''; + $summary .= ''; } if ($node->preptime) { if ($node->preptime < 60) { @@ -1451,7 +1451,7 @@ else { $preptime = t("!n hours", array ("!n" => recipe_ingredient_quantity_from_decimal($node->preptime / 60))); } - $summary .= ''; + $summary .= ''; } $vocabs = taxonomy_get_vocabularies('recipe'); if (count($vocabs) > 0) { @@ -1618,7 +1618,7 @@ $old = db_query("SELECT * FROM {recipe_old}"); while ($o = db_fetch_object($old)) { db_query("INSERT INTO {recipe} (nid, source, yield, preptime, notes, instructions) VALUES('%d', '%s', '%d', '%d', '%s', '%s')", $o->nid, $o->source, intval($o->yield), $o->preptime, $o->notes, $o->instructions); - $out .= "Imported recipe {$o->nid}
"; + $out .= t("Imported recipe")." {$o->nid}
"; $rcount++; } $out .= "

"; @@ -1628,29 +1628,29 @@ while ($i = db_fetch_object($ings)) { $unitid = 29; // "unknown" $quantity = recipe_ingredient_quantity_from_fraction($i->ingredient); // best guess - $out .= "\n\nParsing {$i->ingredient}\n"; + $out .= "\n\n".t('Parsing')." {$i->ingredient}\n"; $nmatches = preg_match("/([^a-zA-Z]*)([^ ]*) (.*)/", $i->ingredient, $matches); //print_r($matches); if ($nmatches > 0) { $quantity = recipe_ingredient_quantity_from_fraction($matches[1]); $unit = $matches[2]; $name = $matches[3]; - $out .= "looking up unit for '".strtolower($unit)."'\n"; + $out .= t("looking up unit for")." '".strtolower($unit)."'\n"; $unit_rs = db_query("SELECT id FROM {recipe_unit} WHERE '%s' LIKE CONCAT(LOWER(name),'%%') OR abbreviation='%s'", strtolower($unit), $unit); // allow pints to match pint etc if ($unito = db_fetch_object($unit_rs)) { - $out .= "Got unit id ".$unito->id."\n"; + $out .= t("Got unit id")." ".$unito->id."\n"; $unitid = $unito->id; } else { $name = $unit ." ". $name; } } $iid = recipe_ingredient_id_from_name($name); - $out .= "Got id for '{$name}': $iid"; + $out .= t("Got id for")." '{$name}': $iid"; db_query("INSERT INTO {recipe_node_ingredient} (nid, unit_id, quantity, ingredient_id) VALUES('%d', '%d', '%f', '%d')", $i->nid, $unitid, $quantity, $iid); $icount++; } $out .= "

"; - $out .= "

Imported $rcount recipes and $icount ingredients.

"; + $out .= "

".t('Imported !rcount recipes and !icount ingredients.', array('!rcount' => $rcount, '!icount' => $icount))."

"; return $out; }
Yield'.$yield.'
'.t('Yield').''.$yield.'
Source'.$node->source.'
'.t('Source').''.$node->source.'
Prep Time'.$preptime.'
'.t('Prep Time').''.$preptime.'