From: fliespl <a.rzadkowolski@gmail.com>
Date: Sun, 5 Feb 2017 12:19:02 +0000 (+0100)
Subject: CRM-19896 - customTranslateFunction not mapped
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=43d1ad94e24e854dc47b5735621eaaa318c263c0;p=civicrm-core.git

CRM-19896 - customTranslateFunction not mapped

`customTranslateFunction` is not defined in `getPropertyMap` method with `MagicMerge` class.
It causes Custom Translation Function to not be taken into consideration at all while translating strings.
Solution:
adding `customTranslateFunction' => array('setting'),` key to `getPropertyMap` array resolves the issue.
---

diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index 72fe7827ed..7193f93007 100644
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -124,6 +124,7 @@ class CRM_Core_Config_MagicMerge {
       'backtrace' => array('setting'),
       'contact_default_language' => array('setting'),
       'countryLimit' => array('setting'),
+      'customTranslateFunction' => array('setting'),
       'dateInputFormat' => array('setting'),
       'dateformatDatetime' => array('setting'),
       'dateformatFull' => array('setting'),