From 7403e89c6a2d5efc99f45183ce10635990a12061 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Mon, 6 Mar 2017 15:12:28 +0530
Subject: [PATCH] Unable to send company details through email templates Send
 reminder is not sending mail for Events

---
 languages/en_us/Calendar.php                             | 1 +
 layouts/v7/modules/Vtiger/ComposeEmailForm.tpl           | 2 +-
 layouts/v7/modules/Vtiger/resources/CkEditor.js          | 9 +++------
 .../translations/Arabic_ar_ae/modules/Calendar.php       | 3 +--
 .../BrazilianLanguagePack_bz_bz/modules/Calendar.php     | 4 ++--
 .../BritishLanguagePack_br_br/modules/Calendar.php       | 4 ++--
 pkg/vtiger/translations/Deutsch/modules/Calendar.php     | 4 ++--
 pkg/vtiger/translations/Dutch/modules/Calendar.php       | 4 ++--
 pkg/vtiger/translations/French/modules/Calendar.php      | 2 +-
 pkg/vtiger/translations/Hungarian/modules/Calendar.php   | 4 ++--
 .../ItalianLanguagePack_it_it/modules/Calendar.php       | 4 ++--
 .../modules/Calendar.php                                 | 4 ++--
 .../PolishLanguagePack_pl_pl/modules/Calendar.php        | 5 ++---
 .../RomanianLanguagePack_rm_rm/modules/Calendar.php      | 4 ++--
 pkg/vtiger/translations/Russian/modules/Calendar.php     | 4 ++--
 pkg/vtiger/translations/Spanish/modules/Calendar.php     | 4 ++--
 .../translations/Sweden_sv_se/modules/Calendar.php       | 3 +--
 .../TurkishLanguagePack_tr_tr/modules/Calendar.php       | 4 ++--
 18 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/languages/en_us/Calendar.php b/languages/en_us/Calendar.php
