Semi-fix {ts} usage: the mix of js/smarty here isn't very practical. Will be fixed...

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index c6694293bc5137e9ce0f9a93adda0e2811bd88c9..cddaec64ab982a4eef9be3e0bfa3fb4b0177a378 100644 (file)
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -415,8 +415,12 @@
                 oTable.fnDraw();
               }
               else {
-                var relTypeAdminLink = {/literal}"{crmURL p='civicrm/admin/reltype' q='reset=1' h=0 }"{literal};
-                var errorMsg = '{/literal}{ts escape="js" 1="' + relTypeName + '" 2="' + relTypeAdminLink + '"}The relationship type definition for the %1 case role is not valid for the client and / or staff contact types. You can review and edit relationship types at <a href="%2">Administer >> Option Lists >> Relationship Types</a>{/ts}{literal}.';
+                // This is an awkward mix of smarty and javascript: the relTypeName variable is
+                // not available in smarty, could not find an i18n-correct way of doing this.
+                {/literal}
+                  {capture assign=relTypeAdminLink}{crmURL p='civicrm/admin/reltype' q='reset=1' h=0 }{/capture}
+                {literal}
+                var errorMsg = relTypeName + ': ' + '{/literal}{ts escape="js" 1="$relTypeAdminLink"}The relationship type definition for the case role is not valid for the client and / or staff contact types. You can review and edit relationship types at <a href="%1">Administer >> Option Lists >> Relationship Types</a>.{/ts}{literal}';
 
                 //display error message.
                 cj().crmError(errorMsg);