From 565cf93f5d1f8177245cd8078c7c7be25cb30ec3 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 14 Nov 2019 13:49:31 +0100
Subject: [PATCH] - Messages GUI multilingual - Tabulator refresh fixed

---
 application/views/system/messages/ajaxRead.php      |  1 +
 application/views/system/messages/ajaxWrite.php     | 13 ++++++++-----
 .../views/system/messages/ajaxWriteReply.php        | 11 ++++++-----
 .../views/system/messages/htmlWriteTemplate.php     |  1 +
 public/js/messaging/messageWrite.js                 |  4 ++--
 public/js/messaging/messageWriteReply.js            |  2 +-
 public/js/messaging/read.js                         |  6 ++++--
 public/js/messaging/write.js                        |  8 ++++----
 8 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
index 1e4dbd187..2ff1f6cbb 100644
--- a/application/views/system/messages/ajaxRead.php
+++ b/application/views/system/messages/ajaxRead.php
@@ -13,6 +13,7 @@
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/read.js')
 		)
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
index 88767628c..6080f3eef 100644
--- a/application/views/system/messages/ajaxWrite.php
+++ b/application/views/system/messages/ajaxWrite.php
@@ -11,6 +11,7 @@
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/write.js')
 		)
@@ -22,13 +23,13 @@
 				<div class="container-fluid">
 					<div class="row">
 						<div class="col-lg-12">
-							<h3 class="page-header">Send message</h3>
+							<h3 class="page-header"><?php echo $this->p->t('ui', 'sendMessage'); ?></h3>
 						</div>
 					</div>
 					<div class="row">
 						<div class="form-group">
 							<div class="col-lg-1 msgfieldcol-left">
-								<label>Receiver:</label>
+								<label><?php echo $this->p->t('ui', 'receiver'); ?>:</label>
 							</div>
 							<div class="col-lg-11 msgfieldcol-right">
 								<select id="organisationUnit">
@@ -42,7 +43,7 @@
 					<div class="row">
 						<div class="form-group">
 							<div class="col-lg-1 msgfield msgfieldcol-left">
-								<label>Subject:</label>
+								<label><?php echo $this->p->t('ui', 'subject'); ?>:</label>
 							</div>
 							&nbsp;
 							<div class="col-lg-7">
@@ -53,14 +54,16 @@
 					<br>
 					<div class="row">
 						<div class="col-lg-12">
-							<label>Message:</label>
+							<label><?php echo $this->p->t('ui', 'message'); ?>:</label>
 							<textarea id="body"></textarea>
 						</div>
 					</div>
 					<br>
 					<div class="row">
 						<div class="col-lg-12 text-right">
-							<button id="sendButton" class="btn btn-default" type="button">Send</button>
+							<button id="sendButton" class="btn btn-default" type="button">
+								<?php echo $this->p->t('ui', 'send'); ?>
+							</button>
 						</div>
 					</div>
 				</div>
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
index 25602271c..36d999fc0 100644
--- a/application/views/system/messages/ajaxWriteReply.php
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -11,6 +11,7 @@
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'tinymce' => true,
+			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/writeReply.js')
 		)
@@ -22,13 +23,13 @@
 				<div class="container-fluid">
 					<div class="row">
 						<div class="col-lg-12">
-							<h3 class="page-header">Reply to a message</h3>
+							<h3 class="page-header"><?php echo $this->p->t('ui', 'sendMessage'); ?></h3>
 						</div>
 					</div>
 					<div class="row">
 						<div class="form-group">
 							<div class="col-lg-1 msgfieldcol-left">
-								<label>Receiver:</label>
+								<label><?php echo $this->p->t('ui', 'receiver'); ?>:</label>
 							</div>
 							<div class="col-lg-11 msgfieldcol-right">
 
@@ -40,7 +41,7 @@
 					<div class="row">
 						<div class="form-group">
 							<div class="col-lg-1 msgfield msgfieldcol-left">
-								<label>Subject:</label>
+								<label><?php echo $this->p->t('ui', 'subject'); ?>:</label>
 							</div>
 							&nbsp;
 							<div id="subject" class="col-lg-7">
@@ -53,7 +54,7 @@
 					<br>
 					<div class="row">
 						<div class="col-lg-12">