index a2c1f0811..728996280 100644
--- a/languages/en_us/Calendar.php
+++ b/languages/en_us/Calendar.php
@@ -175,6 +175,7 @@ $languageStrings = array(
 	'LBL_OCTOBER' => 'October',
 	'LBL_NOVEMBER' => 'November',
 	'LBL_DECEMBER' => 'December',
+	'LBL_CLICK_HERE_TO_VIEW' => 'Click here to view',
 );
 
 $jsLanguageStrings = array(
diff --git a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
index 63d38af38..a2600f07c 100644
--- a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
+++ b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
@@ -110,7 +110,7 @@
                                 <span class="pull-right">{vtranslate('LBL_SUBJECT',$MODULE)}&nbsp;<span class="redColor">*</span></span>
                             </div>
                             <div class="col-lg-6">
-                                <input type="text" name="subject" value="{$SUBJECT}" data-rule-required="true" id="subject" spellcheck="true"/>
+                                <input type="text" name="subject" value="{$SUBJECT}" data-rule-required="true" id="subject" spellcheck="true" class="inputElement"/>
                             </div>
                             <div class="col-lg-4"></div>
                         </div>
diff --git a/layouts/v7/modules/Vtiger/resources/CkEditor.js b/layouts/v7/modules/Vtiger/resources/CkEditor.js
index 2484adddd..012065162 100644
--- a/layouts/v7/modules/Vtiger/resources/CkEditor.js
+++ b/layouts/v7/modules/Vtiger/resources/CkEditor.js
@@ -75,13 +75,10 @@ jQuery.Class("Vtiger_CkEditor_Js",{},{
 	 * @params : textArea Element,contents ;
 	 */
 	loadContentsInCkeditor : function(contents){
-		var editor = this.getCkEditorInstanceFromName();
-		var editorData = editor.getData();
-        contents = contents.replace(/&nbsp;/g, ' '); // to replace &nbsp; with space
-		var replaced_text = editorData.replace(editorData, contents); 
-		editor.setData(replaced_text);	
+		var CkEditor = this.getCkEditorInstanceFromName();
+		CkEditor.setData(contents);
 	},
-    
+
     /**
      * Function to remove ckeditor instance
      */
diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Calendar.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Calendar.php
index 85b0fffb6..878697d74 100644
--- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Calendar.php
+++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Calendar.php
@@ -174,9 +174,8 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'تشرين الأول / أكتوبر',
   'LBL_NOVEMBER' => 'تشرين الثاني / نوفمبر',
   'LBL_DECEMBER' => 'كانون الأول / ديسمبر',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'انقر هنا لعرض',
 );
-
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK' => 'إضافة حدث / القيام',
 	'JS_TASK_IS_SUCCESSFULLY_ADDED_TO_YOUR_CALENDAR' => 'مهمةيضاف إلى التقويم الخاص بك بنجاح',
diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Calendar.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Calendar.php
index 91e7878ed..0aa1e4d6a 100644
--- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Calendar.php
+++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Outubro',
   'LBL_NOVEMBER' => 'Novembro',
   'LBL_DECEMBER' => 'Dezembro',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Clique aqui para ver',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Tarefa'            , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Final de Data E Hora deve ser maior que ou igual a Data de Início E Hora',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Final de Data E Hora deve ser maior que a Data de Início E Hora',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Calendar.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Calendar.php
index 296a4d217..233ceda0f 100644
--- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Calendar.php
+++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'October',
   'LBL_NOVEMBER' => 'November',
   'LBL_DECEMBER' => 'December',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Click here to view',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / To Do'            , 
@@ -231,4 +231,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'End Date & Time should be greater than or equal to Start Date & Time',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'End Date & Time should be greater than Start Date & Time',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Deutsch/modules/Calendar.php b/pkg/vtiger/translations/Deutsch/modules/Calendar.php
index e7639ad06..3c7c23f13 100644
--- a/pkg/vtiger/translations/Deutsch/modules/Calendar.php
+++ b/pkg/vtiger/translations/Deutsch/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Oktober',
   'LBL_NOVEMBER' => 'November',
   'LBL_DECEMBER' => 'Dezember',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Klicke hier, um anzusehen',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Aufgabe'            , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'End-Datum & Zeit sollte größer als oder gleich zu Start-Datum und Uhrzeit',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'End-Datum & Zeit sollte größer sein als Start-Datum und Uhrzeit',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Dutch/modules/Calendar.php b/pkg/vtiger/translations/Dutch/modules/Calendar.php
index a144347e6..b5c157849 100644
--- a/pkg/vtiger/translations/Dutch/modules/Calendar.php
+++ b/pkg/vtiger/translations/Dutch/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Oktober',
   'LBL_NOVEMBER' => 'November',
   'LBL_DECEMBER' => 'December',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Klik hier om te bekijken',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Voeg Event / Taak'       , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Eind Datum & Tijd moet groter zijn dan of gelijk aan Start Datum & Tijd',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Eind Datum & Tijd moet groter zijn dan Start Datum & Tijd',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/French/modules/Calendar.php b/pkg/vtiger/translations/French/modules/Calendar.php
index 00e8f8fc8..952527148 100644
--- a/pkg/vtiger/translations/French/modules/Calendar.php
+++ b/pkg/vtiger/translations/French/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Octobre',
   'LBL_NOVEMBER' => 'Novembre',
   'LBL_DECEMBER' => 'Décembre',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Cliquez ici pour afficher',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Tâche'      , 
diff --git a/pkg/vtiger/translations/Hungarian/modules/Calendar.php b/pkg/vtiger/translations/Hungarian/modules/Calendar.php
index 2b3a487a7..db7b1646d 100644
--- a/pkg/vtiger/translations/Hungarian/modules/Calendar.php
+++ b/pkg/vtiger/translations/Hungarian/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Október',
   'LBL_NOVEMBER' => 'November',
   'LBL_DECEMBER' => 'December',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Ide kattintva megtekintheti',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Esemény / Feladat', 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Vége Dátum & Idő kell nagyobb vagy egyenlő mint kezdő Dátum & Idő',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Vége Dátum & Idő kell nagyobb, mint kezdő Dátum & Idő',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Calendar.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Calendar.php
index 2bae0dce8..e2c5040a9 100644
--- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Calendar.php
+++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Ottobre',
   'LBL_NOVEMBER' => 'Novembre',
   'LBL_DECEMBER' => 'Dicembre',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Clicca qui per vedere',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Compito'            , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Fine-Data e Ora deve essere maggiore o uguale alla Data di Inizio e Ora',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Fine-Data e Ora dovrebbe essere maggiore di Data di Inizio e Ora',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Calendar.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Calendar.php
index 391822f4d..efda17ae4 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Calendar.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Octubre',
   'LBL_NOVEMBER' => 'Noviembre',
   'LBL_DECEMBER' => 'De diciembre de',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Haga clic aquí para ver',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Agregar Evento / Task'      , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Fecha de finalización Y el Tiempo debe ser mayor o igual a la Fecha de Inicio Y Tiempo',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Fecha de finalización Y el Tiempo debe ser mayor que la Fecha de Inicio Y Tiempo',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Calendar.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Calendar.php
index a702aeb9b..031b5b5ef 100644
--- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Calendar.php
+++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Calendar.php
@@ -167,9 +167,8 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Październik',
   'LBL_NOVEMBER' => 'Listopad',
   'LBL_DECEMBER' => 'Grudzień',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Kliknij tutaj, aby wyświetlić',
 );
-
 $jsLanguageStrings = array(
 
 	'LBL_ADD_EVENT_TASK' => 'Dodaj zadanie / Zadanie',
@@ -254,4 +253,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Koniec Data i godzina musi być większa niż lub równa dacie rozpoczęcia i czasie',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Koniec Data i godzina musi być większa niż Data rozpoczęcia i czas',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Calendar.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Calendar.php
index e43cf3fd7..26d35974f 100644
--- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Calendar.php
+++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Octombrie',
   'LBL_NOVEMBER' => 'Noiembrie',
   'LBL_DECEMBER' => 'Decembrie',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Apasa aici pentru a vizualiza',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Sarcină'            , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Sfârșitul de Data și ora trebuie să fie mai mare decât sau egală cu data de începere și ora de',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Sfârșitul de Data și ora trebuie să fie mai mare decât Data de început și ora de',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Russian/modules/Calendar.php b/pkg/vtiger/translations/Russian/modules/Calendar.php
index be92504b2..6dcad66dc 100644
--- a/pkg/vtiger/translations/Russian/modules/Calendar.php
+++ b/pkg/vtiger/translations/Russian/modules/Calendar.php
@@ -145,7 +145,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Октябрь',
   'LBL_NOVEMBER' => 'Ноябрь',
   'LBL_DECEMBER' => 'Декабрь',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Нажмите сюда, чтобы посмотреть',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Добавить событие / Задача'              ,
@@ -228,4 +228,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Конец Дата и время должно быть больше чем или равной дате начала и время',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Конец Дата и время должно быть больше чем Дата начала и время',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Spanish/modules/Calendar.php b/pkg/vtiger/translations/Spanish/modules/Calendar.php
index 15ef4dc27..168a6389b 100644
--- a/pkg/vtiger/translations/Spanish/modules/Calendar.php
+++ b/pkg/vtiger/translations/Spanish/modules/Calendar.php
@@ -154,7 +154,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Octubre',
   'LBL_NOVEMBER' => 'Noviembre',
   'LBL_DECEMBER' => 'De diciembre de',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Haga clic aquí para ver',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Añadir Evento / Tarea' ,
@@ -237,4 +237,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Fecha de finalización Y el Tiempo debe ser mayor o igual a la Fecha de Inicio Y Tiempo',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Fecha de finalización Y el Tiempo debe ser mayor que la Fecha de Inicio Y Tiempo',
 
-);
+);
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Calendar.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Calendar.php
index a1d301f0c..dd3c3c3ae 100755
--- a/pkg/vtiger/translations/Sweden_sv_se/modules/Calendar.php
+++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Calendar.php
@@ -174,9 +174,8 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Oktober',
   'LBL_NOVEMBER' => 'November',
   'LBL_DECEMBER' => 'December',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'Klicka här för att se',
 );
