Merge branch 'develop'

Author: corsacca

dt-assets/build/components/index.es.js

@@ -1,32 +1,33 @@
-import { B as s, C as e, v as D, A as o, D as l, b as i, c as n, e as r, f as c, a as p, u, z as C, g as M, w as T, h as x, i as S, j as d, x as g, k as m, t as B, r as h, l as A, m as L, n as b, o as v, p as f, y as w, q as y, d as F } from "./index-BoIbfJ3r.js";
+import { E as s, C as e, w as D, B as o, D as i, b as l, c as n, e as r, f as c, g as p, a as u, v as C, A as M, h as T, x as m, i as x, j as S, k as d, y as g, l as B, u as h, t as A, m as L, n as b, o as v, p as f, q as w, z as y, r as F, d as j } from "./index-40k-d_ZT.js";
 export {
   s as ApiService,
   e as ComponentService,
   D as DtAlert,
   o as DtBase,
-  l as DtButton,
-  i as DtChurchHealthCircle,
+  i as DtButton,
+  l as DtChurchHealthCircle,
   n as DtConnection,
   r as DtCopyText,
   c as DtDate,
-  p as DtDropdown,
-  u as DtFormBase,
-  C as DtIcon,
-  M as DtLabel,
-  T as DtList,
+  p as DtDatetime,
+  u as DtDropdown,
+  C as DtFormBase,
+  M as DtIcon,
+  T as DtLabel,
+  m as DtList,
   x as DtLocation,
   S as DtLocationMap,
   d as DtMapModal,
   g as DtModal,
-  m as DtMultiSelect,
-  B as DtMultiSelectButtonGroup,
-  h as DtMultiText,
-  A as DtNumberField,
-  L as DtSingleSelect,
-  b as DtTags,
-  v as DtText,
-  f as DtTextArea,
-  w as DtTile,
-  y as DtToggle,
-  F as DtUsersConnection
+  B as DtMultiSelect,
+  h as DtMultiSelectButtonGroup,
+  A as DtMultiText,
+  L as DtNumberField,
+  b as DtSingleSelect,
+  v as DtTags,
+  f as DtText,
+  w as DtTextArea,
+  y as DtTile,
+  F as DtToggle,
+  j as DtUsersConnection
 };

dt-assets/build/components/index.js

@@ -24,9 +24,6 @@ function dt_start() {
     // Clean up gallery output in wp
     add_filter( 'gallery_style', 'dt_gallery_style' );
 
-    // Cleaning up excerpt
-    add_filter( 'excerpt_more', 'dt_excerpt_more' );
-
     // Removes WP sticky class in favor or foundations sticky class
     add_filter( 'post_class', 'dt_remove_sticky_class' );
 
@@ -74,19 +71,6 @@ function dt_gallery_style( $css ) {
     return preg_replace( "!<style type='text/css'>(.*?)</style>!s", '', $css );
 }
 
-/**
- * This removes the annoying […] to a Read More link
- *
- * @param $more
- *
- * @return string
- */
-function dt_excerpt_more( $more ) {
-    global $post;
-
-    // Edit here if you like
-    return '<a class="excerpt-read-more" href="' . get_permalink( $post->ID ) . '" title="Read' . esc_html( get_the_title( $post->ID ) ) . '"> ... Read more &raquo; </a>';
-}
 
 /**
  * Stop WordPress from using the sticky class (which conflicts with Foundation), and style WordPress sticky posts using the .wp-sticky class instead

dt-assets/build/components/index.umd.cjs

@@ -185,6 +185,10 @@ function dt_site_scripts() {
                         'hide_translation' => __( 'Hide Translation', 'disciple_tools' ),
                         'reaction_title_1' => _x( '%1$s reacted with %2$s emoji', 'Bob reacted with heart emoji', 'disciple_tools' ),
                         'reaction_title_many' => _x( '%3$s and %1$s reacted with %2$s emoji', 'Bob, Bill and Ben reacted with heart emoji', 'disciple_tools' ),
+                        'audio_comment_descriptions' => [
+                            'lang_enabled' => __( 'Select spoken language and click "Start Recording" to begin.', 'disciple_tools' ),
+                            'lang_disabled' => __( 'Click "Start Recording" to begin.', 'disciple_tools' ),
+                        ],
                     ],
                     'current_user_id' => get_current_user_id(),
                     'additional_sections' => apply_filters( 'dt_comments_additional_sections', [], $post_type ),

dt-assets/functions/cleanup.php

@@ -108,6 +108,9 @@ jQuery(document).ready(function ($) {
       meta: $('#advanced-search-modal-filters-meta-' + location).prop(
         'checked',
       ),
+      archived: $('#advanced-search-modal-filters-archived-' + location).prop(
+        'checked',
+      ),
       status: 'all',
     };
   }

dt-assets/functions/enqueue-scripts.php

@@ -854,11 +854,18 @@ jQuery(document).ready(function ($) {
     ctx.lineTo(width, height / 2);
     ctx.stroke();*/
 
+    const description =
+      $('select[name="locale"]').length > 0
+        ? window.commentsSettings?.translations?.audio_comment_descriptions
+            ?.lang_enabled
+        : window.commentsSettings?.translations?.audio_comment_descriptions
+            ?.lang_disabled;
+
     // Draw placeholder text
     ctx.fillStyle = '#6c757d';
     ctx.font = '14px Arial';
     ctx.textAlign = 'center';
-    ctx.fillText('Click "Start Recording" to begin', width / 2, height / 2 + 5);
+    ctx.fillText(description, width / 2, height / 2 + 5);
   }
 
   function drawVisualization(dataArray) {
@@ -1119,6 +1126,11 @@ jQuery(document).ready(function ($) {
       formData.append('audio_format', recordedAudioBlob.type);
       formData.append('audio_size', recordedAudioBlob.size.toString());
 
+      const audio_language_select = $('select[name="locale"]');
+      if ($(audio_language_select).length > 0) {
+        formData.append('audio_language', $(audio_language_select).val());
+      }
+
       // Show loading state
       const saveBtn = $('#save-recording-btn');
       const originalText = saveBtn.text();

dt-assets/js/advanced-search.js

@@ -218,6 +218,7 @@ window.API = {
         post: filters['post'],
         comment: filters['comment'],
         meta: filters['meta'],
+        archived: filters['archived'],
         status: filters['status'],
       },
       'dt-posts/v2/posts/search/',

dt-assets/js/comments.js

@@ -124,6 +124,7 @@
             </div>
 
             <div class="recording-controls">
+                <?php do_action( 'dt_upload_audio_comment_languages' ); ?>
                 <button id="start-recording-btn" class="button recording-btn start-btn">
                     <i class="mdi mdi-record"></i> <?php esc_html_e( 'Start Recording', 'disciple_tools' ) ?>
                 </button>

dt-assets/js/shared-functions.js

@@ -101,6 +101,12 @@ class="advanced-search-modal-filters" checked>
     <label
         for="advanced-search-modal-filters-meta-<?php echo esc_attr( $location ); ?>"><?php echo esc_html__( 'Communication', 'disciple_tools' ); ?></label>
     <br>
+
+    <input type="checkbox" id="advanced-search-modal-filters-archived-<?php echo esc_attr( $location ); ?>"
+           class="advanced-search-modal-filters">
+    <label
+        for="advanced-search-modal-filters-archived-<?php echo esc_attr( $location ); ?>"><?php echo esc_html__( 'Archived', 'disciple_tools' ); ?></label>
+    <br>
     <?php
 }
 ?>