Merge remote-tracking branch 'origin/prod-beta' into prod-stable

project-koku · Jun 22, 2023 · ad0b22b · ad0b22b
2 parents a01cb29 + 60cff01
commit ad0b22b
Show file tree

Hide file tree

Showing 36 changed files with 809 additions and 1,285 deletions.
diff --git a/locales/data.json b/locales/data.json
@@ -3071,6 +3071,12 @@
         "value": "groupBy"
       }
     ],
+    "detailsUnusedCapacityLabel": [
+      {
+        "type": 0,
+        "value": "Unused capacity"
+      }
+    ],
     "detailsUnusedRequestsLabel": [
       {
         "type": 0,
@@ -3095,12 +3101,6 @@
         "value": "% of capacity)"
       }
     ],
-    "detailsUnusedUsageLabel": [
-      {
-        "type": 0,
-        "value": "Unused capacity"
-      }
-    ],
     "detailsUsageCapacity": [
       {
         "type": 0,
@@ -11826,6 +11826,14 @@
               }
             ]
           },
+          "core": {
+            "value": [
+              {
+                "type": 0,
+                "value": "core"
+              }
+            ]
+          },
           "core_hours": {
             "value": [
               {
@@ -11932,6 +11940,24 @@
         "value": "Usage cost"
       }
     ],
+    "usageSubtitle": [
+      {
+        "type": 1,
+        "value": "count"
+      },
+      {
+        "type": 0,
+        "value": " "
+      },
+      {
+        "type": 1,
+        "value": "countUnits"
+      },
+      {
+        "type": 0,
+        "value": " maximum"
+      }
+    ],
     "various": [
       {
         "type": 0,

diff --git a/locales/translations.json b/locales/translations.json
@@ -213,9 +213,9 @@
   "detailsMoreClusters": ", {value} more...",
   "detailsResourceNames": "{value, select, account {Account names} aws_category {Cost category names} cluster {Cluster names} gcp_project {GCP project names} group {Group} name {Name} node {Node names} org_unit_id {Organizational unit names} payer_tenant_id {Account names} product_service {Service names} project {Project names} region {Region names} resource_location {Region names} service {Service names} service_name {Service names} status {Status} subscription_guid {Account names} source_type {Source type} tag {Tag names} other {}}",
   "detailsSummaryModalTitle": "{groupBy, select, account {{name} accounts} aws_category {{name} cost categories} cluster {{name} clusters} gcp_project {{name} GCP projects} node {{name} nodes} org_unit_id {{name} organizational units} payer_tenant_id {{name} accounts} product_service {{name} services} project {{name} projects} region {{name} regions} resource_location {{name} regions} service {{name} services} service_name {{name} services} subscription_guid {{name} accounts} tag {{name} tags} other {}}",
+  "detailsUnusedCapacityLabel": "Unused capacity",
   "detailsUnusedRequestsLabel": "Unrequested capacity",
   "detailsUnusedUnits": "{units} ({percentage}% of capacity)",
-  "detailsUnusedUsageLabel": "Unused capacity",
   "detailsUsageCapacity": "Capacity - {value} {units}",
   "detailsUsageLimit": "Limit - {value} {units}",
   "detailsUsageRequests": "Requests - {value} {units}",
@@ -543,10 +543,11 @@
   "toolBarPriceListMeasurementPlaceHolder": "Filter by measurements",
   "toolBarPriceListMetricPlaceHolder": "Filter by metrics",
   "unitTooltips": "{units, select, byte_ms {{value} Byte-ms} core_hours {{value} core-hours} gb {{value} GB} gb_hours {{value} GB-hours} gb_mo {{value} GB-month} gb_ms {{value} GB-ms} gibibyte_month {{value} GiB-month} hour {{value} hours} hrs {{value} hours} ms {{value} milliseconds} vm_hours {{value} VM-hours} other {{value}}}",
-  "units": "{units, select, byte_ms {Byte-ms} core_hours {core-hours} gb {GB} gb_hours {GB-hours} gb_mo {GB-month} gb_ms {GB-ms} gibibyte_month {GiB-month} hour {hours} hrs {hours} ms {milliseconds} vm_hours {VM-hours} other {}}",
+  "units": "{units, select, byte_ms {Byte-ms} core {core} core_hours {core-hours} gb {GB} gb_hours {GB-hours} gb_mo {GB-month} gb_ms {GB-ms} gibibyte_month {GiB-month} hour {hours} hrs {hours} ms {milliseconds} vm_hours {VM-hours} other {}}",
   "usage": "Usage",
   "usageCostDesc": "The portion of cost calculated by applying hourly and/or monthly price list rates to metrics.",
   "usageCostTitle": "Usage cost",
+  "usageSubtitle": "{count} {countUnits} maximum",
   "various": "Various",
   "volumeTitle": "Volume",
   "workerUnallocated": "Worker unallocated",