TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur

Browse Source 
Fixed issue #123. Introduced NumberFormat::formatStandardNumber()

Adding translation for Backoffice

Adding translation for Backoffice

fix close #131

fix updatePositionDownTest

Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
This commit is contained in:
Franck Allimant
2013-12-05 18:08:36 +01:00
committed by gmorel
parent 5857c07ef0
commit bf64cd117e
22 changed files with 350 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Controller/Admin/HomeController.php
View File

@@ -41,6 +41,8 @@ class HomeController extends BaseAdminController
public function loadStatsAjaxAction()
{
if (null !== $response = $this->checkAuth(self::RESOURCE_CODE, array(), AccessManager::VIEW)) return $response;
$data = new \stdClass();
$data->title = "Stats on " . $this->getRequest()->query->get('month', date('m')) . "/" . $this->getRequest()->query->get('year', date('Y'));

11
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -1201,10 +1201,10 @@ class ProductController extends AbstractCrudController
}
return new JsonResponse(array(
'price_with_tax' => NumberFormat::getInstance($this->getRequest())->format($price_with_tax, null, '.'),
'price_without_tax' => NumberFormat::getInstance($this->getRequest())->format($price_without_tax, null, '.'),
'sale_price_with_tax' => NumberFormat::getInstance($this->getRequest())->format($sale_price_with_tax, null, '.'),
'sale_price_without_tax' => NumberFormat::getInstance($this->getRequest())->format($sale_price_without_tax, null, '.')
'price_with_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($price_with_tax),
'price_without_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($price_without_tax),
'sale_price_with_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($sale_price_with_tax),
'sale_price_without_tax' => NumberFormat::getInstance($this->getRequest())->formatStandardNumber($sale_price_without_tax)
));
}
@@ -1236,7 +1236,8 @@ class ProductController extends AbstractCrudController
if ($convert != 0) {
$return_price = $prix * Currency::getDefaultCurrency()->getRate();
}
// Format the number using '.', to perform further calculation
return NumberFormat::getInstance($this->getRequest())->format($return_price, null, '.');
return NumberFormat::getInstance($this->getRequest())->formatStandardNumber($return_price);
}
}

4
core/lib/Thelia/Controller/Admin/TranslationsController.php
View File

@@ -94,6 +94,10 @@ class TranslationsController extends BaseAdminController
case 'pf' :
$template = new TemplateDefinition($item_id, TemplateDefinition::PDF);
break;
case 'ma' :
$template = new TemplateDefinition($item_id, TemplateDefinition::EMAIL);
break;
}
if ($template) {