Merge branch 'fixes' into develop

vovayatsyuk · vovayatsyuk · commit daa42c8524ff · 2011-03-10T17:43:03.000+02:00
diff --git a/app/code/Axis/Locale/controllers/IndexController.php b/app/code/Axis/Locale/controllers/IndexController.php
@@ -1,22 +1,22 @@
 <?php
 /**
  * Axis
- * 
+ *
  * This file is part of Axis.
- * 
+ *
  * Axis is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Axis is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Axis.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * @category    Axis
  * @package     Axis_Locale
  * @subpackage  Axis_Locale_Controller
@@ -25,14 +25,14 @@
  */
 
 /**
- * 
+ *
  * @category    Axis
  * @package     Axis_Locale
  * @subpackage  Axis_Locale_Controller
  * @author      Axis Core Team <core@axiscommerce.com>
  */
 class Axis_Locale_IndexController extends Axis_Core_Controller_Front
-{   
+{
     public function changeAction()
     {
         $locale = $this->_getParam('lang');
@@ -49,5 +49,5 @@ public function changeAction()
         }
         $this->_redirect($redirectUrl);
     }
-    
+
 }
diff --git a/app/design/admin/default/templates/catalog/index/index.phtml b/app/design/admin/default/templates/catalog/index/index.phtml
@@ -46,7 +46,7 @@ if (in_array('Axis_Community', array_keys(Axis::app()->getModules()))) {
 
 $this->setButtons(array(
     array(
-        'title'     => Axis::translate('Axis_Admin')->__('Update Price Indexes'),
+        'title'     => Axis::translate('Axis_Catalog')->__('Update Price Indexes'),
         'onclick'   => 'Product.updatePriceIndex()',
         'class'     => 'alt-button'
     )
diff --git a/app/locale/en_US/Axis_Catalog.csv b/app/locale/en_US/Axis_Catalog.csv
@@ -175,3 +175,4 @@
 "Values [0 - 100]","Values [0 - 100]"
 "Product","Product"
 "Item(s) %d to %d of %d","Item(s) %d to %d of %d"
+"Update Price Indexes","Update Price Indexes"
diff --git a/app/locale/pt_BR/Axis_Catalog.csv b/app/locale/pt_BR/Axis_Catalog.csv
@@ -174,3 +174,4 @@
 "Enable image cache", "Ativar cache de imagem"
 "Path relative to the skin images folder: catalog/watermark.png", "Caminho relativo para a pasta skin: catalog/watermark.png"
 "Item(s) %d to %d of %d","Item(s) %d para %d de %d"
+"Update Price Indexes","Update Price Indexes"
diff --git a/app/locale/ru_RU/Axis_Catalog.csv b/app/locale/ru_RU/Axis_Catalog.csv
@@ -175,3 +175,4 @@
 "Values [0 - 100]", "Значения [0 - 100]"
 "Product", "Продукт"
 "Item(s) %d to %d of %d","Показано %d - %d из %d"
+"Update Price Indexes","Обновить индексы цен"
diff --git a/app/locale/uk_UA/Axis_Catalog.csv b/app/locale/uk_UA/Axis_Catalog.csv
@@ -175,3 +175,4 @@
 "Values [0 - 100]","Значення [0 - 100]"
 "Product","Продукт"
 "Item(s) %d to %d of %d","Показано %d - %d із %d"
+"Update Price Indexes","Оновити індекси цін"
diff --git a/js/axis/admin/catalog/index/product.js b/js/axis/admin/catalog/index/product.js
@@ -58,8 +58,8 @@ var Product = {
 
     updatePriceIndex: function(skipConfirm, skipSession) {
         if (!skipConfirm
-            && !confirm("Are you sure want to delete old price indexes " +
-            "and create new for all products?\nThis can take a while.".l())) {
+            && !confirm(("Are you sure want to delete old price indexes " +
+            "and create new for all products?\nThis can take a while.").l())) {
 
             return;
         }
diff --git a/js/axis/admin/translation/en_US/core.js b/js/axis/admin/translation/en_US/core.js
@@ -500,5 +500,6 @@ Locale.module("core", {
     "New Сategory": "New Сategory",
     "New Page": "New Page",
     "Install All": "Install All",
-    "Upgrade All": "Upgrade All"
+    "Upgrade All": "Upgrade All",
+    "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while.": "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while."
 });
diff --git a/js/axis/admin/translation/pt_BR/core.js b/js/axis/admin/translation/pt_BR/core.js
@@ -500,5 +500,6 @@ Locale.module("core", {
     "New Сategory": "Nova Categoria",
     "New Page": "Nova Página",
     "Install All": "Instalar Todos",
-    "Upgrade All": "Atualizar Todos"
+    "Upgrade All": "Atualizar Todos",
+    "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while.": "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while."
 });
diff --git a/js/axis/admin/translation/ru_RU/core.js b/js/axis/admin/translation/ru_RU/core.js
@@ -500,5 +500,6 @@ Locale.module("core", {
     "New Сategory": "Новая категория",
     "New Page": "Новая страница",
     "Install All": "Установить все",
-    "Upgrade All": "Обновить все"
+    "Upgrade All": "Обновить все",
+    "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while.": "Вы действительно желаете удалить все индексы и создать новые?\nЭто может занять некоторое время."
 });
diff --git a/js/axis/admin/translation/uk_UA/core.js b/js/axis/admin/translation/uk_UA/core.js
@@ -500,5 +500,6 @@ Locale.module("core", {
     "New Сategory": "Нова категорія",
     "New Page": "Нова сторінка",
     "Install All": "Встановити всі",
-    "Upgrade All": "Оновити всі"
+    "Upgrade All": "Оновити всі",
+    "Are you sure want to delete old price indexes and create new for all products?\nThis can take a while.": "Ви дійсно бажаєте видалити всі індекси та створити нові?\nЦе може зайняти деякий час."
 });
diff --git a/library/Axis/Application.php b/library/Axis/Application.php
@@ -150,6 +150,6 @@ public function getNamespaces()
      */
     public function getVersion()
     {
-        return '0.7.1.1';
+        return '0.7.2';
     }
 }
diff --git a/library/Axis/Controller/Plugin/Layout.php b/library/Axis/Controller/Plugin/Layout.php
@@ -121,7 +121,7 @@ protected function _initLayout()
             $parentPageId = $row['parent_page_id'];
         }
 
-        if (empty($layoutName)) {
+        if (empty($layoutName) && !empty($parentPageId)) {
             $layoutName = Axis::single('core/template_page')->select('layout')
                 ->where('template_id = ?', $themeId)
                 ->where('page_id = ? ', $parentPageId)
@@ -139,7 +139,7 @@ protected function _initLayout()
 
         $layout->setLayout($layoutName, false);
     }
-    
+
     protected function _initBlockAssigns()
     {
         $pages = $this->getPages();
@@ -152,7 +152,7 @@ protected function _initBlockAssigns()
         // add parent page
         $strongPage = current($pages);
         $themeId = Axis::config('design/main/frontTemplateId');
-        
+
         $parentPage = Axis::single('core/page')->select('*')
             ->join('core_template_page', 'cp.id = ctp.parent_page_id')
             ->where('ctp.template_id = ?', $themeId)
diff --git a/library/Axis/Controller/Plugin/Locale.php b/library/Axis/Controller/Plugin/Locale.php
@@ -42,7 +42,7 @@ public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
     {
         if (Axis_Area::isFrontend()
             && null !== $request->getParam('locale')//_hasParam('locale')
-            && Axis_Controller_Router_Route::hasLocaleInUrl()) {
+            /*&& Axis_Controller_Router_Route::hasLocaleInUrl()*/) {
 
             $locale = $request->getParam('locale');
         } elseif (isset(Axis::session()->locale)) {
diff --git a/library/Axis/Date.php b/library/Axis/Date.php
@@ -49,6 +49,18 @@ public function __construct($date = null, $part = null, $locale = null)
         @parent::__construct($date, $part, $locale);
     }
 
+    /**
+     * Returns a clone of $this, with the time part set to 00:00:00.
+     *
+     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
+     * @return Axis_Date
+     */
+    public function getDate($locale = null)
+    {
+        // supress notice about PCRE without UTF8 support
+        return @parent::getDate($locale);
+    }
+
     /**
      * Returns the Axis_Date with determined timestamp
      *
diff --git a/swf/open-flash-chart.swf b/swf/open-flash-chart.swf

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ if (in_array('Axis_Community', array_keys(Axis::app()->getModules()))) {`
`46`	`46`
`47`	`47`	`$this->setButtons(array(`
`48`	`48`	`array(`
`49`		`- 'title' => Axis::translate('Axis_Admin')->__('Update Price Indexes'),`
	`49`	`+ 'title' => Axis::translate('Axis_Catalog')->__('Update Price Indexes'),`
`50`	`50`	`'onclick' => 'Product.updatePriceIndex()',`
`51`	`51`	`'class' => 'alt-button'`
`52`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ var Product = {`
`58`	`58`
`59`	`59`	`updatePriceIndex: function(skipConfirm, skipSession) {`
`60`	`60`	`if (!skipConfirm`
`61`		`- && !confirm("Are you sure want to delete old price indexes " +`
`62`		`- "and create new for all products?\nThis can take a while.".l())) {`
	`61`	`+ && !confirm(("Are you sure want to delete old price indexes " +`
	`62`	`+ "and create new for all products?\nThis can take a while.").l())) {`
`63`	`63`
`64`	`64`	`return;`
`65`	`65`	`}`