Skip to content

Commit 89d6cda

Browse files
romanhavrylkoromanhavrylko
authored
CC-13273: Display numbers in Zed based on the current user locale. (#8889)
CC-13273: Display numbers in Zed for users.
1 parent 06aa7e4 commit 89d6cda

11 files changed

Lines changed: 84 additions & 272 deletions

‎architecture-baseline.json‎

Lines changed: 0 additions & 210 deletions
Large diffs are not rendered by default.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "proprietary",
66
"require": {
77
"php": ">=7.4",
8-
"spryker/gui": "^3.0.0",
8+
"spryker/gui": "^3.45.0",
99
"spryker/kernel": "^3.30.0",
1010
"spryker/locale": "^3.0.0",
1111
"spryker/product": "^5.2.0 || ^6.0.0",

‎src/Spryker/Zed/ProductAttributeGui/Communication/Table/AttributeTable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected function prepareData(TableConfiguration $config)
9797
$productAbstractCollection = [];
9898
foreach ($queryResults as $item) {
9999
$productAbstractCollection[] = [
100-
static::COL_ID_PRODUCT_MANAGEMENT_ATTRIBUTE => $item[static::COL_ID_PRODUCT_MANAGEMENT_ATTRIBUTE],
100+
static::COL_ID_PRODUCT_MANAGEMENT_ATTRIBUTE => $this->formatInt($item[static::COL_ID_PRODUCT_MANAGEMENT_ATTRIBUTE]),
101101
SpyProductAttributeKeyTableMap::COL_KEY => $item[SpyProductAttributeKeyTableMap::COL_KEY],
102102
SpyProductAttributeKeyTableMap::COL_IS_SUPER => $item[SpyProductAttributeKeyTableMap::COL_IS_SUPER],
103103
static::COL_INPUT_TYPE => $item[static::COL_INPUT_TYPE],

‎src/Spryker/Zed/ProductAttributeGui/Dependency/Facade/ProductAttributeGuiToLocaleBridge.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace Spryker\Zed\ProductAttributeGui\Dependency\Facade;
99

10+
use Generated\Shared\Transfer\LocaleTransfer;
11+
1012
class ProductAttributeGuiToLocaleBridge implements ProductAttributeGuiToLocaleInterface
1113
{
1214
/**
@@ -25,7 +27,7 @@ public function __construct($localeFacade)
2527
/**
2628
* @return \Generated\Shared\Transfer\LocaleTransfer
2729
*/
28-
public function getCurrentLocale()
30+
public function getCurrentLocale(): LocaleTransfer
2931
{
3032
return $this->localeFacade->getCurrentLocale();
3133
}
@@ -35,7 +37,7 @@ public function getCurrentLocale()
3537
*
3638
* @return \Generated\Shared\Transfer\LocaleTransfer
3739
*/
38-
public function getLocale($localeName)
40+
public function getLocale($localeName): LocaleTransfer
3941
{
4042
return $this->localeFacade->getLocale($localeName);
4143
}
@@ -45,15 +47,15 @@ public function getLocale($localeName)
4547
*
4648
* @return bool
4749
*/
48-
public function hasLocale($localeName)
50+
public function hasLocale($localeName): bool
4951
{
5052
return $this->localeFacade->hasLocale($localeName);
5153
}
5254

5355
/**
5456
* @return array<\Generated\Shared\Transfer\LocaleTransfer>
5557
*/
56-
public function getLocaleCollection()
58+
public function getLocaleCollection(): array
5759
{
5860
return $this->localeFacade->getLocaleCollection();
5961
}
@@ -63,7 +65,7 @@ public function getLocaleCollection()
6365
*
6466
* @return \Generated\Shared\Transfer\LocaleTransfer
6567
*/
66-
public function getLocaleById($idLocale)
68+
public function getLocaleById($idLocale): LocaleTransfer
6769
{
6870
return $this->localeFacade->getLocaleById($idLocale);
6971
}

‎src/Spryker/Zed/ProductAttributeGui/Dependency/Facade/ProductAttributeGuiToLocaleInterface.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,33 @@
77

88
namespace Spryker\Zed\ProductAttributeGui\Dependency\Facade;
99

10+
use Generated\Shared\Transfer\LocaleTransfer;
11+
1012
interface ProductAttributeGuiToLocaleInterface
1113
{
1214
/**
1315
* @return \Generated\Shared\Transfer\LocaleTransfer
1416
*/
15-
public function getCurrentLocale();
17+
public function getCurrentLocale(): LocaleTransfer;
1618

1719
/**
1820
* @param string $localeName
1921
*
2022
* @return \Generated\Shared\Transfer\LocaleTransfer
2123
*/
22-
public function getLocale($localeName);
24+
public function getLocale($localeName): LocaleTransfer;
2325

2426
/**
2527
* @param string $localeName
2628
*
2729
* @return bool
2830
*/
29-
public function hasLocale($localeName);
31+
public function hasLocale($localeName): bool;
3032

3133
/**
3234
* @return array<\Generated\Shared\Transfer\LocaleTransfer>
3335
*/
34-
public function getLocaleCollection();
36+
public function getLocaleCollection(): array;
3537

3638
/**
3739
* @param int $idLocale
@@ -40,5 +42,5 @@ public function getLocaleCollection();
4042
*
4143
* @return \Generated\Shared\Transfer\LocaleTransfer
4244
*/
43-
public function getLocaleById($idLocale);
45+
public function getLocaleById($idLocale): LocaleTransfer;
4446
}

‎src/Spryker/Zed/ProductAttributeGui/Dependency/Facade/ProductAttributeGuiToProductAttributeBridge.php‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Spryker\Zed\ProductAttributeGui\Dependency\Facade;
99

1010
use Generated\Shared\Transfer\LocaleTransfer;
11+
use Generated\Shared\Transfer\LocalizedProductManagementAttributeKeyTransfer;
1112
use Generated\Shared\Transfer\ProductManagementAttributeTransfer;
1213

1314
class ProductAttributeGuiToProductAttributeBridge implements ProductAttributeGuiToProductAttributeInterface
@@ -30,7 +31,7 @@ public function __construct($productAttributeFacade)
3031
*
3132
* @return array
3233
*/
33-
public function getProductAbstractAttributes($idProductAbstract)
34+
public function getProductAbstractAttributes($idProductAbstract): array
3435
{
3536
return $this->productAttributeFacade->getProductAbstractAttributeValues($idProductAbstract);
3637
}
@@ -40,7 +41,7 @@ public function getProductAbstractAttributes($idProductAbstract)
4041
*
4142
* @return array
4243
*/
43-
public function getProductAttributeValues($idProduct)
44+
public function getProductAttributeValues($idProduct): array
4445
{
4546
return $this->productAttributeFacade->getProductAttributeValues($idProduct);
4647
}
@@ -50,7 +51,7 @@ public function getProductAttributeValues($idProduct)
5051
*
5152
* @return array
5253
*/
53-
public function getMetaAttributesForProductAbstract($idProductAbstract)
54+
public function getMetaAttributesForProductAbstract($idProductAbstract): array
5455
{
5556
return $this->productAttributeFacade->getMetaAttributesForProductAbstract($idProductAbstract);
5657
}
@@ -60,7 +61,7 @@ public function getMetaAttributesForProductAbstract($idProductAbstract)
6061
*
6162
* @return array
6263
*/
63-
public function getMetaAttributesForProduct($idProduct)
64+
public function getMetaAttributesForProduct($idProduct): array
6465
{
6566
return $this->productAttributeFacade->getMetaAttributesForProduct($idProduct);
6667
}
@@ -71,7 +72,7 @@ public function getMetaAttributesForProduct($idProduct)
7172
*
7273
* @return array
7374
*/
74-
public function suggestKeys($searchText = '', $limit = 10)
75+
public function suggestKeys($searchText = '', $limit = 10): array
7576
{
7677
return $this->productAttributeFacade->suggestKeys($searchText, $limit);
7778
}
@@ -82,7 +83,7 @@ public function suggestKeys($searchText = '', $limit = 10)
8283
*
8384
* @return void
8485
*/
85-
public function saveAbstractAttributes($idProductAbstract, array $attributes)
86+
public function saveAbstractAttributes($idProductAbstract, array $attributes): void
8687
{
8788
$this->productAttributeFacade->saveAbstractAttributes($idProductAbstract, $attributes);
8889
}
@@ -93,7 +94,7 @@ public function saveAbstractAttributes($idProductAbstract, array $attributes)
9394
*
9495
* @return void
9596
*/
96-
public function saveConcreteAttributes($idProduct, array $attributes)
97+
public function saveConcreteAttributes($idProduct, array $attributes): void
9798
{
9899
$this->productAttributeFacade->saveConcreteAttributes($idProduct, $attributes);
99100
}
@@ -103,7 +104,7 @@ public function saveConcreteAttributes($idProduct, array $attributes)
103104
*
104105
* @return array
105106
*/
106-
public function extractKeysFromAttributes(array $attributes)
107+
public function extractKeysFromAttributes(array $attributes): array
107108
{
108109
return $this->productAttributeFacade->extractKeysFromAttributes($attributes);
109110
}
@@ -113,7 +114,7 @@ public function extractKeysFromAttributes(array $attributes)
113114
*
114115
* @return array
115116
*/
116-
public function extractValuesFromAttributes(array $attributes)
117+
public function extractValuesFromAttributes(array $attributes): array
117118
{
118119
return $this->productAttributeFacade->extractValuesFromAttributes($attributes);
119120
}
@@ -125,7 +126,7 @@ public function extractValuesFromAttributes(array $attributes)
125126
*
126127
* @return int
127128
*/
128-
public function getAttributeValueSuggestionsCount($idProductManagementAttribute, $idLocale, $searchText = '')
129+
public function getAttributeValueSuggestionsCount($idProductManagementAttribute, $idLocale, $searchText = ''): int
129130
{
130131
return $this->productAttributeFacade->getAttributeValueSuggestionsCount($idProductManagementAttribute, $idLocale, $searchText);
131132
}
@@ -145,7 +146,7 @@ public function getAttributeValueSuggestions(
145146
$searchText = '',
146147
$offset = 0,
147148
$limit = 10
148-
) {
149+
): array {
149150
return $this->productAttributeFacade->getAttributeValueSuggestions(
150151
$idProductManagementAttribute,
151152
$idLocale,
@@ -160,15 +161,15 @@ public function getAttributeValueSuggestions(
160161
*
161162
* @return \Generated\Shared\Transfer\ProductManagementAttributeTransfer|null
162163
*/
163-
public function getProductManagementAttribute($idProductManagementAttribute)
164+
public function getProductManagementAttribute($idProductManagementAttribute): ?ProductManagementAttributeTransfer
164165
{
165166
return $this->productAttributeFacade->getProductManagementAttribute($idProductManagementAttribute);
166167
}
167168

168169
/**
169170
* @return array
170171
*/
171-
public function getAttributeAvailableTypes()
172+
public function getAttributeAvailableTypes(): array
172173
{
173174
return $this->productAttributeFacade->getAttributeAvailableTypes();
174175
}
@@ -178,7 +179,7 @@ public function getAttributeAvailableTypes()
178179
*
179180
* @return \Generated\Shared\Transfer\ProductManagementAttributeTransfer
180181
*/
181-
public function createProductManagementAttribute(ProductManagementAttributeTransfer $productManagementAttributeTransfer)
182+
public function createProductManagementAttribute(ProductManagementAttributeTransfer $productManagementAttributeTransfer): ProductManagementAttributeTransfer
182183
{
183184
return $this->productAttributeFacade->createProductManagementAttribute($productManagementAttributeTransfer);
184185
}
@@ -189,7 +190,7 @@ public function createProductManagementAttribute(ProductManagementAttributeTrans
189190
*
190191
* @return \Generated\Shared\Transfer\LocalizedProductManagementAttributeKeyTransfer|null
191192
*/
192-
public function findAttributeTranslationByKey($attributeKey, LocaleTransfer $localeTransfer)
193+
public function findAttributeTranslationByKey($attributeKey, LocaleTransfer $localeTransfer): ?LocalizedProductManagementAttributeKeyTransfer
193194
{
194195
return $this->productAttributeFacade->findAttributeTranslationByKey($attributeKey, $localeTransfer);
195196
}
@@ -201,7 +202,7 @@ public function findAttributeTranslationByKey($attributeKey, LocaleTransfer $loc
201202
*/
202203
public function translateProductManagementAttribute(
203204
ProductManagementAttributeTransfer $productManagementAttributeTransfer
204-
) {
205+
): void {
205206
$this->productAttributeFacade->translateProductManagementAttribute($productManagementAttributeTransfer);
206207
}
207208

@@ -211,7 +212,7 @@ public function translateProductManagementAttribute(
211212
*
212213
* @return array
213214
*/
214-
public function suggestUnusedAttributeKeys($searchText = '', $limit = 10)
215+
public function suggestUnusedAttributeKeys($searchText = '', $limit = 10): array
215216
{
216217
return $this->productAttributeFacade->suggestUnusedAttributeKeys($searchText, $limit);
217218
}
@@ -223,7 +224,7 @@ public function suggestUnusedAttributeKeys($searchText = '', $limit = 10)
223224
*/
224225
public function updateProductManagementAttribute(
225226
ProductManagementAttributeTransfer $productManagementAttributeTransfer
226-
) {
227+
): ProductManagementAttributeTransfer {
227228
return $this->productAttributeFacade->updateProductManagementAttribute($productManagementAttributeTransfer);
228229
}
229230
}

0 commit comments

Comments
 (0)