Skip to content

Commit 8d85b40

Browse files
authored
Merge pull request #3882 from project-koku/release_prod-stable.27123
Deployment commit for prod-stable
2 parents b968240 + db00328 commit 8d85b40

File tree

23 files changed

+464
-586
lines changed

23 files changed

+464
-586
lines changed

locales/data.json

+27-58
Original file line numberDiff line numberDiff line change
@@ -3663,43 +3663,14 @@
36633663
"value": "value"
36643664
}
36653665
],
3666-
"distributeUnallocatedCapacity": [
3666+
"distributePlatformCosts": [
36673667
{
36683668
"options": {
36693669
"false": {
36703670
"value": [
36713671
{
36723672
"type": 0,
3673-
"value": "Do not distribute "
3674-
},
3675-
{
3676-
"options": {
3677-
"other": {
3678-
"value": []
3679-
},
3680-
"platform": {
3681-
"value": [
3682-
{
3683-
"type": 0,
3684-
"value": "platform"
3685-
}
3686-
]
3687-
},
3688-
"worker": {
3689-
"value": [
3690-
{
3691-
"type": 0,
3692-
"value": "worker"
3693-
}
3694-
]
3695-
}
3696-
},
3697-
"type": 5,
3698-
"value": "type"
3699-
},
3700-
{
3701-
"type": 0,
3702-
"value": " unallocated capacity"
3673+
"value": "Do not distribute platform costs"
37033674
}
37043675
]
37053676
},
@@ -3710,36 +3681,34 @@
37103681
"value": [
37113682
{
37123683
"type": 0,
3713-
"value": "Distribute "
3714-
},
3684+
"value": "Distribute platform costs"
3685+
}
3686+
]
3687+
}
3688+
},
3689+
"type": 5,
3690+
"value": "value"
3691+
}
3692+
],
3693+
"distributeUnallocatedCapacity": [
3694+
{
3695+
"options": {
3696+
"false": {
3697+
"value": [
37153698
{
3716-
"options": {
3717-
"other": {
3718-
"value": []
3719-
},
3720-
"platform": {
3721-
"value": [
3722-
{
3723-
"type": 0,
3724-
"value": "platform"
3725-
}
3726-
]
3727-
},
3728-
"worker": {
3729-
"value": [
3730-
{
3731-
"type": 0,
3732-
"value": "worker"
3733-
}
3734-
]
3735-
}
3736-
},
3737-
"type": 5,
3738-
"value": "type"
3739-
},
3699+
"type": 0,
3700+
"value": "Do not distribute worker unallocated capacity"
3701+
}
3702+
]
3703+
},
3704+
"other": {
3705+
"value": []
3706+
},
3707+
"true": {
3708+
"value": [
37403709
{
37413710
"type": 0,
3742-
"value": " unallocated capacity"
3711+
"value": "Distribute worker unallocated capacity"
37433712
}
37443713
]
37453714
}

locales/translations.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@
247247
"discountMinus": "Discount (-)",
248248
"distribute": "Distribute",
249249
"distributeCosts": "{value, select, true {Distribute {type, select, network {network} storage {storage} other {}} costs}false {Do not distribute {type, select, network {network} storage {storage} other {}} costs}other {}}",
250-
"distributeUnallocatedCapacity": "{value, select, true {Distribute {type, select, platform {platform} worker {worker} other {}} unallocated capacity}false {Do not distribute {type, select, platform {platform} worker {worker} other {}} unallocated capacity}other {}}",
250+
"distributePlatformCosts": "{value, select, true {Distribute platform costs}false {Do not distribute platform costs}other {}}",
251+
"distributeUnallocatedCapacity": "{value, select, true {Distribute worker unallocated capacity}false {Do not distribute worker unallocated capacity}other {}}",
251252
"distributionModelDesc": "Choose how your raw costs are distributed at the project level.",
252253
"distributionType": "Distribution type",
253254
"distributionTypeDesc": "{type, select, cpu {Distribute costs based on CPU usage}memory {Distribute costs based on memory usage}other {}}",

0 commit comments

Comments
 (0)