From e100f8703f430ef891e9043134a65bb1c185b245 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 18 Jul 2021 10:56:51 +1000
Subject: [PATCH] [REF] Add in smarty modifier to replcae the upper smarty
 modifier to better handle umlouts / accents

---
 CRM/Core/Smarty/plugins/modifier.crmUpper.php | 28 +++++++++++++++++++
 templates/CRM/Event/Form/Participant.tpl      |  2 +-
 templates/CRM/Report/Form/Contact/Detail.tpl  |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 CRM/Core/Smarty/plugins/modifier.crmUpper.php

diff --git a/CRM/Core/Smarty/plugins/modifier.crmUpper.php b/CRM/Core/Smarty/plugins/modifier.crmUpper.php
new file mode 100644
index 0000000000..59b1fac10f
--- /dev/null
+++ b/CRM/Core/Smarty/plugins/modifier.crmUpper.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * Upper case a string but use the multibyte strtoupper function to better handle accents / umlaut
+ *
+ * @param string $string the string to upper case
+ *
+ * @return string
+ */
+function smarty_modifier_crmUpper($string): string {
+  return mb_strtoupper($string);
+}
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index 07cd154496..19c9d2849f 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -28,7 +28,7 @@
     <div class="view-content">
       {if !empty($participantMode)}
         <div class="help">
-          {ts 1=$displayName 2=$participantMode|upper}Use this form to submit an event registration on behalf of %1. <strong>A %2 transaction will be submitted</strong> using the selected payment processor.{/ts}
+          {ts 1=$displayName 2=$participantMode|crmUpper}Use this form to submit an event registration on behalf of %1. <strong>A %2 transaction will be submitted</strong> using the selected payment processor.{/ts}
         </div>
       {/if}
       <div id="eventFullMsg" class="messages status no-popup" style="display:none;"></div>
diff --git a/templates/CRM/Report/Form/Contact/Detail.tpl b/templates/CRM/Report/Form/Contact/Detail.tpl
index 00d4fb0835..7dfdeb2eb7 100644
--- a/templates/CRM/Report/Form/Contact/Detail.tpl
+++ b/templates/CRM/Report/Form/Contact/Detail.tpl
@@ -110,7 +110,7 @@
                             {assign var=componentContactId value=$row.contactID}
                             {foreach from=$columnHeadersComponent item=pheader key=component}
                                 {if $componentRows.$componentContactId.$component}
-                                    <h3>{$component|replace:'_civireport':''|upper}</h3>
+                                    <h3>{$component|replace:'_civireport':''|crmUpper}</h3>
                           <table class="report-layout crm-report_{$component}">
                               {*add space before headers*}
                             <tr>
-- 
2.25.1