From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Mon, 27 Apr 2015 04:49:18 +0000 (-0400)
Subject: CRM-16176 - schema + templates update - upgrade script missing
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f2f99298d07155c2604ddbab2f181de2ea4aa0ad;p=civicrm-core.git

CRM-16176 - schema + templates update - upgrade script missing
---

diff --git a/CRM/Admin/Form/RelationshipType.php b/CRM/Admin/Form/RelationshipType.php
index 9e11ac2387..24dc46a428 100644
--- a/CRM/Admin/Form/RelationshipType.php
+++ b/CRM/Admin/Form/RelationshipType.php
@@ -101,6 +101,9 @@ class CRM_Admin_Form_RelationshipType extends CRM_Admin_Form {
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
     }
+
+    $this->assign('relationship_type_id', $this->_id);
+
   }
 
   /**
diff --git a/templates/CRM/Admin/Form/RelationshipType.tpl b/templates/CRM/Admin/Form/RelationshipType.tpl
index f7a4cbe122..55519fc8bf 100644
--- a/templates/CRM/Admin/Form/RelationshipType.tpl
+++ b/templates/CRM/Admin/Form/RelationshipType.tpl
@@ -36,12 +36,12 @@
      {else}
       <table class="form-layout-compressed">
             <tr class="crm-relationship-type-form-block-label_a_b">
-                <td class="label">{$form.label_a_b.label}</td>
+                <td class="label">{$form.label_a_b.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_relationship_type' field='label_a_b' id=$relationship_type_id}{/if}</td>
                 <td>{$form.label_a_b.html}<br />
                 <span class="description">{ts}Label for the relationship from Contact A to Contact B. EXAMPLE: Contact A is 'Parent of' Contact B.{/ts}</span></td>
             </tr>
             <tr class="crm-relationship-type-form-block-label_b_a">
-                <td class="label">{$form.label_b_a.label}</td>
+                <td class="label">{$form.label_b_a.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_relationship_type' field='label_b_a' id=$relationship_type_id}{/if}</td>
                 <td>{$form.label_b_a.html}<br />
                 <span class="description">{ts}Label for the relationship from Contact B to Contact A. EXAMPLE: Contact B is 'Child of' Contact A. You may leave this blank for relationships where the name is the same in both directions (e.g. Spouse).{/ts}</span></td>
             </tr>
@@ -54,7 +54,7 @@
                 <td>{$form.contact_types_b.html}</td>
             </tr>
             <tr class="crm-relationship-type-form-block-description">
-                <td class="label">{$form.description.label}</td>
+                <td class="label">{$form.description.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_relationship_type' field='description' id=$relationship_type_id}{/if}</td>
                 <td>{$form.description.html}</td>
             </tr>
             <tr class="crm-relationship-type-form-block-is_active">
diff --git a/xml/schema/Contact/RelationshipType.xml b/xml/schema/Contact/RelationshipType.xml
index 705a265a3c..f530b03211 100644
--- a/xml/schema/Contact/RelationshipType.xml
+++ b/xml/schema/Contact/RelationshipType.xml
@@ -34,6 +34,7 @@
     <length>64</length>
     <comment>label for relationship of contact_a to contact_b.</comment>
     <add>3.0</add>
+    <localizable>true</localizable>
   </field>
   <field>
     <name>name_b_a</name>
@@ -50,6 +51,7 @@
     <length>64</length>
     <comment>Optional label for relationship of contact_b to contact_a.</comment>
     <add>3.0</add>
+    <localizable>true</localizable>
   </field>
   <field>
     <name>description</name>
@@ -58,6 +60,7 @@
     <length>255</length>
     <comment>Optional verbose description of the relationship type.</comment>
     <add>1.1</add>
+    <localizable>true</localizable>
   </field>
   <field>
     <name>contact_type_a</name>