Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor translation fixes #96

Closed
wants to merge 3 commits into from
Closed

Minor translation fixes #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b611eea
Using Mage_CatalogSearch helper in form.mini.phtml so strings load fr…
barbazul Oct 1, 2012
97c554a
Fixed Mage_Directory system.xml so it uses the appropiate translation…
barbazul Oct 1, 2012
1728bea
Merge branch 'master' into TranslationFixes
barbazul Oct 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/code/core/Mage/CatalogSearch/view/frontend/form.mini.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
?>
<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[
(function($) {
$.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'
});
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Directory/etc/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down