From 362cece4a8d818920b0eab50e49e49936b24b4fd Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Mon, 30 Mar 2020 16:51:44 -0600
Subject: [PATCH 1/4] fix: language filtering (resolves #237)

---
 app/Controllers/App.php                       | 26 ++++++++++++-------
 app/filters.php                               |  5 ++--
 .../views/partials/current-filters.blade.php  |  4 +--
 resources/views/partials/filters.blade.php    |  2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/Controllers/App.php b/app/Controllers/App.php
index 078f455..e16567d 100644
--- a/app/Controllers/App.php
+++ b/app/Controllers/App.php
@@ -44,7 +44,7 @@ public function queriedResourceTerms()
     {
         $langs = get_language_list(pll_current_language('locale'));
         $terms = [
-            'language' => [],
+            'resource_language' => [],
             'lc_format' => [],
             'lc_goal' => [],
             'lc_region' => [],
@@ -55,14 +55,16 @@ public function queriedResourceTerms()
         global $wp_query;
         if ($wp_query->tax_query) {
             foreach ($wp_query->tax_query->queries as $value) {
-                foreach ($value['terms'] as $t) {
-                    $terms[$value['taxonomy']][$t] = get_term_by('slug', $t, $value['taxonomy'])->name;
+                if ($value['taxonomy'] !== 'language') {
+                    foreach ($value['terms'] as $t) {
+                        $terms[$value['taxonomy']][$t] = get_term_by('slug', $t, $value['taxonomy'])->name;
+                    }
                 }
             }
         }
-        if (isset($_GET['language'])) {
-            foreach ($_GET['language'] as $lang) {
-                $terms['language'][ $lang ] = $langs[$lang];
+        if (isset($_GET['resource_language'])) {
+            foreach ($_GET['resource_language'] as $lang) {
+                $terms['resource_language'][ $lang ] = $langs[$lang];
             }
         }
         return $terms;
@@ -116,7 +118,7 @@ public function currentLanguage()
         return 'en';
     }
 
-    public function foundPosts()
+    public function foundPosts($lang = 'en')
     {
         global $wp_query;
         return $wp_query->found_posts;
@@ -374,10 +376,16 @@ public static function getPagination($args = [])
         return $navigation;
     }
 
-    public static function totalPosts($post_type = null)
+    public static function totalPosts($post_type = null, $lang = 'en')
     {
         if ($post_type) {
-            return wp_count_posts($post_type)->publish;
+            $q = new \WP_Query([
+                'post_type' => $post_type,
+                'post_status' => 'publish',
+                'lang' => $lang,
+                'fields' => 'ids'
+            ]);
+            return $q->found_posts;
         }
 
         return 0;
diff --git a/app/filters.php b/app/filters.php
index ae0a564..d0c7e4a 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -136,11 +136,11 @@
                         break;
                 }
             }
-            if (isset($_GET['language'])) {
+            if (isset($_GET['resource_language'])) {
                 $meta_query = [
                     'relation' => 'OR'
                 ];
-                foreach ($_GET['language'] as $lang) {
+                foreach ($_GET['resource_language'] as $lang) {
                     $meta_query[] = [
                         'key' => 'language',
                         'value' => $lang,
@@ -150,7 +150,6 @@
             }
             $query->set('posts_per_page', 12);
             $query->set('order', 'desc');
-            $query->set('lang', '');
         }
     }
 });
diff --git a/resources/views/partials/current-filters.blade.php b/resources/views/partials/current-filters.blade.php
index cdb91ef..20aac69 100644
--- a/resources/views/partials/current-filters.blade.php
+++ b/resources/views/partials/current-filters.blade.php
@@ -1,6 +1,6 @@
-@if(isset($_GET['s']) || $found_posts < App::totalPosts('lc_resource'))
+@if(isset($_GET['s']) || $found_posts < App::totalPosts('lc_resource', $current_language))
 <div class="current-filters">
-  <p class="h3">{{ sprintf(__('Showing %1$s of %2$s resources for:', 'coop-library'), $found_posts, App::totalPosts('lc_resource')) }}</p>
+  <p class="h3">{{ sprintf(__('Showing %1$s of %2$s resources for:', 'coop-library'), $found_posts, App::totalPosts('lc_resource', $current_language)) }}</p>
   @if(isset($_GET['s']))
   <h2 class="h4">{{ __('Search term', 'coop-library') }}</h2>
   <p>&ldquo;{{ $_GET['s'] }}&rdquo;</p>
diff --git a/resources/views/partials/filters.blade.php b/resources/views/partials/filters.blade.php
index 3eb87d6..7bb8e17 100644
--- a/resources/views/partials/filters.blade.php
+++ b/resources/views/partials/filters.blade.php
@@ -69,7 +69,7 @@
             <ul id="language" class="input-group input-group__parent language">
               @foreach(App::getMetaValues('language', 'lc_resource') as $language)
               <li>
-                <input id="language-{{ $language }}" name="language[]" type="checkbox" value="{{ $language }}" {{ checked(in_array($language, array_keys($queried_resource_terms['language']))) }} />
+                <input id="language-{{ $language }}" name="resource_language[]" type="checkbox" value="{{ $language }}" {{ checked(in_array($language, array_keys($queried_resource_terms['resource_language']))) }} />
                 <label for="language-{{ $language }}">{!! $languages[$language] !!}</label>
               </li>
               @endforeach

From fc6e661a1275beefadb4dad684b46e294abeba1c Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Mon, 30 Mar 2020 16:58:39 -0600
Subject: [PATCH 2/4] fix: only show current language on front page

---
 app/Controllers/FrontPage.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Controllers/FrontPage.php b/app/Controllers/FrontPage.php
index c0a5e71..c9b4da5 100644
--- a/app/Controllers/FrontPage.php
+++ b/app/Controllers/FrontPage.php
@@ -27,7 +27,6 @@ public function mostViewed()
             'post__not_in' => $viewed_ids,
             'posts_per_page' => 4,
             'fields' => 'ids',
-            'lang' => '',
         ]);
         $ids = array_merge($viewed_ids + $unviewed_ids);
 
@@ -48,7 +47,6 @@ public function recentlyPublished()
             'orderby' => ['meta_value', 'date'],
             'posts_per_page' => 4,
             'order' => 'desc',
-            'lang' => '',
         ]);
     }
 }

