viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix typo

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-03-12 10:40:09 +02:00
parent 64d31c8324
commit cbf8301a89
22 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Espo/Resources/i18n/bg_BG/Admin.json
View File

@@ -269,7 +269,7 @@
"accessInfoPortal": "Access Info за портали",
"assignment": "назначение",
"mention": "Споменавам",
"noteEmailRecieved": "Забележка за което ще получи Email",
"noteEmailReceived": "Забележка за което ще получи Email",
"notePost": "Забележка за публикация",
"notePostNoParent": "Забележка за публикация (без майка)",
"noteStatus": "Забележка за Актуализация на състоянието",

2
application/Espo/Resources/i18n/da_DK/Admin.json
View File

@@ -229,7 +229,7 @@
"accessInfoPortal": "Adgangsinfo for portaler",
"assignment": "Opgave",
"mention": "Nævne",
"noteEmailRecieved": "Notat omkring modtagne Email",
"noteEmailReceived": "Notat omkring modtagne Email",
"notePost": "Notat omkring poster",
"notePostNoParent": "Note omkring poster (Ingen henvisning)",
"noteStatus": "Notat omkring status opdatering",

2
application/Espo/Resources/i18n/de_DE/Admin.json
View File

@@ -234,7 +234,7 @@
"accessInfoPortal": "Zugriffsinfo für Portale",
"assignment": "Zuweisung",
"mention": "Erwähnen",
"noteEmailRecieved": "Hinweis zu empfangenen E-Mails",
"noteEmailReceived": "Hinweis zu empfangenen E-Mails",
"notePost": "Hinweis zum Beitrag",
"notePostNoParent": "Hinweis zum Beitrag (no Parent)",
"noteStatus": "Benachrichtigung über Statusupdates",

2
application/Espo/Resources/i18n/en_US/Admin.json
View File

@@ -291,7 +291,7 @@
"accessInfoPortal": "Access Info for Portals",
"assignment": "Assignment",
"mention": "Mention",
"noteEmailRecieved": "Note about Recieved Email",
"noteEmailReceived": "Note about Received Email",
"notePost": "Note about Post",
"notePostNoParent": "Note about Post (no Parent)",
"noteStatus": "Note about Status Update",

2
application/Espo/Resources/i18n/es_MX/Admin.json
View File

@@ -257,7 +257,7 @@
"accessInfoPortal": "Información de Acceso a Portales",
"assignment": "Asignación",
"mention": "Mención",
"noteEmailRecieved": "Nota sobre el Correo Recibido",
"noteEmailReceived": "Nota sobre el Correo Recibido",
"notePost": "Nota sobre la Publicación",
"notePostNoParent": "Nota sobre la Publicación (No el Padre)",
"noteStatus": "Nota sobre el Estado de la Actualización",

2
application/Espo/Resources/i18n/it_IT/Admin.json
View File

@@ -243,7 +243,7 @@
"accessInfoPortal": "Accedi alle informazioni per i portali",
"assignment": "Assegnato",
"mention": "Citare\n",
"noteEmailRecieved": "Nota sull'e-mail ricevuta",
"noteEmailReceived": "Nota sull'e-mail ricevuta",
"notePost": "Nota su post",
"notePostNoParent": "Nota su post (nessun genitore)",
"noteStatus": "Nota sull'aggiornamento dello stato",

2
application/Espo/Resources/i18n/lt_LT/Admin.json
View File

@@ -248,7 +248,7 @@
"accessInfoPortal": "Prieiga prie informacijos portalams",
"assignment": "Priskyrimai",
"mention": "Paminėti",
"noteEmailRecieved": "Pranešimas apie gautą el. laišką",
"noteEmailReceived": "Pranešimas apie gautą el. laišką",
"notePost": "Pranešimas apie įrašą",
"notePostNoParent": "Pranešimas apie įrašą (be susijusių)",
"noteStatus": "Pranešimas apie statuso atnaujinimą",

2
application/Espo/Resources/i18n/lv_LV/Admin.json
View File

@@ -258,7 +258,7 @@
"accessInfoPortal": "Piekļuves informācija par portāliem",
"assignment": "Uzdevums",
"mention": "Pieminēt",
"noteEmailRecieved": "Piezīme par saņemto e-pastu",
"noteEmailReceived": "Piezīme par saņemto e-pastu",
"notePost": "Piezīme par Postu",
"notePostNoParent": "Piezīme par ziņojumu (bez vecākiem)",
"noteStatus": "Piezīme par statusa atjaunināšanu",

2
application/Espo/Resources/i18n/nl_NL/Admin.json
View File

@@ -227,7 +227,7 @@
"accessInfoPortal": "Toegangs info voor Portaal",
"assignment": "Toegewezen",
"mention": "Genoemd",
"noteEmailRecieved": "Opmerking ontvangen E-mail",
"noteEmailReceived": "Opmerking ontvangen E-mail",
"notePost": "Opmerking over bericht",
"notePostNoParent": "Opmerking over bericht",
"noteStatus": "Opmerking over status-update",

2
application/Espo/Resources/i18n/pl_PL/Admin.json
View File

@@ -243,7 +243,7 @@
"templates": {
"accessInfo": "Informacje dostępowe",
"mention": "Wzmianka",
"noteEmailRecieved": "Notatka o otrzymanej wiadomości e-mail",
"noteEmailReceived": "Notatka o otrzymanej wiadomości e-mail",
"notePost": "Notatka o wpisie"
}
}

