From 35443866706066556846cab34229edd4eb9a9be1 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Fri, 10 May 2019 13:30:20 -0400 Subject: [PATCH 1/2] Add in missing "delete environment" translations --- templates/fragments/applications/edit_environments.html | 8 +++++--- translations.yaml | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html index 5b9457dd..7bb8d4a0 100644 --- a/templates/fragments/applications/edit_environments.html +++ b/templates/fragments/applications/edit_environments.html @@ -127,13 +127,15 @@ {% call Modal(name=delete_environment_modal_id, dismissable=True) %} -

Are you sure you want to delete this environment?

+

+ {{ 'fragments.edit_environment_team_form.delete_environment_title' | translate }} +

{{ Alert( level="warning", - title="Warning! This action is permanent", - message="You will no longer be able to access this environment", + title=('components.modal.destructive_title' | translate), + message=('components.modal.destructive_message' | translate), ) }} diff --git a/translations.yaml b/translations.yaml index 16824faf..149f4abd 100644 --- a/translations.yaml +++ b/translations.yaml @@ -45,6 +45,8 @@ common: components: modal: close: Close + destructive_message: You will no longer be able to access this environment + destructive_title: Warning! This action is permanent usa_header: flag_image_alt: U.S. Flag official_message: An official website of the United States government @@ -325,6 +327,8 @@ fragments: edit_application_form: explain: AT-AT allows you to create multiple applications within a portfolio. Each application can then be broken down into its own customizable environments. new_application_title: Add a new application + edit_environment_team_form: + delete_environment_title: Are you sure you want to delete this environment? edit_user_form: date_last_training_tooltip: When was the last time you completed the IA training?
Information Assurance (IA) training is an important step in cyber awareness. save_details_button: Save From 1f0b48703ce99fe01b02d0819d3698805b83ea7b Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 13 May 2019 09:48:28 -0400 Subject: [PATCH 2/2] Pass in resource as a variable --- templates/fragments/applications/edit_environments.html | 2 +- translations.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html index 7bb8d4a0..f6dc4912 100644 --- a/templates/fragments/applications/edit_environments.html +++ b/templates/fragments/applications/edit_environments.html @@ -135,7 +135,7 @@ Alert( level="warning", title=('components.modal.destructive_title' | translate), - message=('components.modal.destructive_message' | translate), + message=('components.modal.destructive_message' | translate({"resource": "environment"})), ) }} diff --git a/translations.yaml b/translations.yaml index 149f4abd..b1ea2683 100644 --- a/translations.yaml +++ b/translations.yaml @@ -45,7 +45,7 @@ common: components: modal: close: Close - destructive_message: You will no longer be able to access this environment + destructive_message: You will no longer be able to access this {resource} destructive_title: Warning! This action is permanent usa_header: flag_image_alt: U.S. Flag