From 32d0dd998364e6868b620107d8f3507f21762b74 Mon Sep 17 00:00:00 2001
From: Alain Abbas <alain.abbas@libertech.fr>
Date: Wed, 17 Aug 2022 03:56:44 +0200
Subject: [PATCH 1/5] translation of the button

---
 languages/fr/categorynotifications.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 languages/fr/categorynotifications.json

diff --git a/languages/fr/categorynotifications.json b/languages/fr/categorynotifications.json
new file mode 100644
index 0000000..e858ea6
--- /dev/null
+++ b/languages/fr/categorynotifications.json
@@ -0,0 +1,6 @@
+{
+	"subscribe": "S'abonner",
+	"unsubscribe": "Se désabonner",
+	"new-topic-in": "Nouveau sujet dans %1",
+	"new-reply-in": "Nouvelle reponse dans %1"
+}
\ No newline at end of file

From c80fb781c3fd61a374d4bad4372920df6b2d49a9 Mon Sep 17 00:00:00 2001
From: Alain Abbas <alain.abbas@libertech.fr>
Date: Wed, 17 Aug 2022 04:51:25 +0200
Subject: [PATCH 2/5] translation emails

---
 languages/en-GB/categorynotifications.json                | 7 ++++++-
 languages/fr/categorynotifications.json                   | 7 ++++++-
 public/templates/admin/plugins/category-notifications.tpl | 8 ++++----
 public/templates/emails/categoryNotifications_post.tpl    | 2 +-
 public/templates/emails/categoryNotifications_topic.tpl   | 3 ++-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/languages/en-GB/categorynotifications.json b/languages/en-GB/categorynotifications.json
index f5a601a..0efd9cf 100644
--- a/languages/en-GB/categorynotifications.json
+++ b/languages/en-GB/categorynotifications.json
@@ -2,5 +2,10 @@
 	"subscribe": "Subscribe",
 	"unsubscribe": "Unsubscribe",
 	"new-topic-in": "New Topic in %1",
-	"new-reply-in": "New Reply in %1"
+	"new-reply-in": "New Reply in %1",
+	"admin-title": "Notification Setting",
+	"email-categorie-post": "<a href='%1/user/%2'>%3</a> has posted a new reply to <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
+	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> has posted a new topic called <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
+	"view-topic": "View Topic",
+	"view-post": "View Post"
 }
\ No newline at end of file
diff --git a/languages/fr/categorynotifications.json b/languages/fr/categorynotifications.json
index e858ea6..6f0404c 100644
--- a/languages/fr/categorynotifications.json
+++ b/languages/fr/categorynotifications.json
@@ -2,5 +2,10 @@
 	"subscribe": "S'abonner",
 	"unsubscribe": "Se désabonner",
 	"new-topic-in": "Nouveau sujet dans %1",
-	"new-reply-in": "Nouvelle reponse dans %1"
+	"new-reply-in": "Nouvelle réponse dans %1",
+	"admin-title": "Réglage pour la notification",
+	"email-categorie-post": "<a href='%1/user/%2'>%3</a> a posté une nouvelle réponse  <a href='%1/topic/%4'>%5</a> dans <a href='%1/category/%6'>%7</a>",
+	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> a posté un nouveau sujet nommé <a href='%1/topic/%4'>%5</a> dans <a href='%1/category/%6'>%7</a>",
+	"view-topic": "Voir le sujet",
+	"view-post": "Voir la réponse"
 }
\ No newline at end of file
diff --git a/public/templates/admin/plugins/category-notifications.tpl b/public/templates/admin/plugins/category-notifications.tpl
index e17e942..1a9934b 100644
--- a/public/templates/admin/plugins/category-notifications.tpl
+++ b/public/templates/admin/plugins/category-notifications.tpl
@@ -5,11 +5,11 @@
 	<div class="row">
 		<div class="col-sm-6 col-xs-12">
 			<div class="form-group">
-				<label>Notification Setting</label>
+				<label>[[categorynotifications:admin-title]]</label>
 				<select id="notificationSetting" name="type" class="form-control" >
-					<option value="email">Send Email Only</option>
-					<option value="notification">Send Notification Only</option>
-					<option value="both">Send Both Email and Notification</option>
+					<option value="email">[[notifications:email_only]]</option>
+					<option value="notification">[[notifications:notification_only]]</option>
+					<option value="both">[[notifications:notification_and_email]]</option>
 				</select>
 			</div>
 		</div>
