Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hamidpeywasti committed Mar 13, 2015
1 parent 944bc3d commit 93c2f1d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"require": {
"php":">=5.3.2",
"contao/core":">=3.2,<=3.4",
"contao/core":">=3.2,<4-dev",
"contao-community-alliance/composer-plugin":"2.*",
"terminal42/contao-changelanguage":">=2.0"
},
Expand Down
1 change: 0 additions & 1 deletion config/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
(
// Modules
'catalog\ModuleCatalogDetail' => 'system/modules/catalog/modules/ModuleCatalogDetail.php',
'catalog\ModuleCatalogRelated' => 'system/modules/catalog/modules/ModuleCatalogRelated.php',
'catalog\ModuleCatalog' => 'system/modules/catalog/modules/ModuleCatalog.php',
'catalog\ModuleCatalogList' => 'system/modules/catalog/modules/ModuleCatalogList.php',

Expand Down
4 changes: 2 additions & 2 deletions languages/en/tl_catalog_product.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
$GLOBALS['TL_LANG']['tl_catalog_product']['alias'] = array('Product alias', 'Please enter the product alias.');
$GLOBALS['TL_LANG']['tl_catalog_product']['model'] = array('Product model', 'Please enter the product model.');
$GLOBALS['TL_LANG']['tl_catalog_product']['date'] = array('Date', 'Please enter the date according to the global date format.');
$GLOBALS['TL_LANG']['tl_catalog_product']['description'] = array('Product description','Here you can enter a short description of the product which will be evaluated by search engines like Google or Yahoo. Search engines usually indicate between 150 and 300 characters.');
$GLOBALS['TL_LANG']['tl_catalog_product']['keywords'] = array('Meta keywords','Here you can enter a list of comma separated keywords. Keywords, however, are no longer relevant to most search engines (including Google).');
$GLOBALS['TL_LANG']['tl_catalog_product']['metaDescription'] = array('Meta description','Here you can enter a short description of the product which will be evaluated by search engines like Google or Yahoo. Search engines usually indicate between 150 and 300 characters.');
$GLOBALS['TL_LANG']['tl_catalog_product']['metaKeywords'] = array('Meta keywords','Here you can enter a list of comma separated keywords. Keywords, however, are no longer relevant to most search engines (including Google).');
$GLOBALS['TL_LANG']['tl_catalog_product']['singleSRC'] = array('Source file','Please select an image.');
$GLOBALS['TL_LANG']['tl_catalog_product']['addEnclosure']= array('Add enclosures', 'Add one or more downloadable files to the news item.');
$GLOBALS['TL_LANG']['tl_catalog_product']['enclosure'] = array('Enclosures', 'Please choose the files you want to attach.');
Expand Down
4 changes: 2 additions & 2 deletions modules/ModuleCatalogDetail.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ protected function compile()
// Overwrite the page description
if ($objProduct->description != '')
{
$objPage->description = $this->prepareMetaDescription($objProduct->description);
$objPage->description = $this->prepareMetaDescription($objProduct->metaDescription);
}

if ($objProduct->keywords != '')
{
$GLOBALS['TL_KEYWORDS'] .= (($GLOBALS['TL_KEYWORDS'] != '') ? ', ' : '') . $objProduct->keywords;
$GLOBALS['TL_KEYWORDS'] .= (($GLOBALS['TL_KEYWORDS'] != '') ? ', ' : '') . $objProduct->metaKeywords;
}

$arrProduct = $this->parseProduct($objProduct);
Expand Down

0 comments on commit 93c2f1d

Please sign in to comment.