diff options
| -rw-r--r-- | mod/connedit.php | 6 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 39a69364d..f628fb9d3 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -668,6 +668,7 @@ function connedit_content(&$a) { '$lbl_rating_label' => t('Slide to adjust your rating'), '$lbl_rating_txt' => t('Optionally explain your rating'), '$connfilter' => feature_enabled(local_channel(),'connfilter'), + '$connfilter_label' => t('Custom Filter'), '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), '$rating_text' => array('rating_text', t('Optionally explain your rating'),$rating_text,''), @@ -676,6 +677,11 @@ function connedit_content(&$a) { '$rating_val' => $rating_val, '$slide' => $slide, '$affinity' => $affinity, + '$pending_label' => t('Connection Pending Approval'), + '$pending_modal_title' => t('Connection Request'), + '$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']), + '$pending_modal_approve' => t('Approve'), + '$pending_modal_dismiss' => t('Approve Later'), '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), '$unapproved' => $unapproved, '$inherited' => t('inherited'), diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 202c6881e..71693a553 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -46,7 +46,7 @@ <div class="section-subtitle-wrapper" role="tab" id="pending-tool"> <h3> <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse"> - Connection Pending Approval + {{$pending_label}} </a> </h3> </div> @@ -64,15 +64,15 @@ <div class="modal-content"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 class="modal-title" id="myModalLabel">Connection Request</h4> + <h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4> </div> <div class="modal-body"> - <strong>{{$name}}</strong> ({{$addr}}) would like to connect with you. Please approve this connection to allow communication. + <strong>{{$name}}</strong> {{$pending_modal_body}} </div> <div class="modal-footer"> <button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button> - <button type="button" class="btn btn-default" data-dismiss="modal">Approve Later</button> - <button type="submit" class="btn btn-primary" name="pending" value="1">Approve</button> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button> + <button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button> </div> </div> </div> @@ -116,7 +116,7 @@ <div class="section-subtitle-wrapper" role="tab" id="fitert-tool"> <h3> <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse"> - Custom Filter + {{$connfilter_label}} </a> </h3> </div> |