diff --git a/public/templates/emails/categoryNotifications_post.tpl b/public/templates/emails/categoryNotifications_post.tpl
index 9fea4d8..b5ed4dc 100644
--- a/public/templates/emails/categoryNotifications_post.tpl
+++ b/public/templates/emails/categoryNotifications_post.tpl
@@ -16,7 +16,7 @@
 				<tr>
 					<td style="padding: 0px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
 						<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">
-							<a href="{url}/user/{user.slug}">{user.name}</a> has posted a new reply to "<a href="{url}/topic/{topicSlug}">{title}</a>" in "<a href="{url}/category/{category.slug}">{category.name}</a>"
+						    [[categorynotifications:email-categorie-post,{url},{user.slug},{user.name},{topicSlug},{title},{category.slug},{category.name}]]
 						</h1>
 					</td>
 				</tr>
diff --git a/public/templates/emails/categoryNotifications_topic.tpl b/public/templates/emails/categoryNotifications_topic.tpl
index cca5b13..2031e53 100644
--- a/public/templates/emails/categoryNotifications_topic.tpl
+++ b/public/templates/emails/categoryNotifications_topic.tpl
@@ -17,6 +17,7 @@
 					<td style="padding: 0px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
 						<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">
 							<a href="{url}/user/{user.slug}">{user.name}</a> has posted a new topic called "<a href="{url}/topic/{topicSlug}">{title}</a>" in "<a href="{url}/category/{category.slug}">{category.name}</a>"
+						    [[categorynotifications:email-categorie-topic,{url},{user.slug},{user.name},{topicSlug},{title},{category.slug},{category.name}]]
 						</h1>
 					</td>
 				</tr>
@@ -34,7 +35,7 @@
 							<tr>
 								<td style="border-radius: 3px; background: #222222; text-align: center;" class="button-td">
 									<a href="{url}/topic/{topicSlug}" style="background: #222222; border: 15px solid #222222; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
-										<span style="color:#ffffff;" class="button-link">View Topic &rarr;</span>
+										<span style="color:#ffffff;" class="button-link">[[categorynotifications:view-topic]] &rarr;</span>
 									</a>
 								</td>
 							</tr>

From 8fa102b79fe08f824775fe76fca9297ceeaebfdd Mon Sep 17 00:00:00 2001
From: Alain Abbas <alain.abbas@libertech.fr>
Date: Wed, 17 Aug 2022 16:09:56 +0200
Subject: [PATCH 3/5] corrections

---
 languages/fr/categorynotifications.json                 | 6 +++---
 public/templates/emails/categoryNotifications_topic.tpl | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/languages/fr/categorynotifications.json b/languages/fr/categorynotifications.json
index 6f0404c..b5db705 100644
--- a/languages/fr/categorynotifications.json
+++ b/languages/fr/categorynotifications.json
@@ -1,11 +1,11 @@
 {
 	"subscribe": "S'abonner",
 	"unsubscribe": "Se désabonner",
-	"new-topic-in": "Nouveau sujet dans %1",
-	"new-reply-in": "Nouvelle réponse dans %1",
+	"new-topic-in": "Nouveau sujet dans '%1'",
+	"new-reply-in": "Nouvelle réponse dans '%1'",
 	"admin-title": "Réglage pour la notification",
 	"email-categorie-post": "<a href='%1/user/%2'>%3</a> a posté une nouvelle réponse  <a href='%1/topic/%4'>%5</a> dans <a href='%1/category/%6'>%7</a>",
-	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> a posté un nouveau sujet nommé <a href='%1/topic/%4'>%5</a> dans <a href='%1/category/%6'>%7</a>",
+	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> a posté un nouveau sujet nommé <a href='%1/topic/%4'>%5</a> dans la catégorie <a href='%1/category/%6'>%7</a>",
 	"view-topic": "Voir le sujet",
 	"view-post": "Voir la réponse"
 }
\ No newline at end of file
diff --git a/public/templates/emails/categoryNotifications_topic.tpl b/public/templates/emails/categoryNotifications_topic.tpl
index 2031e53..3cdb296 100644
--- a/public/templates/emails/categoryNotifications_topic.tpl
+++ b/public/templates/emails/categoryNotifications_topic.tpl
@@ -16,7 +16,6 @@
 				<tr>
 					<td style="padding: 0px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
 						<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">
-							<a href="{url}/user/{user.slug}">{user.name}</a> has posted a new topic called "<a href="{url}/topic/{topicSlug}">{title}</a>" in "<a href="{url}/category/{category.slug}">{category.name}</a>"
 						    [[categorynotifications:email-categorie-topic,{url},{user.slug},{user.name},{topicSlug},{title},{category.slug},{category.name}]]
 						</h1>
 					</td>