From f320603753928684b5db344beb4583c2f7214a4e Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Mon, 30 Mar 2020 16:59:37 -0600
Subject: [PATCH 3/4] fix: only show current language on front page

---
 app/Controllers/FrontPage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Controllers/FrontPage.php b/app/Controllers/FrontPage.php
index c9b4da5..9552dff 100644
--- a/app/Controllers/FrontPage.php
+++ b/app/Controllers/FrontPage.php
@@ -35,7 +35,6 @@ public function mostViewed()
             'post__in' => $ids,
             'orderby' => 'post__in',
             'posts_per_page' => 4,
-            'lang' => '',
         ]);
     }
 

From f7262f206d53f479a6c0d1df187c1a5c86b6512b Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Tue, 31 Mar 2020 07:47:35 -0600
Subject: [PATCH 4/4] fix: inaccurate count when sorting by most viewed
 (resolves #238)

---
 app/Controllers/App.php | 2 +-
 app/filters.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/App.php b/app/Controllers/App.php
index e16567d..c6575a2 100644
--- a/app/Controllers/App.php
+++ b/app/Controllers/App.php
@@ -118,7 +118,7 @@ public function currentLanguage()
         return 'en';
     }
 
-    public function foundPosts($lang = 'en')
+    public function foundPosts()
     {
         global $wp_query;
         return $wp_query->found_posts;
diff --git a/app/filters.php b/app/filters.php
index d0c7e4a..defe038 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -126,7 +126,7 @@
                             'posts_per_page' => -1,
                             'fields' => 'ids'
                         ]);
-                        $ids = array_merge($viewed_ids + $unviewed_ids);
+                        $ids = array_merge($viewed_ids, $unviewed_ids);
                         $query->set('post__in', $ids);
                         $query->set('orderby', 'post__in');
                         break;