From 8bbfb08bfd82cfaebc261f6a2e5aaeae24adc40e Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Sat, 13 Mar 2021 16:59:21 +0530
Subject: [PATCH 01/11] Added translations in users/settings.html.erb

---
 app/views/users/settings.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/settings.html.erb b/app/views/users/settings.html.erb
index ba69524e46..062e9dab9f 100644
--- a/app/views/users/settings.html.erb
+++ b/app/views/users/settings.html.erb
@@ -129,10 +129,10 @@
   <h4><b>Browser Notifications</b></h4>
   <hr style="width: 35%;  margin-left: 0;" />
 
-  <h4><b>I want to receive browser notifications:</b></h4>
+  <h4><b><%=translation('users.settings.browser_notifications')%> </b></h4>
 
   <div style="display: inline-flex; justify-content: space-between; width: 90%;">
-    <span>When I'm mentioned</span>
+    <span><%=translation('users.settings.mentioned')%></span>
     <span>
     <label style=" vertical-align: middle;" class="switch">
       <p> Notification switch </p>
@@ -146,7 +146,7 @@
   <br />
 
   <div style="display: inline-flex; justify-content: space-between; width: 90%;">
-    <span>For everything</span>
+    <span><%=translation('users.settings.everything')%></span>
     <span>
     <label style=" vertical-align: middle;" class="switch">
       <p> Notification switch </p>
@@ -160,7 +160,7 @@
   <br />
 
   <div style="display: inline-flex; justify-content: space-between; width: 90%;">
-    <span>When someone likes my work</span>
+    <span><%=translation('users.settings.likes')%></span>
     <span>
     <label style=" vertical-align: middle;" class="switch">
       <p> Notification switch </p>

From b9aec67df4e4cf48390572141e7e2d831e9597e1 Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 14:07:03 +0530
Subject: [PATCH 02/11] Fixed pagination issue

---
 app/controllers/wiki_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 452ac6a93e..5dd5bb7b8e 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -341,7 +341,7 @@ def index
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order(order_string)
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"))
+      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items:10)
 
     @paginated = true
   end

From 4fb2586a3438bcf7dfd50d4baac64c7d7e692e55 Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 14:15:14 +0530
Subject: [PATCH 03/11] fixed pagination issue

---
 app/controllers/wiki_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 452ac6a93e..5dfe1e426b 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -341,7 +341,7 @@ def index
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order(order_string)
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"))
+      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
 
     @paginated = true
   end

From f75556f88cff6b0b31fef5ac7bcda4791975e80a Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 15:50:16 +0530
Subject: [PATCH 04/11] Fixed pagination in wiki/stale too

---
 app/controllers/wiki_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5dfe1e426b..cd61ed4581 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -353,7 +353,7 @@ def stale
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order('node_revisions.timestamp ASC')
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"))
+      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
 
     @paginated = true
     render template: 'wiki/index'

From a50ced95a618f1d1a1327cfa608ef9468e3b7dfa Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 18:40:21 +0530
Subject: [PATCH 05/11] Delete identifier.sqlite

---
 identifier.sqlite | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 identifier.sqlite

diff --git a/identifier.sqlite b/identifier.sqlite
deleted file mode 100644
index e69de29bb2..0000000000

From 74a196285ddc44548a2825f65f120e19afb61efa Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 22:07:05 +0530
Subject: [PATCH 06/11] fixed a minor issue

---
 app/controllers/wiki_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index cd61ed4581..6ccc3925e9 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -341,7 +341,7 @@ def index
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order(order_string)
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
+      .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
 
     @paginated = true
   end
@@ -353,8 +353,7 @@ def stale
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order('node_revisions.timestamp ASC')
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
-
+      .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
     @paginated = true
     render template: 'wiki/index'
   end

From 408ee371a62707d5fd4cfd35ffffb2bfc101656f Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 23:31:57 +0530
Subject: [PATCH 07/11] Fixed minor issue

---
 app/controllers/wiki_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index cd61ed4581..4b31095e20 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -341,7 +341,7 @@ def index
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order(order_string)
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
+      .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
 
     @paginated = true
   end
@@ -353,8 +353,7 @@ def stale
       .references(:node_revisions)
       .group('node_revisions.nid, node_revisions.vid')
       .order('node_revisions.timestamp ASC')
-      .where("node_revisions.status = 1 AND node.status = 1 AND (type = 'page' OR type = 'tool' OR type = 'place')"), items: 10)
-
+                           .where("node_revisions.status = 1 AND node.status = 1 AND type = 'page'"), items: 10)
     @paginated = true
     render template: 'wiki/index'
   end

From d9f48d9c06e07b17a07437abacde4ccbcf5c12b8 Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gauravsingh2699@rediffmail.com>
Date: Fri, 19 Mar 2021 23:46:20 +0530
Subject: [PATCH 08/11] Delete identifier.sqlite

---
 identifier.sqlite | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 identifier.sqlite

diff --git a/identifier.sqlite b/identifier.sqlite
deleted file mode 100644
index e69de29bb2..0000000000

From cf65ee16dde25d29fccc1961b16e79d690b0e932 Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Sun, 21 Mar 2021 18:58:04 +0530
Subject: [PATCH 09/11] Added functional test to check pagination

---
 test/functional/wiki_controller_test.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 638768b29b..af46a76f8c 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -31,6 +31,21 @@ def teardown
     assert assigns(:wikis).each_cons(2).all?{|i,j| "j.node_revisions.title" >= "i.node_revisions.title" }
   end
 
+  test 'should paginate the wikis' do
+    31.times{
+    post :create,
+         params: {
+           uid:   users(:bob).id,
+           title: 'Test',
+           body:  'This is fascinating documentation about balloon mapping.',
+           tags:  'balloon-mapping'
+         }
+    }
+    get :index
+    wikis = assigns(:wikis)
+    assert wikis.size==10
+  end
+
   test 'should get wiki stale pages' do
     get :stale
 

From c73e78f600027489faa17ee141a4a04d2aaa49f2 Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Mon, 22 Mar 2021 19:17:10 +0530
Subject: [PATCH 10/11] reduced no of new wikis for test

---
 test/functional/wiki_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index af46a76f8c..00e94ee6ab 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -32,7 +32,7 @@ def teardown
   end
 
   test 'should paginate the wikis' do
-    31.times{
+    6.times{
     post :create,
          params: {
            uid:   users(:bob).id,

From 9f8df6046f61768fb8d0fb5df64ce170e5410c2b Mon Sep 17 00:00:00 2001
From: gaurav2699 <gauravsingh2699@rediffmail.com>
Date: Mon, 22 Mar 2021 19:32:06 +0530
Subject: [PATCH 11/11] reduced 31 to 12

---
 test/functional/wiki_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 00e94ee6ab..049625f379 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -32,7 +32,7 @@ def teardown
   end
 
   test 'should paginate the wikis' do
-    6.times{
+    12.times{
     post :create,
          params: {
            uid:   users(:bob).id,