From 0972051f3304977a940e3f8fee46d44c40465a20 Mon Sep 17 00:00:00 2001
From: Alain Abbas <alain.abbas@libertech.fr>
Date: Wed, 17 Aug 2022 16:22:30 +0200
Subject: [PATCH 4/5] corrections

---
 languages/en-GB/categorynotifications.json                | 3 ++-
 languages/fr/categorynotifications.json                   | 4 ++--
 public/templates/admin/plugins/category-notifications.tpl | 4 ++--
 public/templates/emails/categoryNotifications_post.tpl    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/languages/en-GB/categorynotifications.json b/languages/en-GB/categorynotifications.json
index 0efd9cf..0282983 100644
--- a/languages/en-GB/categorynotifications.json
+++ b/languages/en-GB/categorynotifications.json
@@ -3,7 +3,8 @@
 	"unsubscribe": "Unsubscribe",
 	"new-topic-in": "New Topic in %1",
 	"new-reply-in": "New Reply in %1",
-	"admin-title": "Notification Setting",
+    "admin-title" : "Category Notifications",
+	"admin-label-notifications": "Notification Setting",
 	"email-categorie-post": "<a href='%1/user/%2'>%3</a> has posted a new reply to <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
 	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> has posted a new topic called <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
 	"view-topic": "View Topic",
diff --git a/languages/fr/categorynotifications.json b/languages/fr/categorynotifications.json
index b5db705..c458fec 100644
--- a/languages/fr/categorynotifications.json
+++ b/languages/fr/categorynotifications.json
@@ -3,8 +3,8 @@
 	"unsubscribe": "Se désabonner",
 	"new-topic-in": "Nouveau sujet dans '%1'",
 	"new-reply-in": "Nouvelle réponse dans '%1'",
-	"admin-title": "Réglage pour la notification",
-	"email-categorie-post": "<a href='%1/user/%2'>%3</a> a posté une nouvelle réponse  <a href='%1/topic/%4'>%5</a> dans <a href='%1/category/%6'>%7</a>",
+	"admin-label-notifications": "Réglage pour la notification",
+	"email-categorie-post": "<a href='%1/user/%2'>%3</a> a posté une nouvelle réponse  dans le sujet <a href='%1/topic/%4'>%5</a> dans la catégorie <a href='%1/category/%6'>%7</a>",
 	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> a posté un nouveau sujet nommé <a href='%1/topic/%4'>%5</a> dans la catégorie <a href='%1/category/%6'>%7</a>",
 	"view-topic": "Voir le sujet",
 	"view-post": "Voir la réponse"
diff --git a/public/templates/admin/plugins/category-notifications.tpl b/public/templates/admin/plugins/category-notifications.tpl
index 1a9934b..c644270 100644
--- a/public/templates/admin/plugins/category-notifications.tpl
+++ b/public/templates/admin/plugins/category-notifications.tpl
@@ -1,11 +1,11 @@
-<h1>Category Notifications</h1>
+<h1>[[categorynotifications:admin-title]]</h1>
 
 
 <form class="form category-notifications-settings">
 	<div class="row">
 		<div class="col-sm-6 col-xs-12">
 			<div class="form-group">
-				<label>[[categorynotifications:admin-title]]</label>
+				<label>[[categorynotifications:admin-label-notifications]]</label>
 				<select id="notificationSetting" name="type" class="form-control" >
 					<option value="email">[[notifications:email_only]]</option>
 					<option value="notification">[[notifications:notification_only]]</option>
diff --git a/public/templates/emails/categoryNotifications_post.tpl b/public/templates/emails/categoryNotifications_post.tpl
index b5ed4dc..ae53d56 100644
--- a/public/templates/emails/categoryNotifications_post.tpl
+++ b/public/templates/emails/categoryNotifications_post.tpl
@@ -34,7 +34,7 @@
 							<tr>
 								<td style="border-radius: 3px; background: #222222; text-align: center;" class="button-td">
 									<a href="{url}/post/{pid}" style="background: #222222; border: 15px solid #222222; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
-										<span style="color:#ffffff;" class="button-link">View Post &rarr;</span>
+										<span style="color:#ffffff;" class="button-link">[[categorynotifications:view-post]] &rarr;</span>
 									</a>
 								</td>
 							</tr>

From f6dfd6b3d2822226cea9c9f0eca523408323ed24 Mon Sep 17 00:00:00 2001
From: Alain Abbas <alain.abbas@libertech.fr>
Date: Fri, 19 Aug 2022 11:14:44 +0200
Subject: [PATCH 5/5] change inclusion for tpl