-							<label>Message:</label>
+							<label><?php echo $this->p->t('ui', 'message'); ?>:</label>
 							<textarea id="body">
 
 								<?php echo $body; ?>
@@ -69,7 +70,7 @@
 							<input id="relationmessage_id" type="hidden" value="<?php echo $relationmessage_id; ?>">
 							<input id="token" type="hidden" value="<?php echo $token; ?>">
 
-							<button id="sendButton" class="btn btn-default" type="button">Send</button>
+							<button id="sendButton" class="btn btn-default" type="button"><?php echo $this->p->t('ui', 'send'); ?></button>
 						</div>
 					</div>
 				</div>
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 9d087f2ca..40d13a7d6 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -10,6 +10,7 @@
 			'fontawesome' => true,
 			'tinymce' => true,
 			'sbadmintemplate' => true,
+			'dialoglib' => true,
 			'widgets' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWrite.js')
diff --git a/public/js/messaging/messageWrite.js b/public/js/messaging/messageWrite.js
index 08a3b46a0..1b3efcda4 100644
--- a/public/js/messaging/messageWrite.js
+++ b/public/js/messaging/messageWrite.js
@@ -34,7 +34,7 @@ function parseMessageText(receiver_id, text)
 				}
 				else if (FHC_AjaxClient.isError(data))
 				{
-					alert(data.retval);
+					FHC_DialogLib.alertError(data.retval);
 				}
 			}
 		}
@@ -97,7 +97,7 @@ $(document).ready(function ()
 			}
 			else
 			{
-				alert("Subject and text are required fields!");
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
 			}
 		});
 	}
diff --git a/public/js/messaging/messageWriteReply.js b/public/js/messaging/messageWriteReply.js
index 6343701d7..c6401ded2 100644
--- a/public/js/messaging/messageWriteReply.js
+++ b/public/js/messaging/messageWriteReply.js
@@ -23,7 +23,7 @@ $(document).ready(function ()
 			}
 			else
 			{
-				alert("Subject and text are required fields!");
+				FHC_DialogLib.alertInfo("Subject and text are required fields!");
 			}
 		});
 	}
diff --git a/public/js/messaging/read.js b/public/js/messaging/read.js
index cc463b3f7..13e0f0ce0 100644
--- a/public/js/messaging/read.js
+++ b/public/js/messaging/read.js
@@ -11,7 +11,7 @@ var selectedToggleMessage = "received";
  */
 function readMessagesGenericError()
 {
-	FHC_DialogLib.alertError("An error occurred while retrieving message, contact the website administrator");
+	FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
 }
 
 /**
@@ -137,6 +137,8 @@ function rowFormatter(row, fontWeight = 700)
  */
 function _getMessages(getMessagesURL)
 {
+	tableMessageLst.replaceData(Array());
+
 	FHC_AjaxClient.ajaxCallGet(
 		getMessagesURL,
 		null,
@@ -195,7 +197,7 @@ function replyMessage()
 	}
 	else //
 	{
-		FHC_DialogLib.alertInfo("Please select a message");
+		FHC_DialogLib.alertInfo(FHC_PhrasesLib.t("ui", "pleaseSelectMessage"));
 	}
 }
 
diff --git a/public/js/messaging/write.js b/public/js/messaging/write.js
index 7be07f28a..e4933e211 100644
--- a/public/js/messaging/write.js
+++ b/public/js/messaging/write.js
@@ -9,7 +9,7 @@ function sendMessageToOU()
 {
 	if ($('#organisationUnit').val() == 0)
 	{
-		FHC_DialogLib.alertWarning("Not valid organisation unit");
+		FHC_DialogLib.alertWarning(FHC_PhrasesLib.t("global", "notValidOE"));
 	}
 	else
 	{
@@ -25,15 +25,15 @@ function sendMessageToOU()
 
 					if (FHC_AjaxClient.isSuccess(data))
 					{
-						FHC_DialogLib.alertSuccess("Message sent succesfully");
+						FHC_DialogLib.alertSuccess(FHC_PhrasesLib.t("global", "messageSent"));
 					}
 					else
 					{
-						FHC_DialogLib.alertError("Error");
+						FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
 					}
 				},
 				errorCallback: function() {
-					FHC_DialogLib.alertError("Error");
+					FHC_DialogLib.alertError(FHC_PhrasesLib.t("global", "genericError"));
 				},
 				veilTimeout: 300
 			}