From 201837518f2a285067ffb183d1aaf4b4d5b1cc67 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 9 Dec 2015 23:30:28 +0530 Subject: [PATCH] Update strings during edit/delete operations --- .../networks/templates/connections_delete.html | 8 ++++++-- plinth/modules/users/templates/users_delete.html | 12 ++++++------ plinth/modules/users/templates/users_update.html | 6 +----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plinth/modules/networks/templates/connections_delete.html b/plinth/modules/networks/templates/connections_delete.html index ef97b39f1..d9ea0c947 100644 --- a/plinth/modules/networks/templates/connections_delete.html +++ b/plinth/modules/networks/templates/connections_delete.html @@ -23,9 +23,13 @@ {% block content %} -

{% blocktrans %}Delete Connection {{ name }}{% endblocktrans %}

+

{% trans "Delete Connection" %}

-

{% trans "Delete connection permanently?" %}

+

+ {% blocktrans trimmed %} + Delete connection {{ name }} permanently? + {% endblocktrans %} +

{% csrf_token %} diff --git a/plinth/modules/users/templates/users_delete.html b/plinth/modules/users/templates/users_delete.html index f5990eb4f..6692e2057 100644 --- a/plinth/modules/users/templates/users_delete.html +++ b/plinth/modules/users/templates/users_delete.html @@ -23,13 +23,13 @@ {% block content %} -

- {% blocktrans trimmed with username=object.username %} - Delete User {{ username }} - {% endblocktrans %} -

+

{% trans "Delete User" %}

-

{% trans "Delete user permanently?" %}

+

+ {% blocktrans trimmed with username=object.username %} + Delete user {{ username }} permanently? + {% endblocktrans %} +

{% csrf_token %} diff --git a/plinth/modules/users/templates/users_update.html b/plinth/modules/users/templates/users_update.html index 9e9c64d49..6dc15717b 100644 --- a/plinth/modules/users/templates/users_update.html +++ b/plinth/modules/users/templates/users_update.html @@ -31,11 +31,7 @@ {% block content %} -

- {% blocktrans trimmed with username=object.username %} - Edit User {{ username }} - {% endblocktrans %} -

+

{{ object.username }}

{% url 'users:change_password' object.username as change_password_url %}