-
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK' => 'Lägg till händelse / att göra',
 	'JS_TASK_IS_SUCCESSFULLY_ADDED_TO_YOUR_CALENDAR' => 'Uppgift har lagts till i din kalender',
diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Calendar.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Calendar.php
index e4e2e4332..052a0609e 100644
--- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Calendar.php
+++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Calendar.php
@@ -146,7 +146,7 @@ $languageStrings = array(
   'LBL_OCTOBER' => 'Ekim',
   'LBL_NOVEMBER' => 'Kasım',
   'LBL_DECEMBER' => 'Aralık',
-
+	'LBL_CLICK_HERE_TO_VIEW' => 'görmek için buraya tıklayın',
 );
 $jsLanguageStrings = array(
 	'LBL_ADD_EVENT_TASK'           => 'Add Event / Görev'            , 
@@ -229,4 +229,4 @@ $jsLanguageStrings = array(
   'JS_CHECK_START_AND_END_DATE' => 'Bitiş Tarihi & Zaman daha büyük olmalıdır veya eşit Başlangıç Tarihi Ve Saati',
   'JS_CHECK_START_AND_END_DATE_SHOULD_BE_GREATER' => 'Tarih Ve Saati Başlangıç Tarihi Ve Saati daha fazla olmalı sonu',
 
-);
+);
\ No newline at end of file
-- 
GitLab