Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AdobeStockAsset/Model/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public function execute(\Magento\AdobeStockAssetApi\Api\Data\RequestInterface $r
$searchParams->setWords($words);
$searchParams->setLimit($request->getData('size'));
$searchParams->setOffset($request->getData('offset'));
$locale = $request->getData('locale');

$resultsColumns = Constants::getResultColumns();
$resultColumnArray = [];
Expand All @@ -54,8 +55,7 @@ public function execute(\Magento\AdobeStockAssetApi\Api\Data\RequestInterface $r

$request = new SearchFilesRequest();

// TODO: Use backend locale for requests
$request->setLocale('En_US');
$request->setLocale($locale);
$request->setSearchParams($searchParams);
$request->setResultColumns($resultColumnArray);

Expand Down
8 changes: 8 additions & 0 deletions AdobeStockAsset/Model/Request/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ public function setSort(array $sort): void
$this->data['sort'] = $sort;
}

/**
* @inheritdoc
*/
public function setLocale(string $locale): void
{
$this->data['locale'] = $locale;
}

/**
* @inheritdoc
*/
Expand Down
1 change: 1 addition & 0 deletions AdobeStockAsset/Model/Request/Builder/Binder.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function bind(array $requestConfig, array $requestData) : array
'offset' => (int) $requestData['offset'] ?? (int) $requestConfig['from'],
'filters' => $this->buildFilters($requestData['placeholder'] ?? [] , $requestConfig['filters']),
'resultColumns' => $requestData['resultColumns'] ?? $requestConfig['resultColumns'],
'locale' => (string) $requestData['locale'] ?? (string) $requestConfig['locale'],
];
}

Expand Down
8 changes: 8 additions & 0 deletions AdobeStockAssetApi/Api/RequestBuilderInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ public function setOffset(int $offset) : void;
*/
public function setSort(array $sort) : void;

/**
* Set locale
*
* @param string $locale
* @return void
*/
public function setLocale(string $locale) : void;

/**
* Bind value to placeholder
*
Expand Down
11 changes: 10 additions & 1 deletion AdobeStockImage/Model/GetImageList.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Magento\Ui\DataProvider\SearchResultFactory;
use Magento\AdobeStockAssetApi\Api\ClientInterface;
use Magento\AdobeStockAssetApi\Api\RequestBuilderInterface;
use Magento\Framework\Locale\ResolverInterface;

/**
* Class GetImageList
Expand All @@ -38,6 +39,11 @@ class GetImageList implements GetImageListInterface
*/
private $requestBuilder;

/**
* @var ResolverInterface
*/
private $localeResolver;

/**
* GetImageList constructor.
* @param ClientInterface $client
Expand All @@ -49,12 +55,14 @@ public function __construct(
ClientInterface $client,
ImageInterfaceFactory $imageFactory,
SearchResultFactory $searchResultFactory,
RequestBuilderInterface $requestBuilder
RequestBuilderInterface $requestBuilder,
ResolverInterface $localeResolver
) {
$this->imageFactory = $imageFactory;
$this->searchResultFactory = $searchResultFactory;
$this->client = $client;
$this->requestBuilder = $requestBuilder;
$this->localeResolver = $localeResolver;
}

/**
Expand All @@ -66,6 +74,7 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultsI
$this->requestBuilder->setName('adobe_stock_image_search');
$this->requestBuilder->setSize($searchCriteria->getPageSize());
$this->requestBuilder->setOffset($searchCriteria->getCurrentPage());
$this->requestBuilder->setLocale($this->localeResolver->getLocale());
$this->applyFilters($searchCriteria);
$request = $this->requestBuilder->create();

Expand Down