From 8c66808482776d8ec72517072756ee93ee37c80e Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 15 Oct 2017 13:00:25 -0700
Subject: [PATCH 1/9] Add two snippets for text used in lesson filtering

Re: #623
---
 _data/snippets.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/_data/snippets.yml b/_data/snippets.yml
index c782f121f..767027393 100644
--- a/_data/snippets.yml
+++ b/_data/snippets.yml
@@ -132,6 +132,12 @@ difficulty:
     difficulty
   es:
     dificultad
+all-lessons:
+  en: All Lessons
+  es: 
+filtering-results:
+  en: Filtering Results
+  es:
 
 # lesson headers
 editor:

From a622c56cc9bb9806dededfc92a2fba720ea44080 Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 15 Oct 2017 13:01:31 -0700
Subject: [PATCH 2/9] Use new snippets rather than absolute text for
 lesson-index

---
 _includes/lesson-index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/lesson-index.html b/_includes/lesson-index.html
index db1f0196a..7415fc015 100644
--- a/_includes/lesson-index.html
+++ b/_includes/lesson-index.html
@@ -38,7 +38,7 @@
     <li id="sort-by-difficulty" class="sort" data-sort="difficulty">{{site.data.snippets.sort-by-difficulty[page.lang]}}</li>
   </ul>
 
-  <h2 class="results-title">Filtering Results: <span id="results-value">All lessons </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
+  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
 
   <ul class="list">
     {% for lesson in alllessons %}

From f8e43370f1e151c5957962b99ca57c05b6d34b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Gayol?= <vgayol.rrss@gmail.com>
Date: Sun, 15 Oct 2017 15:53:52 -0500
Subject: [PATCH 3/9] #625

---
 _data/snippets.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_data/snippets.yml b/_data/snippets.yml
index 767027393..4a991198e 100644
--- a/_data/snippets.yml
+++ b/_data/snippets.yml
@@ -134,10 +134,10 @@ difficulty:
     dificultad
 all-lessons:
   en: All Lessons
-  es: 
+  es: Todas las lecciones
 filtering-results:
   en: Filtering Results
-  es:
+  es: Filtrar resultados
 
 # lesson headers
 editor:

From 1f68f251ab6dbb2121298c89a8bfab27e74b330c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Gayol?= <vgayol.rrss@gmail.com>
Date: Sun, 15 Oct 2017 16:22:24 -0500
Subject: [PATCH 4/9] #625

---
 _data/snippets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_data/snippets.yml b/_data/snippets.yml
index 4a991198e..1efe14b2d 100644
--- a/_data/snippets.yml
+++ b/_data/snippets.yml
@@ -137,7 +137,7 @@ all-lessons:
   es: Todas las lecciones
 filtering-results:
   en: Filtering Results
-  es: Filtrar resultados
+  es: Filtradas por
 
 # lesson headers
 editor:

From 2ec43396824cdb54808a5892b641060715e5b678 Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 18 Feb 2018 14:34:08 -0800
Subject: [PATCH 5/9] Pass sort type labels of appropriate language to JS

uses hidden input element that jquery can then call
---
 _includes/lesson-index.html | 5 ++++-
 js/lessonfilter.js          | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/_includes/lesson-index.html b/_includes/lesson-index.html
index 7415fc015..3109c916a 100644
--- a/_includes/lesson-index.html
+++ b/_includes/lesson-index.html
@@ -38,7 +38,10 @@
     <li id="sort-by-difficulty" class="sort" data-sort="difficulty">{{site.data.snippets.sort-by-difficulty[page.lang]}}</li>
   </ul>
 
-  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
+  <input id="date-sort-text" type="hidden" label="{{site.data.snippets.date[page.lang]}}">
+  <input id="difficulty-sort-text" type="hidden" label="{{site.data.snippets.difficulty[page.lang]}}">
+
+  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc"></span></h2>
 
   <ul class="list">
     {% for lesson in alllessons %}
