From 94166e2842cb4cbe5cf13da702d3df74c1241df7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 12 Dec 2014 09:31:42 -0500
Subject: [PATCH] CRM-15679 - Fix translation popup for price set option form

---
 CRM/Price/Form/Option.php           | 3 +++
 templates/CRM/Price/Form/Option.tpl | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CRM/Price/Form/Option.php b/CRM/Price/Form/Option.php
index 543ed01140..91b7c1a377 100644
--- a/CRM/Price/Form/Option.php
+++ b/CRM/Price/Form/Option.php
@@ -146,6 +146,9 @@ class CRM_Price_Form_Option extends CRM_Core_Form {
       // hidden Option Id for validation use
       $this->add('hidden', 'optionId', $this->_oid);
 
+      // Needed for i18n dialog
+      $this->assign('optionId', $this->_oid);
+
       //hidden field ID for validation use
       $this->add('hidden', 'fieldId', $this->_fid);
 
diff --git a/templates/CRM/Price/Form/Option.tpl b/templates/CRM/Price/Form/Option.tpl
index 22337a36a3..071abc965c 100644
--- a/templates/CRM/Price/Form/Option.tpl
+++ b/templates/CRM/Price/Form/Option.tpl
@@ -45,7 +45,7 @@
       {/if}
       <tr class="crm-price-option-form-block-label">
         <td class="label">{$form.label.label}</td>
-        <td>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_price_field_value' field='label' id=$sid}{/if}{$form.label.html}</td>
+        <td>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_price_field_value' field='label' id=$optionId}{/if}{$form.label.html}</td>
       </tr>
       <tr class="crm-price-option-form-block-amount">
         <td class="label">{$form.amount.label}</td>
@@ -53,7 +53,7 @@
       </tr>
       <tr class="crm-price-option-form-block-description">
         <td class="label">{$form.description.label}</td>
-        <td>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_price_field_value' field='description' id=$sid}{/if}{$form.description.html}</td>
+        <td>{if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_price_field_value' field='description' id=$optionId}{/if}{$form.description.html}</td>
       </tr>
       <tr class="crm-price-option-form-block-financial-type">
         <td class="label">{$form.financial_type_id.label}</td>
-- 
2.25.1