From 7462e65bdf44740ff564a60e591abfd3512a8734 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Wed, 6 Nov 2013 11:26:59 -0500 Subject: [PATCH] CRM-13713: localize the display of the country/province name for custom fields. --- CRM/Core/BAO/CustomGroup.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 94e7c1188a..730d43987f 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -1887,7 +1887,17 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1, if (is_object($coDAO)) { while ($coDAO->fetch()) { - $options[$coDAO->value] = $coDAO->label; + if ($dataType == 'Country') { + // NB: using ts() on a variable here is OK, since the value is pre-determined, not variable + // and already extracted to .pot files. + $options[$coDAO->value] = ts($coDAO->label, array('context' => 'country')); + } + elseif ($dataType == 'StateProvince') { + $options[$coDAO->value] = ts($coDAO->label, array('context' => 'province')); + } + else { + $options[$coDAO->value] = $coDAO->label; + } } } -- 2.25.1