Skip to content

Commit

Permalink
Refs #40608, Update translate and replace $this with nullObject in pr…
Browse files Browse the repository at this point in the history
…ocessImage.
  • Loading branch information
apple843119 committed May 20, 2024
1 parent 3f4cf19 commit 39b9ee9
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 6 deletions.
8 changes: 4 additions & 4 deletions CRM/Contact/BAO/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -851,13 +851,13 @@ public static function processImage() {
require_once 'CRM/Utils/Request.php';
require_once 'CRM/Core/DAO.php';

$action = CRM_Utils_Request::retrieve('action', 'String', $this);
$cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
$action = CRM_Utils_Request::retrieve('action', 'String', CRM_Core_DAO::$_nullObject);
$cid = CRM_Utils_Request::retrieve('cid', 'Positive', CRM_Core_DAO::$_nullObject);
// retrieve contact id in case of Profile context
$id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
$id = CRM_Utils_Request::retrieve('id', 'Positive', CRM_Core_DAO::$_nullObject);
$cid = $cid ? $cid : $id;
if ($action & CRM_Core_Action::DELETE) {
if (CRM_Utils_Request::retrieve('confirmed', 'Boolean', $this)) {
if (CRM_Utils_Request::retrieve('confirmed', 'Boolean',CRM_Core_DAO::$_nullObject)) {
CRM_Contact_BAO_Contact::deleteContactImage($cid);
CRM_Core_Session::setStatus(ts('Contact Image is deleted successfully'));
$session = CRM_Core_Session::singleton();
Expand Down
Binary file modified l10n/zh_TW/LC_MESSAGES/civicrm.mo
Binary file not shown.
94 changes: 92 additions & 2 deletions l10n/zh_TW/civicrm.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: netiCRM\n"
"PO-Revision-Date: 2013-07-25 09:19+0000\n"
"Last-Translator: Chang Shu-huai <[email protected]>, 2016-2024\n"
"Last-Translator: 馮 佳今, 2022-2024\n"
"Language-Team: Chinese (Taiwan) (http://app.transifex.com/netivism-tw/neticrm/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -8362,7 +8362,7 @@ msgstr "該圖片為無效的檔案類型,無法上傳。"

#: CRM/Contact/BAO/Contact.php
msgid "Contact Image is deleted successfully"
msgstr "選取的聯絡人已成功刪除。"
msgstr "選取的聯絡人圖像已成功刪除。"

#: CRM/Contact/BAO/Contact.php
msgid "Note(s)"
Expand Down Expand Up @@ -49991,3 +49991,93 @@ msgid ""
" supports this feature. If you need 3D Secure, please contact customer "
"service."
msgstr "若要啟用 3D 驗證,必須新增有支援此功能的 TapPay 商店 Merchant ID 與帳號金鑰,若需要 3D 驗證請洽客服。"

#: CRM/Group/Form/Edit.php
msgid "Smart Marketing Group"
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Cannot retrive remote group, try again later"
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Flydove"
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Please provide at least 1 contact."
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Group you request doesn't exists in flydove."
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Cannot get remote groups list."
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "The group you request doesn't exists in flydove."
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Success sync %1 contacts from group %2 to remote group %3"
msgstr ""

#: CRM/Mailing/External/SmartMarketing/Flydove.php
msgid "Skipped %1 contacts due to reasons: %2."
msgstr ""

#: CRM/Mailing/Page/AJAX.php
msgid "Synchronize error"
msgstr ""

#: CRM/Mailing/Page/AJAX.php
msgid "Successful synced"
msgstr ""

#: CRM/SMS/Form/Provider.php
msgid "This Title already exists in Database."
msgstr ""

#: templates/CRM/Group/Form/Edit.tpl
msgid ""
"The automated marketing journey does not start immediately and it needs to "
"follow the external tool to schedule."
msgstr ""

#: templates/CRM/Group/Form/Edit.tpl
msgid ""
"After binding a group, the system will lock this group, preventing any "
"edits."
msgstr ""

#: templates/CRM/Group/Page/Group.tpl
msgid ""
"Deactivation only applies to CRM groups; the automated marketing journey is "
"still ongoing. To deactivate, please go to the smart marketing tools backend"
" to proceed."
msgstr ""

#: templates/CRM/SMS/Form/Provider.tpl
msgid "Flydove Settings"
msgstr ""

#: templates/CRM/SMS/Form/Provider.tpl
msgid "Flydove File Import API Token"
msgstr ""

#: templates/CRM/SMS/Form/Provider.tpl
msgid "Flydove Subscribe API Token"
msgstr ""

#: templates/CRM/SMS/Form/Provider.tpl
msgid "Flydove Group Management API Token"
msgstr ""

#: templates/CRM/Group/Page/Group.tpl
msgid ""
"The smart markeintg journey is still in progress. To delete the contact or "
"remove contact from group list, you need to go to the external smart "
"marketing tool to proceed."
msgstr ""

0 comments on commit 39b9ee9

Please sign in to comment.