diff --git a/js/lessonfilter.js b/js/lessonfilter.js
index bc0264a3a..9ddcd373e 100644
--- a/js/lessonfilter.js
+++ b/js/lessonfilter.js
@@ -32,11 +32,11 @@ function applySortFromURI(uri,featureList) {
 
     // Update filter header and restore defaults to other button
     if (sortType == "date") {
-      $('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
+      $('#current-sort').text($('#date-sort-text').attr('label'));
       $('#sort-by-difficulty').removeClass().addClass("sort my-asc");
     }
     else {
-      $('#current-sort').text(" {{site.data.snippets.difficulty[page.lang]}} ");
+      $('#current-sort').text($('#difficulty-sort-text').attr("label"));
       $('#sort-by-date').removeClass().addClass("sort my-desc");
     }
   }
@@ -123,11 +123,11 @@ function wireButtons() {
     // Update filter results header to show current sorting (date or difficulty)
     // Reset the other (non-pressed) button to its default sort arrow.
     if (sortType == "date") {
-      $('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
+      $('#current-sort').text($('#date-sort-text').attr('label'));
       $('#sort-by-difficulty').removeClass().addClass("sort my-asc");
     }
     else {
-      $('#current-sort').text(" {{site.data.snippets.difficulty[page.lang]}} ");
+      $('#current-sort').text($('#difficulty-sort-text').attr('label'));
       $('#sort-by-date').removeClass().addClass("sort my-desc");
     }
 

From a26bfb2c781677d72e482b91e14556ba53fab2b3 Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 18 Feb 2018 14:44:20 -0800
Subject: [PATCH 6/9] No longer need to reset current-sort text when loading

---
 _includes/lesson-index.html | 2 +-
 js/lessonfilter.js          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/_includes/lesson-index.html b/_includes/lesson-index.html
index 3109c916a..83971b76b 100644
--- a/_includes/lesson-index.html
+++ b/_includes/lesson-index.html
@@ -41,7 +41,7 @@
   <input id="date-sort-text" type="hidden" label="{{site.data.snippets.date[page.lang]}}">
   <input id="difficulty-sort-text" type="hidden" label="{{site.data.snippets.difficulty[page.lang]}}">
 
-  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc"></span></h2>
+  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
 
   <ul class="list">
     {% for lesson in alllessons %}
diff --git a/js/lessonfilter.js b/js/lessonfilter.js
index 9ddcd373e..c98c52062 100644
--- a/js/lessonfilter.js
+++ b/js/lessonfilter.js
@@ -3,7 +3,6 @@
 
 
 function resetSort() {
-  $('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
   $('#current-sort').removeClass().addClass("sort-desc");
   $("#sort-by-date").removeClass().addClass("sort desc my-asc");
   $("#sort-by-difficulty").removeClass().addClass("sort my-desc");

From cac1c7aba095f796c69841a1e8386fb351370ab5 Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 18 Feb 2018 14:51:18 -0800
Subject: [PATCH 7/9] Add space between filter label and sort label

---
 _includes/lesson-index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/lesson-index.html b/_includes/lesson-index.html
index 83971b76b..dc94f87d7 100644
--- a/_includes/lesson-index.html
+++ b/_includes/lesson-index.html
@@ -41,7 +41,7 @@
   <input id="date-sort-text" type="hidden" label="{{site.data.snippets.date[page.lang]}}">
   <input id="difficulty-sort-text" type="hidden" label="{{site.data.snippets.difficulty[page.lang]}}">
 
-  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
+  <h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span> <span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
 
   <ul class="list">
     {% for lesson in alllessons %}

From 2cf750da64e3058a20be19bd3f6058acb5a68bc8 Mon Sep 17 00:00:00 2001
From: Matthew Lincoln <matthew.d.lincoln@gmail.com>
Date: Sun, 18 Feb 2018 14:53:32 -0800
Subject: [PATCH 8/9] Reset filter text properly when button is pressed

---
 js/lessonfilter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/lessonfilter.js b/js/lessonfilter.js
index c98c52062..f157f9d7e 100644
--- a/js/lessonfilter.js
+++ b/js/lessonfilter.js
@@ -88,7 +88,7 @@ function wireButtons() {
       $('.filter').children().removeClass("current");
 
       // Reset filter results header
-      $('#results-value').text('All lessons');
+      $('#results-value').text($('#results-value').text());
 
       // Reset uri to remove query params
       uri.search("");

From d950724eab8d64e06f481a6987ecf89d5fc17463 Mon Sep 17 00:00:00 2001
From: walshbr <bmw9t@virginia.edu>
Date: Mon, 19 Feb 2018 10:06:34 -0500
Subject: [PATCH 9/9] Refactor js for DRY

---
 js/lessonfilter.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/lessonfilter.js b/js/lessonfilter.js
index f157f9d7e..39ff06736 100644
--- a/js/lessonfilter.js
+++ b/js/lessonfilter.js
@@ -1,7 +1,6 @@
 ---
 ---
 
-
 function resetSort() {
   $('#current-sort').removeClass().addClass("sort-desc");
   $("#sort-by-date").removeClass().addClass("sort desc my-asc");
@@ -31,11 +30,11 @@ function applySortFromURI(uri,featureList) {
 
     // Update filter header and restore defaults to other button
     if (sortType == "date") {
-      $('#current-sort').text($('#date-sort-text').attr('label'));
+      $('#current-sort').text(dateSort);
       $('#sort-by-difficulty').removeClass().addClass("sort my-asc");
     }
     else {
-      $('#current-sort').text($('#difficulty-sort-text').attr("label"));
+      $('#current-sort').text(difficultySort);
       $('#sort-by-date').removeClass().addClass("sort my-desc");
     }
   }
@@ -122,11 +121,11 @@ function wireButtons() {
     // Update filter results header to show current sorting (date or difficulty)
     // Reset the other (non-pressed) button to its default sort arrow.
     if (sortType == "date") {
-      $('#current-sort').text($('#date-sort-text').attr('label'));
+      $('#current-sort').text(dateSort);
       $('#sort-by-difficulty').removeClass().addClass("sort my-asc");
     }
     else {
-      $('#current-sort').text($('#difficulty-sort-text').attr('label'));
+      $('#current-sort').text(difficultySort);
       $('#sort-by-date').removeClass().addClass("sort my-desc");
     }
 
@@ -195,6 +194,11 @@ function wireButtons() {
     All below code runs on each page load
   ****************************************/
 
+  // set labels based on the current language
+
+  var dateSort = $('#date-sort-text').attr('label');
+  var difficultySort = $('#difficulty-sort-text').attr("label");
+
   // Look for URI query params
   var params = uri.search(true);
   var filter = params.activity ? params.activity : params.topic;