AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Change language from Reject to Deny

Browse Source
This commit is contained in:
Craig Williams
2022-02-11 13:37:55 +00:00
parent da89a688b9
commit 016f7489c4
13 changed files with 83 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/mail/organisation-approval-rejected.html.twig → templates/mail/organisation-approval-denied.html.twig
View File

@@ -1,5 +1,5 @@
{% block subject %}
{{site.title}} - organisation registration rejected
{{site.title}} - organisation registration denied
{% endblock %}
{% block body %}
@@ -7,7 +7,7 @@
Dear {{recipient.first_name}},
</p>
<p>
The organisation registration request you submitted at {{site.title}} ({{site.uri.public}}) has been rejected.
The organisation registration request you submitted at {{site.title}} ({{site.uri.public}}) has been denied.
</p>
<p>
With regards,<br>

8
templates/mail/organisation-approval-request.html.twig
View File

@@ -26,17 +26,17 @@
</p>
<p>
You may verify or reject this organisation via the control dashboard (<a href="{{site.uri.public}}/organisations">{{site.uri.public}}/organisations</a>).
You may approve or deny this organisation via the control dashboard (<a href="{{site.uri.public}}/organisations">{{site.uri.public}}/organisations</a>).
</p>
<p>
To verify this organisation immediately you may do so by visiting: <a href="{{site.uri.public}}/organisations/registration/approve?token={{token}}">{{site.uri.public}}/organisations/approve?token={{token}}</a>.
To approve this organisation immediately you may do so by visiting: <a href="{{site.uri.public}}/organisations/registration/approve?token={{token}}">{{site.uri.public}}/organisations/approve?token={{token}}</a>.
</p>
<p>
To reject this organisation immediately you may do so by visiting: <a href="{{site.uri.public}}/organisations/registration/reject?token={{token}}">{{site.uri.public}}/organisations/reject?token={{token}}</a>.
To deny this organisation immediately you may do so by visiting: <a href="{{site.uri.public}}/organisations/registration/deny?token={{token}}">{{site.uri.public}}/organisations/deny?token={{token}}</a>.
</p>
{% if approval_expiration %}
<p>
The approcal period for this organisation will expire in {{approval_expiration}} at which point the organisation will be automatically rejected.
The approcal period for this organisation will expire in {{approval_expiration}} at which point the organisation registration will be automatically denied.
</p>
{% endif %}
<p>

6
templates/modals/confirm-cancel-organisation-registration.html.twig
View File

@@ -1,16 +1,16 @@
{% extends "modals/modal.html.twig" %}
{% block modal_title %}{{translate("ORGANISATION.CANCEL_REGISTRATION")}}{% endblock %}
{% block modal_title %}{{translate("ORGANISATION.REGISTRATION.CANCEL")}}{% endblock %}
{% block modal_body %}
<form class="js-form" method="delete" action="{{site.uri.public}}/{{form.action}}">
{% include "forms/csrf.html.twig" %}
<div class="js-form-alerts">
</div>
<h4>{{translate("ORGANISATION.CANCEL_REGISTRATION_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("DELETE_CANNOT_UNDONE")}}</small>{% endif %}</h4>
<h4>{{translate("ORGANISATION.REGISTRATION.CANCEL_CONFIRM", {name: organisation.name})}}{% if delete_hard %}<br><small>{{translate("ACTION_CANNOT_UNDONE")}}</small>{% endif %}</h4>
<br>
<div class="btn-group-action">
<button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.CANCEL_REGISTRATION_YES")}}</button>
<button type="submit" class="btn btn-danger btn-lg btn-block">{{translate("ORGANISATION.REGISTRATION.CANCEL_YES")}}</button>
<button type="button" class="btn btn-default btn-lg btn-block" data-dismiss="modal">{{translate("CANCEL")}}</button>
</div>
</form>

8
templates/pages/organisation.html.twig
View File

@@ -46,8 +46,8 @@
</a>
</li>
<li>
<a href="#" class="js-organisation-rejectRegistration" data-slug="{{organisation.slug}}">
<i class="fas fa-thumbs-down fa-fw"></i> {{translate('REJECT')}}
<a href="#" class="js-organisation-denyRegistration" data-slug="{{organisation.slug}}">
<i class="fas fa-thumbs-down fa-fw"></i> {{translate('DENY')}}
</a>
</li>
{% endif %}
@@ -75,12 +75,12 @@
{% if organisation.flag_approved != 1 %}
<hr>
<h4 class="text-danger text-center">
{{ translate('ORGANISATION.APPROVAL.PENDING') }}
{{ translate('ORGANISATION.REGISTRATION.PENDING') }}
</h4>
<div class="text-center">
{% if checkAccess('approve_organisation') %}
<button type="button" class="btn btn-success js-organisation-approveRegistration" data-slug="{{organisation.slug}}">{{translate('APPROVE')}}</button>
<button type="button" class="btn btn-danger js-organisation-rejectRegistration" data-slug="{{organisation.slug}}">{{translate('REJECT')}}</button>
<button type="button" class="btn btn-danger js-organisation-denyRegistration" data-slug="{{organisation.slug}}">{{translate('DENY')}}</button>
{% elseif isOrganisationAdmin(organisation) %}
<button type="button" class="btn btn-danger js-organisation-cancelRegistration" data-slug="{{organisation.slug}}">{{translate('CANCEL_REGISTRATION')}}</button>
{% endif %}

2
templates/pages/organisations.html.twig
View File

@@ -36,7 +36,7 @@
</button>
{% elseif checkAccess('register_organisation') %}
<button type="button" class="btn btn-success js-organisation-register">
<i class="fas fa-plus-square"></i> {{translate("ORGANISATION.REGISTER")}}
<i class="fas fa-plus-square"></i> {{translate("ORGANISATION.REGISTRATION.REGISTER")}}
</button>
{% endif %}
</div>

6
templates/tables/organisations.html.twig
View File

@@ -116,12 +116,12 @@
{{#ifx row.flag_approved '==' 0 }}
<li>
<a href="#" data-slug="{{row.slug}}" class="js-organisation-approveRegistration">
<i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.APPROVAL.APPROVE")}}{% verbatim %}
<i class="fas fa-thumbs-up"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.APPROVE")}}{% verbatim %}
</a>
</li>
<li>
<a href="#" data-slug="{{row.slug}}" class="js-organisation-rejectRegistration">
<i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.APPROVAL.REJECT")}}{% verbatim %}
<a href="#" data-slug="{{row.slug}}" class="js-organisation-denyRegistration">
<i class="fas fa-thumbs-down"></i> {% endverbatim %}{{translate("ORGANISATION.REGISTRATION.DENY")}}{% verbatim %}
</a>
</li>
{{/ifx }}