pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use common "View" for translations

Browse Source 
-also pipe translate in injected html for a flash
This commit is contained in:
Montana 2019-05-13 09:28:47 -04:00
parent 39a0716028
commit 74422c57aa
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
atst/forms/portfolio_member.py
View File

@ -14,29 +14,35 @@ class PermissionsForm(BaseForm):
perms_app_mgmt = SelectField(
translate("forms.new_member.app_mgmt"),
choices=[
(PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT, "View"),
(PermissionSets.EDIT_PORTFOLIO_APPLICATION_MANAGEMENT, "Edit"),
(
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"),
(PermissionSets.EDIT_PORTFOLIO_FUNDING, "Edit"),
(PermissionSets.VIEW_PORTFOLIO_FUNDING, translate("common.view")),
(PermissionSets.EDIT_PORTFOLIO_FUNDING, translate("common.edit")),
],
)
perms_reporting = SelectField(
translate("forms.new_member.reporting"),
choices=[
(PermissionSets.VIEW_PORTFOLIO_REPORTS, "View"),
(PermissionSets.EDIT_PORTFOLIO_REPORTS, "Edit"),
(PermissionSets.VIEW_PORTFOLIO_REPORTS, translate("common.view")),
(PermissionSets.EDIT_PORTFOLIO_REPORTS, translate("common.edit")),
],
)
perms_portfolio_mgmt = SelectField(
translate("forms.new_member.portfolio_mgmt"),
choices=[
(PermissionSets.VIEW_PORTFOLIO_ADMIN, "View"),
(PermissionSets.EDIT_PORTFOLIO_ADMIN, "Edit"),
(PermissionSets.VIEW_PORTFOLIO_ADMIN, translate("common.view")),
(PermissionSets.EDIT_PORTFOLIO_ADMIN, translate("common.edit")),
],
)

2
atst/utils/flash.py
View File

@ -160,7 +160,7 @@ MESSAGES = {
"title_template": translate("flash.success"),
"message_template": """
{{ "flash.application.deleted" | translate({"application_name": application_name}) }}
<a href="#">translate("common.undo")</a>
<a href="#">{{ "common.undo" | translate }}</a>
""",
"category": "success",
},

2
templates/fragments/admin/members_view.html
View File

@ -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 %}

2
translations.yaml
View File

@ -39,6 +39,7 @@ common:
show: Show
sign: Sign
undo: Undo
view: View
resource_names:
environments: Environments
choose_role: Choose a role
@ -473,7 +474,6 @@ portfolios:
name: Name
portfolio_mgmt: Portfolio management
reporting: Reporting
view_only: View
task_orders:
available_budget_help_description: The available budget shown includes the available budget of all active task orders
requests: