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

project-koku · Apr 8, 2024 · d16fbce · d16fbce
2 parents 017828c + d3dd7a0
commit d16fbce
Show file tree

Hide file tree

Showing 38 changed files with 1,045 additions and 767 deletions.
diff --git a/locales/data.json b/locales/data.json
@@ -11867,6 +11867,26 @@
         "value": "Application settings saved"
       }
     ],
+    "settingsTagMappingDisableErrorDesc": [
+      {
+        "type": 0,
+        "value": "You have selected "
+      },
+      {
+        "type": 1,
+        "value": "value"
+      },
+      {
+        "type": 0,
+        "value": " tag mappings"
+      }
+    ],
+    "settingsTagMappingDisableErrorTitle": [
+      {
+        "type": 0,
+        "value": "Can not disable a key associated with a tag mapping"
+      }
+    ],
     "settingsTagsErrorDesc": [
       {
         "type": 0,
@@ -12206,6 +12226,18 @@
         "value": " tag map. Tags that have been already mapped will not be available for selection."
       }
     ],
+    "tagMappingAddErrorDesc": [
+      {
+        "type": 0,
+        "value": "Failed to add tags"
+      }
+    ],
+    "tagMappingAddErrorTitle": [
+      {
+        "type": 0,
+        "value": "Unable to create tag mapping"
+      }
+    ],
     "tagMappingDelete": [
       {
         "type": 0,
@@ -12285,7 +12317,7 @@
     "tagMappingSelectChildTagsDesc": [
       {
         "type": 0,
-        "value": "Select the child tags that you want to map to a parent key. Tags that have been already mapped will not be available for selection. "
+        "value": "Select the child tags that you want to map to the parent key you selected in the previous step. Tags that have been already mapped will not be available for selection. "
       },
       {
         "type": 1,
@@ -12301,15 +12333,7 @@
     "tagMappingSelectParentTagsDesc": [
       {
         "type": 0,
-        "value": "Select a parent tag key that will be mapped to the "
-      },
-      {
-        "type": 1,
-        "value": "count"
-      },
-      {
-        "type": 0,
-        "value": " child tags you selected in the previous step. This tag will be available for filtering in Cost Management."
+        "value": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management."
       }
     ],
     "tagMappingWarning": [

diff --git a/locales/translations.json b/locales/translations.json
@@ -532,6 +532,8 @@
   "settingsSuccessPlatformProjects": "{value, select, add {{count, plural, one {{count} projects added to Platform projects} other {{count} project added to Platform projects}}} remove {{count, plural, one {{count} projects removed from Platform projects} other {{count} project removed from Platform projects}}} other {}}",
   "settingsSuccessTags": "{value, select, add {{count, plural, one {{count} tag key added} other {{count} tag key added}}} enable {{count, plural, one {{count} tag enabled} other {{count} tags enabled}}} disable {{count, plural, one {{count} tag disabled} other {{count} tags disabled}}} remove {{count, plural, one {{count} tag key removed} other {{count} tag key removed}}} other {}}",
   "settingsSuccessTitle": "Application settings saved",
+  "settingsTagMappingDisableErrorDesc": "You have selected {value} tag mappings",
+  "settingsTagMappingDisableErrorTitle": "Can not disable a key associated with a tag mapping",
   "settingsTagsErrorDesc": "You currently have {value} tags enabled",
   "settingsTagsErrorTitle": "You can not enable more than {value} tags total",
   "settingsTitle": "Cost Management Settings",
@@ -560,6 +562,8 @@
   "tagLabelsMap": "Map tags and labels",
   "tagMappingAddChildTags": "Add child tags",
   "tagMappingAddChildTagsDesc": "Select additional tag key(s) that will be mapped to the {value} tag map. Tags that have been already mapped will not be available for selection.",
+  "tagMappingAddErrorDesc": "Failed to add tags",
+  "tagMappingAddErrorTitle": "Unable to create tag mapping",
   "tagMappingDelete": "Delete tag mapping",
   "tagMappingDeleteDesc": "Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.",
   "tagMappingDeleteTitle": "Delete tag mapping?",
@@ -568,9 +572,9 @@
   "tagMappingRemoveDesc": "Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.",
   "tagMappingRemoveTitle": "Remove child tag?",
   "tagMappingSelectChildTags": "Select child tags",
-  "tagMappingSelectChildTagsDesc": "Select the child tags that you want to map to a parent key. Tags that have been already mapped will not be available for selection. {learnMore}",
+  "tagMappingSelectChildTagsDesc": "Select the child tags that you want to map to the parent key you selected in the previous step. Tags that have been already mapped will not be available for selection. {learnMore}",
   "tagMappingSelectParentTags": "Select parent tag",
-  "tagMappingSelectParentTagsDesc": "Select a parent tag key that will be mapped to the {count} child tags you selected in the previous step. This tag will be available for filtering in Cost Management.",
+  "tagMappingSelectParentTagsDesc": "Select a parent tag key that will be mapped to child tags in the next step. This tag will be available for filtering in Cost Management.",
   "tagMappingWarning": "You must enable tags to use tag mapping.",
   "tagMappingWizardDesc": "Map multiple tags across data sources to be used as a single tag key for report grouping and filtering. Changes will be reflected within 24 hours.",
   "tagMappingWizardNavToCreateTagMapping": "Create another tag mapping",