From b611eeaaa46ee330ccce8d15b1552e2d53b418b1 Mon Sep 17 00:00:00 2001
From: barbazul <matias@semexpert.com.ar>
Date: Mon, 1 Oct 2012 16:40:31 -0300
Subject: [PATCH 1/2] Using Mage_CatalogSearch helper in form.mini.phtml so
 strings load from the correct translation file

---
 .../core/Mage/CatalogSearch/view/frontend/form.mini.phtml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/core/Mage/CatalogSearch/view/frontend/form.mini.phtml b/app/code/core/Mage/CatalogSearch/view/frontend/form.mini.phtml
index 2d0ba0b043c14..43b2ebb941250 100644
--- a/app/code/core/Mage/CatalogSearch/view/frontend/form.mini.phtml
+++ b/app/code/core/Mage/CatalogSearch/view/frontend/form.mini.phtml
@@ -26,9 +26,9 @@
 ?>
 <form id="search_mini_form" action="<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->getResultUrl() ?>" method="get">
     <div class="form-search">
-        <label for="search"><?php echo $this->__('Search:') ?></label>
+        <label for="search"><?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->__('Search:') ?></label>
         <input id="search" type="text" name="<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->getQueryParamName() ?>" value="<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->getEscapedQueryText() ?>" class="input-text" />
-        <button type="submit" title="<?php echo $this->__('Search') ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
+        <button type="submit" title="<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->__('Search') ?>" class="button"><span><span><?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->__('Search') ?></span></span></button>
         <div id="search_autocomplete" class="search-autocomplete"></div>
         <script type="text/javascript">
         //<![CDATA[
@@ -36,7 +36,7 @@
             $.mage.event.observe('mage.catalogsearch.initialize', function (e, o) {
                 o.formSelector = '#search_mini_form',
                 o.fieldSelector = '#search',
-                o.placeholder = '<?php echo $this->__('Search entire store here...') ?>',
+                o.placeholder = '<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->__('Search entire store here...') ?>',
                 o.url = '<?php echo $this->helper('Mage_CatalogSearch_Helper_Data')->getSuggestUrl() ?>',
                 o.destinationSelector = '#search_autocomplete'
             });

From 97c554a07692b10af45abbf4662485d94100f5f2 Mon Sep 17 00:00:00 2001
From: barbazul <matias@semexpert.com.ar>
Date: Mon, 1 Oct 2012 18:33:29 -0300
Subject: [PATCH 2/2] Fixed Mage_Directory system.xml so it uses the appropiate
 translation file

---
 app/code/core/Mage/Directory/etc/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Directory/etc/system.xml b/app/code/core/Mage/Directory/etc/system.xml
index 8f9fa2eb0befa..a8d69b794ac7a 100644
--- a/app/code/core/Mage/Directory/etc/system.xml
+++ b/app/code/core/Mage/Directory/etc/system.xml
@@ -199,7 +199,7 @@
             <groups>
                 <country>
                     <fields>
-                        <optional_zip_countries translate="label">
+                        <optional_zip_countries translate="label" module="Mage_Directory">
                             <label>Zip/Postal Code is Optional for</label>
                             <frontend_type>multiselect</frontend_type>
                             <sort_order>3</sort_order>