---
 languages/en-GB/categorynotifications.json              | 4 ++--
 languages/fr/categorynotifications.json                 | 5 +++--
 public/templates/emails/categoryNotifications_post.tpl  | 2 +-
 public/templates/emails/categoryNotifications_topic.tpl | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/languages/en-GB/categorynotifications.json b/languages/en-GB/categorynotifications.json
index 0282983..3c50c42 100644
--- a/languages/en-GB/categorynotifications.json
+++ b/languages/en-GB/categorynotifications.json
@@ -5,8 +5,8 @@
 	"new-reply-in": "New Reply in %1",
     "admin-title" : "Category Notifications",
 	"admin-label-notifications": "Notification Setting",
-	"email-categorie-post": "<a href='%1/user/%2'>%3</a> has posted a new reply to <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
-	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> has posted a new topic called <a href='%1/topic/%4'>%5</a> in <a href='%1/category/%6'>%7</a>",
+	"email-categorie-post": "<a href='%1'>%2</a> has posted a new reply to \"<a href='%3'>%4</a>\" in",
+	"email-categorie-topic": "<a href='%1'>%2</a> has posted a new topic called \"<a href='%3'>%4</a>\" in",
 	"view-topic": "View Topic",
 	"view-post": "View Post"
 }
\ No newline at end of file
diff --git a/languages/fr/categorynotifications.json b/languages/fr/categorynotifications.json
index c458fec..b0a690b 100644
--- a/languages/fr/categorynotifications.json
+++ b/languages/fr/categorynotifications.json
@@ -3,9 +3,10 @@
 	"unsubscribe": "Se désabonner",
 	"new-topic-in": "Nouveau sujet dans '%1'",
 	"new-reply-in": "Nouvelle réponse dans '%1'",
+    "admin-title" : "Notifications pour les catégories",
 	"admin-label-notifications": "Réglage pour la notification",
-	"email-categorie-post": "<a href='%1/user/%2'>%3</a> a posté une nouvelle réponse  dans le sujet <a href='%1/topic/%4'>%5</a> dans la catégorie <a href='%1/category/%6'>%7</a>",
-	"email-categorie-topic": "<a href='%1/user/%2'>%3</a> a posté un nouveau sujet nommé <a href='%1/topic/%4'>%5</a> dans la catégorie <a href='%1/category/%6'>%7</a>",
+    "email-categorie-post" : "<a href='%1'>%2</a> a posté une nouvelle réponse  dans le sujet \"<a href='%3'>%4</a>\" dans la catégorie",
+    "email-categorie-topic": "<a href='%1'>%2</a> a posté un nouveau sujet nommé \"<a href='%3'>%4</a>\" dans la catégorie",
 	"view-topic": "Voir le sujet",
 	"view-post": "Voir la réponse"
 }
\ No newline at end of file
diff --git a/public/templates/emails/categoryNotifications_post.tpl b/public/templates/emails/categoryNotifications_post.tpl
index ae53d56..9170751 100644
--- a/public/templates/emails/categoryNotifications_post.tpl
+++ b/public/templates/emails/categoryNotifications_post.tpl
@@ -16,7 +16,7 @@
 				<tr>
 					<td style="padding: 0px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
 						<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">
-						    [[categorynotifications:email-categorie-post,{url},{user.slug},{user.name},{topicSlug},{title},{category.slug},{category.name}]]
+						    [[categorynotifications:email-categorie-post,{url}/user/{user.slug},{user.name},{url}/topic/{topicSlug},{title}]] "<a href="{url}/category/{category.slug}">{category.name}</a>"
 						</h1>
 					</td>
 				</tr>
diff --git a/public/templates/emails/categoryNotifications_topic.tpl b/public/templates/emails/categoryNotifications_topic.tpl
index 3cdb296..e3c3c0f 100644
--- a/public/templates/emails/categoryNotifications_topic.tpl
+++ b/public/templates/emails/categoryNotifications_topic.tpl
@@ -16,7 +16,7 @@
 				<tr>
 					<td style="padding: 0px 40px; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 15px; line-height: 20px; color: #555555;">
 						<h1 style="margin: 0 0 10px 0; font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol; font-size: 18px; line-height: 21px; color: #aaaaaa; font-weight: normal;">
-						    [[categorynotifications:email-categorie-topic,{url},{user.slug},{user.name},{topicSlug},{title},{category.slug},{category.name}]]
+						    [[categorynotifications:email-categorie-topic,{url}/user/{user.slug},{user.name},{url}/topic/{topicSlug},{title}]] "<a href="{url}/category/{category.slug}">{category.name}</a>"
 						</h1>
 					</td>
 				</tr>