Merge pull request #812 from dod-ccpo/content-updates

Updating content across the site

atst/forms/portfolio_member.py

@@ -14,29 +14,35 @@ class PermissionsForm(BaseForm):
     perms_app_mgmt = SelectField(
         translate("forms.new_member.app_mgmt"),
         choices=[
-            (PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT, "View only"),
+            (
-            (PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT, "Edit access"),
+                PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT,
+                translate("common.view"),
+            ),
+            (
+                PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT,
+                translate("common.edit"),
+            ),
         ],
     )
     perms_funding = SelectField(
         translate("forms.new_member.funding"),
         choices=[
-            (PermissionSets.VIEW_PORTFOLIO_FUNDING, "View only"),
+            (PermissionSets.VIEW_PORTFOLIO_FUNDING, translate("common.view")),
-            (PermissionSets.EDIT_PORTFOLIO_FUNDING, "Edit access"),
+            (PermissionSets.EDIT_PORTFOLIO_FUNDING, translate("common.edit")),
         ],
     )
     perms_reporting = SelectField(
         translate("forms.new_member.reporting"),
         choices=[
-            (PermissionSets.VIEW_PORTFOLIO_REPORTS, "View only"),
+            (PermissionSets.VIEW_PORTFOLIO_REPORTS, translate("common.view")),
-            (PermissionSets.EDIT_PORTFOLIO_REPORTS, "Edit access"),
+            (PermissionSets.EDIT_PORTFOLIO_REPORTS, translate("common.edit")),
         ],
     )
     perms_portfolio_mgmt = SelectField(
         translate("forms.new_member.portfolio_mgmt"),
         choices=[
-            (PermissionSets.VIEW_PORTFOLIO_ADMIN, "View only"),
+            (PermissionSets.VIEW_PORTFOLIO_ADMIN, translate("common.view")),
-            (PermissionSets.EDIT_PORTFOLIO_ADMIN, "Edit access"),
+            (PermissionSets.EDIT_PORTFOLIO_ADMIN, translate("common.edit")),
         ],
     )
 

atst/forms/team.py

@@ -13,15 +13,15 @@ class PermissionsForm(FlaskForm):
     perms_team_mgmt = SelectField(
         translate("portfolios.applications.members.new.manage_team"),
         choices=[
-            (PermissionSets.VIEW_APPLICATION, "View only"),
+            (PermissionSets.VIEW_APPLICATION, "View"),
-            (PermissionSets.EDIT_APPLICATION_TEAM, "Edit access"),
+            (PermissionSets.EDIT_APPLICATION_TEAM, "Edit"),
         ],
     )
     perms_env_mgmt = SelectField(
         translate("portfolios.applications.members.new.manage_envs"),
         choices=[
-            (PermissionSets.VIEW_APPLICATION, "View only"),
+            (PermissionSets.VIEW_APPLICATION, "View"),
-            (PermissionSets.EDIT_APPLICATION_ENVIRONMENTS, "Edit access"),
+            (PermissionSets.EDIT_APPLICATION_ENVIRONMENTS, "Edit"),
         ],
     )
     perms_del_env = SelectField(

atst/utils/flash.py

@@ -79,10 +79,8 @@ MESSAGES = {
         "category": "error",
     },
     "login_next": {
-        "title_template": "Log in Required.",
+        "title_template": translate("flash.login_required_title"),
-        "message_template": """
+        "message_template": translate("flash.login_required_message"),
-            After you log in, you will be redirected to your destination page.
-        """,
         "category": "warning",
     },
     "new_portfolio": {
@@ -162,7 +160,7 @@ MESSAGES = {
         "title_template": translate("flash.success"),
         "message_template": """
             {{ "flash.application.deleted" | translate({"application_name": application_name}) }}
-            <a href="#">Undo</a>.
+            <a href="#">{{ "common.undo" | translate }}</a>
         """,
         "category": "success",
     },

templates/fragments/admin/members_view.html

@@ -18,7 +18,7 @@
       {% if dict(access.choices).get(access.data) == ('portfolios.members.permissions.edit_access' | translate)  %}
         <td class='green'>{{ 'portfolios.members.permissions.edit_access' | translate }}</td>
       {% else %}
-        <td>{{ 'portfolios.members.permissions.view_only' | translate }}</td>
+        <td>{{ 'common.view' | translate }}</td>
       {% endif %}
     {% endfor %}
 

templates/portfolios/applications/index.html

@@ -24,7 +24,7 @@
   {% if not portfolio.applications %}
 
     {{ EmptyState(
-      'This portfolio doesn’t have any applications yet.',
+      'This portfolio doesn’t have any applications',
       action_label='Add a new application' if can_create_applications else None,
       action_href=url_for('applications.new', portfolio_id=portfolio.id) if can_create_applications else None,
       icon='cloud',

templates/portfolios/applications/members.html

@@ -14,7 +14,7 @@
   {% set user_can_invite = user_can(permissions.CREATE_PORTFOLIO_USERS) %}
 
   {{ EmptyState(
-    'There are currently no members in this Portfolio.',
+    'There are currently no members in this portfolio',
     action_label='Invite a new Member' if user_can_invite else None,
     action_href='/members/new' if user_can_invite else None,
     sub_message=None if user_can_invite else 'Please contact your JEDI Cloud portfolio administrator to invite new members.',

tests/routes/test_errors.py

@@ -19,4 +19,4 @@ def test_csrf_error(csrf_enabled_app, client):
 
     body = response.data.decode()
     assert "Session Expired" in body
-    assert "Log in Required" in body
+    assert "Log in required" in body

translations.yaml

@@ -38,6 +38,8 @@ common:
   save_and_continue: Save & continue
   show: Show
   sign: Sign
+  undo: Undo
+  view: View
   resource_names:
     environments: Environments
   choose_role: Choose a role
@@ -65,6 +67,8 @@ flash:
   congrats: Congrats!
   delete_member_success: 'You have successfully deleted {member_name} from the portfolio.'
   deleted_member: Portfolio member deleted
+  login_required_message: After you log in, you will be redirected to your destination page.
+  login_required_title: Log in required
   new_portfolio: You've created a new JEDI portfolio and jump-started your first task order!
   new_portfolio_member: 'You have successfully invited {user_name} to the portfolio.'
   new_ppoc_message: 'You have successfully added {ppoc_name} as the primary point of contact. You are no longer the PPoC.'
@@ -423,6 +427,8 @@ portfolios:
     environments_heading: Application environments
     existing_application_title: '{application_name} Application Settings'
     new_application_title: New Application
+    no_applications: This portfolio doesn’t have any applications yet
+    no_members: There are currently no members in this portfolio
     settings_heading: Application Settings
     team_management:
       subheading: Team Management
@@ -463,12 +469,11 @@ portfolios:
     archive_button: Delete member
     permissions:
       app_mgmt: App management
-      edit_access: Edit access
+      edit_access: Edit
       funding: Funding
       name: Name
       portfolio_mgmt: Portfolio management
       reporting: Reporting
-      view_only: View only
   task_orders:
     available_budget_help_description: The available budget shown includes the available budget of all active task orders
 requests:
@@ -638,7 +643,7 @@ task_orders:
       so_info_title: Security officer information
     review:
       app_info: Overview
-      classified_inactive: (Available Soon)
+      classified_inactive: (Available soon)
       clin_1: 'CLIN #1: Unclassified Cloud'
       clin_2: 'CLIN #2: Classified Cloud'
       clin_3: 'CLIN #3: Unclassified Cloud'