command: diff uc_catalog.module 951760-uc_catalog.module 226,228c226,231 < if (count($terms)) { < $crumbs[] = l(variable_get('uc_catalog_name', t('Catalog')), 'catalog'); < $used_tids = array(); --- > if (count($terms)) { > $catalog_name = variable_get('uc_catalog_name', 'Catalog'); > $catalog_id = variable_get('uc_catalog_vid', '1'); > $translated_name = tt("taxonomy:vocabulary:$catalog_id:name", $catalog_name, NULL, FALSE); > $crumbs[] = l($translated_name, variable_get('uc_catalog_url', 'catalog')); > $used_tids = array(); 234a238,243 > > $parent->name = tt("taxonomy:term:$parent->tid:name", $parent->name, NULL, FALSE); > if ($parent->description){ > $parent->description = tt("taxonomy:term:$parent->tid:description", $parent->description, NULL, FALSE); > } > 434a444,447 > $catalog_name = variable_get('uc_catalog_name', 'Catalog'); > $catalog_id = variable_get('uc_catalog_vid', '1'); > $subject = tt("taxonomy:vocabulary:$catalog_id:name", $catalog_name, NULL, FALSE); > 638,639c651,652 < $name = $term->name; < $description = $term->description; --- > $name = tt("taxonomy:term:$tid:name", $term->name, NULL, FALSE); > $description = tt("taxonomy:term:$tid:description", $term->description, NULL, FALSE); 643,644c656,661 < $name = variable_get('uc_catalog_name', t('Catalog')); < $description = variable_get('uc_catalog_description', ''); --- > $catalog_name = variable_get('uc_catalog_name', 'Catalog'); > $catalog_id = variable_get('uc_catalog_vid', '1'); > $name = tt("taxonomy:vocabulary:$catalog_id:name", $catalog_name, NULL, FALSE); > > $descr = variable_get('uc_catalog_description', ''); > $description = tt("taxonomy:vocabulary:$catalog_id:description", $descr, NULL, FALSE); 665c682 < $child->nodes = $n; --- > 809c826,829 < $breadcrumbs[] = l(variable_get('uc_catalog_name', t('Catalog')), 'catalog'); --- > $catalog_name = variable_get('uc_catalog_name', 'Catalog'); > $catalog_id = variable_get('uc_catalog_vid', '1'); > $translated_name = tt("taxonomy:vocabulary:$catalog_id:name", $catalog_name, NULL, FALSE); > $breadcrumbs[] = l($translated_name, variable_get('uc_catalog_url', 'catalog')); 817a838,844 > > /// translate term names in the breadcrumb > $current->name = tt("taxonomy:term:$current->tid:name", $current->name, NULL, FALSE); > if ($current->description) { > $current->description = tt("taxonomy:term:$current->tid:description", $current->description, NULL, FALSE); > } > 856a884,890 > if ($branch->tid) { > $branch->name = tt("taxonomy:term:$branch->tid:name", $branch->name, NULL, TRUE); > if ($branch->description) { > $branch->description = tt("taxonomy:term:$branch->tid:description", $branch->description, NULL, FALSE); > } > } > 868c902 < return array(FALSE, ''); --- > return array(FALSE, ''); 870c904 < --- > 1010a1045 > ==================================================================================================================== diff uc_catalog.pages.inc 951760-uc_catalog.pages.inc 25a26,43 > > /// translate catalog name and desc on the catalog page and category name and desc on a category page > //check if we are on the catalog or on the category page > if (!$catalog->tid) { > //if on catalog page > $catalog->name = tt("taxonomy:vocabulary:$catalog->vid:name", $catalog->name, NULL, FALSE); > if ($catalog->description) { > $catalog->description = tt("taxonomy:vocabulary:$catalog->vid:description", $catalog->description, NULL, FALSE); > } > } > else { > //if on category (term) page > $catalog->name = tt("taxonomy:term:$catalog->tid:name", $catalog->name, NULL, FALSE); > if ($catalog->description) { > $catalog->description = tt("taxonomy:term:$catalog->tid:description", $catalog->description, NULL, FALSE); > } > } > 32c50,59 < if (!empty($child->nodes)) { --- > > > /// translate term names in catalog > $child->name = tt("taxonomy:term:$child->tid:name", $child->name, NULL, FALSE); > if ($child->description) { > $child->description = tt("taxonomy:term:$child->tid:description", $child->description, NULL, FALSE); > } > > > if (!empty($child->nodes)) { 61a89,92 > > // TRANSLATE CATEGORIES IN CATALOG PAGE > $grandchild->name = tt("taxonomy:term:$grandchild->tid:name", $grandchild->name, NULL, FALSE); >