Merge pull request #3415 from project-koku/release_prod-beta.42724

Deployment commit for prod-beta
project-koku · Oct 2, 2023 · 5e7791f · 5e7791f
2 parents 2ade9dd + 936cebb
commit 5e7791f
Show file tree

Hide file tree

Showing 149 changed files with 1,205 additions and 11,975 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,3 +12,5 @@ updates:
       - "dependency-bot"
     commit-message:
       prefix: "(chore)"
+    pull-request-branch-name:
+      separator: "_"
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,27 @@
+# https://github.com/marketplace/actions/close-stale-issues
+
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          days-before-issue-close: 14
+          days-before-issue-stale: 30
+          days-before-pr-close: 14
+          days-before-pr-stale: 30
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          close-pr-message: "This PR was closed because it has been inactive for 14 days since being marked as stale."
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          stale-pr-message: "This PR is stale because it has been open for 30 days with no activity."
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/locales/data.json b/locales/data.json
@@ -10855,6 +10855,12 @@
         "value": "RHEL - Cost Management | OpenShift"
       }
     ],
+    "pageTitleSettings": [
+      {
+        "type": 0,
+        "value": "Settings - Cost Management | OpenShift"
+      }
+    ],
     "paginationTitle": [
       {
         "options": {
@@ -11549,12 +11555,123 @@
         "value": "Settings for Cost Management were replaced with new values"
       }
     ],
+    "settingsSuccessTags": [
+      {
+        "options": {
+          "disable": {
+            "value": [
+              {
+                "offset": 0,
+                "options": {
+                  "one": {
+                    "value": [
+                      {
+                        "type": 1,
+                        "value": "count"
+                      },
+                      {
+                        "type": 0,
+                        "value": " tag disabled"
+                      }
+                    ]
+                  },
+                  "other": {
+                    "value": [
+                      {
+                        "type": 1,
+                        "value": "count"
+                      },
+                      {
+                        "type": 0,
+                        "value": " tags disabled"
+                      }
+                    ]
+                  }
+                },
+                "pluralType": "cardinal",
+                "type": 6,
+                "value": "count"
+              }
+            ]
+          },
+          "enable": {
+            "value": [
+              {
+                "offset": 0,
+                "options": {
+                  "one": {
+                    "value": [
+                      {
+                        "type": 1,
+                        "value": "count"
+                      },
+                      {
+                        "type": 0,
+                        "value": " tag enabled"
+                      }
+                    ]
+                  },
+                  "other": {
+                    "value": [
+                      {
+                        "type": 1,
+                        "value": "count"
+                      },
+                      {
+                        "type": 0,
+                        "value": " tags enabled"
+                      }
+                    ]
+                  }
+                },
+                "pluralType": "cardinal",
+                "type": 6,
+                "value": "count"
+              }
+            ]
+          },
+          "other": {
+            "value": []
+          }
+        },
+        "type": 5,
+        "value": "value"
+      }
+    ],
     "settingsSuccessTitle": [
       {
         "type": 0,
         "value": "Application settings saved"
       }
     ],
+    "settingsTagsErrorDesc": [
+      {
+        "type": 0,
+        "value": "You currently have "
+      },
+      {
+        "type": 1,
+        "value": "value"
+      },
+      {
+        "type": 0,
+        "value": " tags enabled"
+      }
+    ],
+    "settingsTagsErrorTitle": [
+      {
+        "type": 0,
+        "value": "You can not enable more than "
+      },
+      {
+        "type": 1,
+        "value": "value"
+      },
+      {
+        "type": 0,
+        "value": " tags total"
+      }
+    ],
     "settingsTitle": [
       {
         "type": 0,
@@ -12103,15 +12220,15 @@
     "usageSubtitle": [
       {
         "type": 1,
-        "value": "count"
+        "value": "value"
       },
       {
         "type": 0,
         "value": " "
       },
       {
         "type": 1,
-        "value": "countUnits"
+        "value": "units"
       },
       {
         "type": 0,

diff --git a/locales/translations.json b/locales/translations.json
@@ -458,6 +458,7 @@
   "pageTitleOptimizations": "Optimizations - Cost Management | OpenShift",
   "pageTitleOverview": "Overview - Cost Management | OpenShift",
   "pageTitleRhel": "RHEL - Cost Management | OpenShift",
+  "pageTitleSettings": "Settings - Cost Management | OpenShift",
   "paginationTitle": "{placement, select, top {{title} top pagination} bottom {{title} bottom pagination} other {{title} pagination}}",
   "percent": "{value} %",
   "percentOfCost": "{value} % of cost",
@@ -519,7 +520,10 @@
   "settingsSuccessChanges": "Changes will be reflected in report summarizations within 24 hours",
   "settingsSuccessCostCategoryKeys": "{value, select, enable {{count, plural, one {{count} cost category key enabled} other {{count} cost category keys enabled}}} disable {{count, plural, one {{count} cost category key disabled} other {{count} cost category keys disabled}}} other {}}",
   "settingsSuccessDesc": "Settings for Cost Management were replaced with new values",
+  "settingsSuccessTags": "{value, select, enable {{count, plural, one {{count} tag enabled} other {{count} tags enabled}}} disable {{count, plural, one {{count} tag disabled} other {{count} tags disabled}}} other {}}",
   "settingsSuccessTitle": "Application settings saved",
+  "settingsTagsErrorDesc": "You currently have {value} tags enabled",
+  "settingsTagsErrorTitle": "You can not enable more than {value} tags total",
   "settingsTitle": "Cost Management Settings",
   "sinceDate": "{dateRange}",
   "sourceType": "Source type",
@@ -552,7 +556,7 @@
   "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",
+  "usageSubtitle": "{value} {units} maximum",
   "various": "Various",
   "volumeTitle": "Volume",
   "workerUnallocated": "Worker unallocated",