2
application/Espo/Resources/i18n/uk_UA/Admin.json
View File

@@ -252,7 +252,7 @@
"templates": {
"assignment": "Призначення",
"mention": "Згадування",
"noteEmailRecieved": "Повідомлення про отриманий емейл",
"noteEmailReceived": "Повідомлення про отриманий емейл",
"notePost": "Повідомлення про пост",
"noteStatus": "Повідомлення про оновлення статусу",
"passwordChangeLink": "Посилання на зміну паролю"

2
application/Espo/Resources/i18n/zh_TW/Admin.json
View File

@@ -281,7 +281,7 @@
"accessInfoPortal": "分配",
"assignment": "提到",
"mention": "已接收電子郵件的附註",
"noteEmailRecieved": "關於發文的附註",
"noteEmailReceived": "關於發文的附註",
"notePost": "關於發文的附註 (無上層)",
"notePostNoParent": "關於狀態更新的附註",
"noteStatus": "密碼更改鏈結",

2
application/Espo/Resources/metadata/app/templates.json
View File

@@ -11,7 +11,7 @@
"mention": {
"scope": "Note"
},
"noteEmailRecieved": {
"noteEmailReceived": {
"scope": "Note"
},
"notePost": {

2
application/Espo/Resources/templates/noteEmailRecieved/en_US/body.tpl → application/Espo/Resources/templates/noteEmailReceived/en_US/body.tpl
View File

@@ -1,4 +1,4 @@
<p>Email recieved from {{fromName}}, related to {{entityTypeLowerFirst}} '{{parentName}}'.</p>
<p>Email received from {{fromName}}, related to {{entityTypeLowerFirst}} '{{parentName}}'.</p>
<p>{{subject}}</p>
<p>{{{post}}}</p>
<p><a href="{{url}}">View</a></p>

1
application/Espo/Resources/templates/noteEmailReceived/en_US/subject.tpl Normal file
View File

@@ -0,0 +1 @@
Email received: [{{{entityType}}}] {{{name}}}

0
application/Espo/Resources/templates/noteEmailRecieved/zh_CN/body.tpl → application/Espo/Resources/templates/noteEmailReceived/zh_CN/body.tpl
View File

0
application/Espo/Resources/templates/noteEmailRecieved/zh_CN/subject.tpl → application/Espo/Resources/templates/noteEmailReceived/zh_CN/subject.tpl
View File

1
application/Espo/Resources/templates/noteEmailRecieved/en_US/subject.tpl
View File

@@ -1 +0,0 @@
Email recieved: [{{{entityType}}}] {{{name}}}

8
application/Espo/Services/EmailNotification.php
View File

@@ -669,13 +669,13 @@ class EmailNotification extends \Espo\Core\Services\Base
$data['entityType'] = $this->getLanguage()->translate($data['parentType'], 'scopeNames');
$data['entityTypeLowerFirst'] = Util::mbLowerCaseFirst($data['entityType']);
$subjectTpl = $this->getTemplateFileManager()->getTemplate('noteEmailRecieved', 'subject', $parentType);
$bodyTpl = $this->getTemplateFileManager()->getTemplate('noteEmailRecieved', 'body', $parentType);
$subjectTpl = $this->getTemplateFileManager()->getTemplate('noteEmailReceived', 'subject', $parentType);
$bodyTpl = $this->getTemplateFileManager()->getTemplate('noteEmailReceived', 'body', $parentType);
$subjectTpl = str_replace(["\n", "\r"], '', $subjectTpl);
$subject = $this->getHtmlizer()->render($note, $subjectTpl, 'note-email-recieved-email-subject-' . $parentType, $data, true);
$body = $this->getHtmlizer()->render($note, $bodyTpl, 'note-email-recieved-email-body-' . $parentType, $data, true);
$subject = $this->getHtmlizer()->render($note, $subjectTpl, 'note-email-received-email-subject-' . $parentType, $data, true);
$body = $this->getHtmlizer()->render($note, $bodyTpl, 'note-email-received-email-body-' . $parentType, $data, true);
$email = $this->getEntityManager()->getEntity('Email');

4
upgrades/5.8.3-5.8.4/data.json Normal file
View File

@@ -0,0 +1,4 @@
{
"manifest": {
}
}

33
upgrades/5.8.3-5.8.4/scripts/AfterUpgrade.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
* Website: http://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
************************************************************************/
class AfterUpgrade
{
public function run($container)
{
$from = 'custom/Espo/Custom/Resources/templates/noteEmailRecieved';
$to = 'custom/Espo/Custom/Resources/templates/noteEmailReceived';
if (is_dir($from)) {
rename($from, $to);
}
}
}

6
upgrades/5.8/scripts/AfterUpgrade.php
View File

@@ -34,6 +34,12 @@ class AfterUpgrade
$config->set('personNameFormat', 'firstLast');
$config->set('streamEmailWithContentEntityTypeList', ['Case']);
$config->save();
$from = 'custom/Espo/Custom/Resources/templates/noteEmailRecieved';
$to = 'custom/Espo/Custom/Resources/templates/noteEmailReceived';
if (is_dir($from)) {
rename($from, $to);
}
}
protected function populateOpportunityContactId()