Skip to content
Browse files

Update as of 7/26/2012

* Implemented Magento Validator library in order to have clear solid mechanism and formal rules of input data validation
* Moved translations to module directories, so that it is much more convenient to manage module resources
* Updated inline translation mechanism to support locales inheritance
* Implemented ability to navigate through pending reviews with Prev/Next buttons, no need to switch to grid and back
* Fixed issues:
  * Unable to use shell-installer after changes in Backend area routing process
  * Incorrect redirect after entering wrong captcha on the "Forgot your user name or password?" backend page
  * Translation is absent for several strings in Sales module `guest/form.phtml` template
  * Exception during installation process, when `var` directory is not empty
  * Node `modules` is merged to all modules' config XML-files, although it must be merged to `config.xml` only
* GitHub requests:
  * [#39](#39) -- added `composer.json`, which was announced at previous update, but mistakenly omitted from publishing
  • Loading branch information...
1 parent 1617a6e commit a27835b04c529fdc86320ee75194c708e056c169 @magento-team magento-team committed Jul 26, 2012
Showing with 256 additions and 45 deletions.
  1. +16 −1 CHANGELOG.markdown
  2. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/de_DE/Phoenix_Moneybookers.csv
  3. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/en_US/Phoenix_Moneybookers.csv
  4. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/es_ES/Phoenix_Moneybookers.csv
  5. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/fr_FR/Phoenix_Moneybookers.csv
  6. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/nl_NL/Phoenix_Moneybookers.csv
  7. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/pt_BR/Phoenix_Moneybookers.csv
  8. 0 app/{ → code/community/Phoenix/Moneybookers}/locale/zh_CN/Phoenix_Moneybookers.csv
  9. 0 app/{ → code/core/Mage/AdminNotification}/locale/de_DE/Mage_AdminNotification.csv
  10. 0 app/{ → code/core/Mage/AdminNotification}/locale/en_US/Mage_AdminNotification.csv
  11. 0 app/{ → code/core/Mage/AdminNotification}/locale/es_ES/Mage_AdminNotification.csv
  12. 0 app/{ → code/core/Mage/AdminNotification}/locale/fr_FR/Mage_AdminNotification.csv
  13. 0 app/{ → code/core/Mage/AdminNotification}/locale/nl_NL/Mage_AdminNotification.csv
  14. 0 app/{ → code/core/Mage/AdminNotification}/locale/pt_BR/Mage_AdminNotification.csv
  15. 0 app/{ → code/core/Mage/AdminNotification}/locale/zh_CN/Mage_AdminNotification.csv
  16. +41 −0 app/code/core/Mage/Adminhtml/Block/Review/Edit.php
  17. +72 −16 app/code/core/Mage/Adminhtml/Block/Review/Grid.php
  18. +6 −1 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
  19. 0 app/{ → code/core/Mage/Adminhtml}/locale/de_DE/Mage_Adminhtml.csv
  20. 0 app/{ → code/core/Mage/Adminhtml}/locale/en_US/Mage_Adminhtml.csv
  21. 0 app/{ → code/core/Mage/Adminhtml}/locale/es_ES/Mage_Adminhtml.csv
  22. 0 app/{ → code/core/Mage/Adminhtml}/locale/fr_FR/Mage_Adminhtml.csv
  23. 0 app/{ → code/core/Mage/Adminhtml}/locale/nl_NL/Mage_Adminhtml.csv
  24. 0 app/{ → code/core/Mage/Adminhtml}/locale/pt_BR/Mage_Adminhtml.csv
  25. 0 app/{ → code/core/Mage/Adminhtml}/locale/zh_CN/Mage_Adminhtml.csv
  26. 0 app/{ → code/core/Mage/Api}/locale/de_DE/Mage_Api.csv
  27. 0 app/{ → code/core/Mage/Api}/locale/en_US/Mage_Api.csv
  28. 0 app/{ → code/core/Mage/Api}/locale/es_ES/Mage_Api.csv
  29. 0 app/{ → code/core/Mage/Api}/locale/fr_FR/Mage_Api.csv
  30. 0 app/{ → code/core/Mage/Api}/locale/nl_NL/Mage_Api.csv
  31. 0 app/{ → code/core/Mage/Api}/locale/pt_BR/Mage_Api.csv
  32. 0 app/{ → code/core/Mage/Api}/locale/zh_CN/Mage_Api.csv
  33. 0 app/{ → code/core/Mage/Authorizenet}/locale/de_DE/Mage_Authorizenet.csv
  34. 0 app/{ → code/core/Mage/Authorizenet}/locale/en_US/Mage_Authorizenet.csv
  35. 0 app/{ → code/core/Mage/Authorizenet}/locale/es_ES/Mage_Authorizenet.csv
  36. 0 app/{ → code/core/Mage/Authorizenet}/locale/fr_FR/Mage_Authorizenet.csv
  37. 0 app/{ → code/core/Mage/Authorizenet}/locale/nl_NL/Mage_Authorizenet.csv
  38. 0 app/{ → code/core/Mage/Authorizenet}/locale/pt_BR/Mage_Authorizenet.csv
  39. 0 app/{ → code/core/Mage/Authorizenet}/locale/zh_CN/Mage_Authorizenet.csv
  40. 0 app/{ → code/core/Mage/Backup}/locale/de_DE/Mage_Backup.csv
  41. 0 app/{ → code/core/Mage/Backup}/locale/en_US/Mage_Backup.csv
  42. 0 app/{ → code/core/Mage/Backup}/locale/es_ES/Mage_Backup.csv
  43. 0 app/{ → code/core/Mage/Backup}/locale/fr_FR/Mage_Backup.csv
  44. 0 app/{ → code/core/Mage/Backup}/locale/nl_NL/Mage_Backup.csv
  45. 0 app/{ → code/core/Mage/Backup}/locale/pt_BR/Mage_Backup.csv
  46. 0 app/{ → code/core/Mage/Backup}/locale/zh_CN/Mage_Backup.csv
  47. 0 app/{ → code/core/Mage/Bundle}/locale/de_DE/Mage_Bundle.csv
  48. 0 app/{ → code/core/Mage/Bundle}/locale/en_US/Mage_Bundle.csv
  49. 0 app/{ → code/core/Mage/Bundle}/locale/es_ES/Mage_Bundle.csv
  50. 0 app/{ → code/core/Mage/Bundle}/locale/fr_FR/Mage_Bundle.csv
  51. 0 app/{ → code/core/Mage/Bundle}/locale/nl_NL/Mage_Bundle.csv
  52. 0 app/{ → code/core/Mage/Bundle}/locale/pt_BR/Mage_Bundle.csv
  53. 0 app/{ → code/core/Mage/Bundle}/locale/zh_CN/Mage_Bundle.csv
  54. +1 −1 app/code/core/Mage/Captcha/Model/Observer.php
  55. +10 −8 app/code/core/Mage/Captcha/etc/config.xml
  56. 0 app/{ → code/core/Mage/Captcha}/locale/de_DE/Mage_Captcha.csv
  57. 0 app/{ → code/core/Mage/Captcha}/locale/en_US/Mage_Captcha.csv
  58. 0 app/{ → code/core/Mage/Captcha}/locale/es_ES/Mage_Captcha.csv
  59. 0 app/{ → code/core/Mage/Captcha}/locale/fr_FR/Mage_Captcha.csv
  60. 0 app/{ → code/core/Mage/Captcha}/locale/nl_NL/Mage_Captcha.csv
  61. 0 app/{ → code/core/Mage/Captcha}/locale/pt_BR/Mage_Captcha.csv
  62. 0 app/{ → code/core/Mage/Captcha}/locale/zh_CN/Mage_Captcha.csv
  63. 0 app/{ → code/core/Mage/Catalog}/locale/de_DE/Mage_Catalog.csv
  64. 0 app/{ → code/core/Mage/Catalog}/locale/en_US/Mage_Catalog.csv
  65. 0 app/{ → code/core/Mage/Catalog}/locale/es_ES/Mage_Catalog.csv
  66. 0 app/{ → code/core/Mage/Catalog}/locale/fr_FR/Mage_Catalog.csv
  67. 0 app/{ → code/core/Mage/Catalog}/locale/nl_NL/Mage_Catalog.csv
  68. 0 app/{ → code/core/Mage/Catalog}/locale/pt_BR/Mage_Catalog.csv
  69. 0 app/{ → code/core/Mage/Catalog}/locale/zh_CN/Mage_Catalog.csv
  70. 0 app/{ → code/core/Mage/CatalogInventory}/locale/de_DE/Mage_CatalogInventory.csv
  71. 0 app/{ → code/core/Mage/CatalogInventory}/locale/en_US/Mage_CatalogInventory.csv
  72. 0 app/{ → code/core/Mage/CatalogInventory}/locale/es_ES/Mage_CatalogInventory.csv
  73. 0 app/{ → code/core/Mage/CatalogInventory}/locale/fr_FR/Mage_CatalogInventory.csv
  74. 0 app/{ → code/core/Mage/CatalogInventory}/locale/nl_NL/Mage_CatalogInventory.csv
  75. 0 app/{ → code/core/Mage/CatalogInventory}/locale/pt_BR/Mage_CatalogInventory.csv
  76. 0 app/{ → code/core/Mage/CatalogInventory}/locale/zh_CN/Mage_CatalogInventory.csv
  77. 0 app/{ → code/core/Mage/CatalogRule}/locale/de_DE/Mage_CatalogRule.csv
  78. 0 app/{ → code/core/Mage/CatalogRule}/locale/en_US/Mage_CatalogRule.csv
  79. 0 app/{ → code/core/Mage/CatalogRule}/locale/es_ES/Mage_CatalogRule.csv
  80. 0 app/{ → code/core/Mage/CatalogRule}/locale/fr_FR/Mage_CatalogRule.csv
  81. 0 app/{ → code/core/Mage/CatalogRule}/locale/nl_NL/Mage_CatalogRule.csv
  82. 0 app/{ → code/core/Mage/CatalogRule}/locale/pt_BR/Mage_CatalogRule.csv
  83. 0 app/{ → code/core/Mage/CatalogRule}/locale/zh_CN/Mage_CatalogRule.csv
  84. 0 app/{ → code/core/Mage/CatalogSearch}/locale/de_DE/Mage_CatalogSearch.csv
  85. 0 app/{ → code/core/Mage/CatalogSearch}/locale/en_US/Mage_CatalogSearch.csv
  86. 0 app/{ → code/core/Mage/CatalogSearch}/locale/es_ES/Mage_CatalogSearch.csv
  87. 0 app/{ → code/core/Mage/CatalogSearch}/locale/fr_FR/Mage_CatalogSearch.csv
  88. 0 app/{ → code/core/Mage/CatalogSearch}/locale/nl_NL/Mage_CatalogSearch.csv
  89. 0 app/{ → code/core/Mage/CatalogSearch}/locale/pt_BR/Mage_CatalogSearch.csv
  90. 0 app/{ → code/core/Mage/CatalogSearch}/locale/zh_CN/Mage_CatalogSearch.csv
  91. 0 app/{ → code/core/Mage/Centinel}/locale/de_DE/Mage_Centinel.csv
  92. 0 app/{ → code/core/Mage/Centinel}/locale/en_US/Mage_Centinel.csv
  93. 0 app/{ → code/core/Mage/Centinel}/locale/es_ES/Mage_Centinel.csv
  94. 0 app/{ → code/core/Mage/Centinel}/locale/fr_FR/Mage_Centinel.csv
  95. 0 app/{ → code/core/Mage/Centinel}/locale/nl_NL/Mage_Centinel.csv
  96. 0 app/{ → code/core/Mage/Centinel}/locale/pt_BR/Mage_Centinel.csv
  97. 0 app/{ → code/core/Mage/Centinel}/locale/zh_CN/Mage_Centinel.csv
  98. 0 app/{ → code/core/Mage/Checkout}/locale/de_DE/Mage_Checkout.csv
  99. 0 app/{ → code/core/Mage/Checkout}/locale/en_US/Mage_Checkout.csv
  100. 0 app/{ → code/core/Mage/Checkout}/locale/es_ES/Mage_Checkout.csv
  101. 0 app/{ → code/core/Mage/Checkout}/locale/fr_FR/Mage_Checkout.csv
  102. 0 app/{ → code/core/Mage/Checkout}/locale/nl_NL/Mage_Checkout.csv
  103. 0 app/{ → code/core/Mage/Checkout}/locale/pt_BR/Mage_Checkout.csv
  104. 0 app/{ → code/core/Mage/Checkout}/locale/zh_CN/Mage_Checkout.csv
  105. 0 app/{ → code/core/Mage/Cms}/locale/de_DE/Mage_Cms.csv
  106. 0 app/{ → code/core/Mage/Cms}/locale/en_US/Mage_Cms.csv
  107. 0 app/{ → code/core/Mage/Cms}/locale/es_ES/Mage_Cms.csv
  108. 0 app/{ → code/core/Mage/Cms}/locale/fr_FR/Mage_Cms.csv
  109. 0 app/{ → code/core/Mage/Cms}/locale/nl_NL/Mage_Cms.csv
  110. 0 app/{ → code/core/Mage/Cms}/locale/pt_BR/Mage_Cms.csv
  111. 0 app/{ → code/core/Mage/Cms}/locale/zh_CN/Mage_Cms.csv
  112. 0 app/{ → code/core/Mage/Connect}/locale/de_DE/Mage_Connect.csv
  113. 0 app/{ → code/core/Mage/Connect}/locale/en_US/Mage_Connect.csv
  114. 0 app/{ → code/core/Mage/Connect}/locale/es_ES/Mage_Connect.csv
  115. 0 app/{ → code/core/Mage/Connect}/locale/fr_FR/Mage_Connect.csv
  116. 0 app/{ → code/core/Mage/Connect}/locale/nl_NL/Mage_Connect.csv
  117. 0 app/{ → code/core/Mage/Connect}/locale/pt_BR/Mage_Connect.csv
  118. 0 app/{ → code/core/Mage/Connect}/locale/zh_CN/Mage_Connect.csv
  119. 0 app/{ → code/core/Mage/Contacts}/locale/de_DE/Mage_Contacts.csv
  120. 0 app/{ → code/core/Mage/Contacts}/locale/en_US/Mage_Contacts.csv
  121. 0 app/{ → code/core/Mage/Contacts}/locale/es_ES/Mage_Contacts.csv
  122. 0 app/{ → code/core/Mage/Contacts}/locale/fr_FR/Mage_Contacts.csv
  123. 0 app/{ → code/core/Mage/Contacts}/locale/nl_NL/Mage_Contacts.csv
  124. 0 app/{ → code/core/Mage/Contacts}/locale/pt_BR/Mage_Contacts.csv
  125. 0 app/{ → code/core/Mage/Contacts}/locale/zh_CN/Mage_Contacts.csv
  126. +1 −1 app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
  127. +34 −3 app/code/core/Mage/Core/Model/Config.php
  128. +9 −6 app/code/core/Mage/Core/Model/Translate.php
  129. 0 app/{ → code/core/Mage/Core}/locale/de_DE/Mage_Core.csv
  130. 0 app/{ → code/core/Mage/Core}/locale/en_US/Mage_Core.csv
  131. 0 app/{ → code/core/Mage/Core}/locale/es_ES/Mage_Core.csv
  132. 0 app/{ → code/core/Mage/Core}/locale/fr_FR/Mage_Core.csv
  133. 0 app/{ → code/core/Mage/Core}/locale/nl_NL/Mage_Core.csv
  134. 0 app/{ → code/core/Mage/Core}/locale/pt_BR/Mage_Core.csv
  135. 0 app/{ → code/core/Mage/Core}/locale/zh_CN/Mage_Core.csv
  136. 0 app/{ → code/core/Mage/Cron}/locale/de_DE/Mage_Cron.csv
  137. 0 app/{ → code/core/Mage/Cron}/locale/en_US/Mage_Cron.csv
  138. 0 app/{ → code/core/Mage/Cron}/locale/es_ES/Mage_Cron.csv
  139. 0 app/{ → code/core/Mage/Cron}/locale/fr_FR/Mage_Cron.csv
  140. 0 app/{ → code/core/Mage/Cron}/locale/nl_NL/Mage_Cron.csv
  141. 0 app/{ → code/core/Mage/Cron}/locale/pt_BR/Mage_Cron.csv
  142. 0 app/{ → code/core/Mage/Cron}/locale/zh_CN/Mage_Cron.csv
  143. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/de_DE/Mage_CurrencySymbol.csv
  144. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/en_US/Mage_CurrencySymbol.csv
  145. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/es_ES/Mage_CurrencySymbol.csv
  146. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/fr_FR/Mage_CurrencySymbol.csv
  147. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/nl_NL/Mage_CurrencySymbol.csv
  148. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/pt_BR/Mage_CurrencySymbol.csv
  149. 0 app/{ → code/core/Mage/CurrencySymbol}/locale/zh_CN/Mage_CurrencySymbol.csv
  150. 0 app/{ → code/core/Mage/Customer}/locale/de_DE/Mage_Customer.csv
  151. 0 app/{ → code/core/Mage/Customer}/locale/en_US/Mage_Customer.csv
  152. 0 app/{ → code/core/Mage/Customer}/locale/es_ES/Mage_Customer.csv
  153. 0 app/{ → code/core/Mage/Customer}/locale/fr_FR/Mage_Customer.csv
  154. 0 app/{ → code/core/Mage/Customer}/locale/nl_NL/Mage_Customer.csv
  155. 0 app/{ → code/core/Mage/Customer}/locale/pt_BR/Mage_Customer.csv
  156. 0 app/{ → code/core/Mage/Customer}/locale/zh_CN/Mage_Customer.csv
  157. 0 app/{ → code/core/Mage/Dataflow}/locale/de_DE/Mage_Dataflow.csv
  158. 0 app/{ → code/core/Mage/Dataflow}/locale/en_US/Mage_Dataflow.csv
  159. 0 app/{ → code/core/Mage/Dataflow}/locale/es_ES/Mage_Dataflow.csv
  160. 0 app/{ → code/core/Mage/Dataflow}/locale/fr_FR/Mage_Dataflow.csv
  161. 0 app/{ → code/core/Mage/Dataflow}/locale/nl_NL/Mage_Dataflow.csv
  162. 0 app/{ → code/core/Mage/Dataflow}/locale/pt_BR/Mage_Dataflow.csv
  163. 0 app/{ → code/core/Mage/Dataflow}/locale/zh_CN/Mage_Dataflow.csv
  164. 0 app/{ → code/core/Mage/Directory}/locale/de_DE/Mage_Directory.csv
  165. 0 app/{ → code/core/Mage/Directory}/locale/en_US/Mage_Directory.csv
  166. 0 app/{ → code/core/Mage/Directory}/locale/es_ES/Mage_Directory.csv
  167. 0 app/{ → code/core/Mage/Directory}/locale/fr_FR/Mage_Directory.csv
  168. 0 app/{ → code/core/Mage/Directory}/locale/nl_NL/Mage_Directory.csv
  169. 0 app/{ → code/core/Mage/Directory}/locale/pt_BR/Mage_Directory.csv
  170. 0 app/{ → code/core/Mage/Directory}/locale/zh_CN/Mage_Directory.csv
  171. 0 app/{ → code/core/Mage/Downloadable}/locale/de_DE/Mage_Downloadable.csv
  172. 0 app/{ → code/core/Mage/Downloadable}/locale/en_US/Mage_Downloadable.csv
  173. 0 app/{ → code/core/Mage/Downloadable}/locale/es_ES/Mage_Downloadable.csv
  174. 0 app/{ → code/core/Mage/Downloadable}/locale/fr_FR/Mage_Downloadable.csv
  175. 0 app/{ → code/core/Mage/Downloadable}/locale/nl_NL/Mage_Downloadable.csv
  176. 0 app/{ → code/core/Mage/Downloadable}/locale/pt_BR/Mage_Downloadable.csv
  177. 0 app/{ → code/core/Mage/Downloadable}/locale/zh_CN/Mage_Downloadable.csv
  178. 0 app/{ → code/core/Mage/Eav}/locale/de_DE/Mage_Eav.csv
  179. 0 app/{ → code/core/Mage/Eav}/locale/en_US/Mage_Eav.csv
  180. 0 app/{ → code/core/Mage/Eav}/locale/es_ES/Mage_Eav.csv
  181. 0 app/{ → code/core/Mage/Eav}/locale/fr_FR/Mage_Eav.csv
  182. 0 app/{ → code/core/Mage/Eav}/locale/nl_NL/Mage_Eav.csv
  183. 0 app/{ → code/core/Mage/Eav}/locale/pt_BR/Mage_Eav.csv
  184. 0 app/{ → code/core/Mage/Eav}/locale/zh_CN/Mage_Eav.csv
  185. 0 app/{ → code/core/Mage/GiftMessage}/locale/de_DE/Mage_GiftMessage.csv
  186. 0 app/{ → code/core/Mage/GiftMessage}/locale/en_US/Mage_GiftMessage.csv
  187. 0 app/{ → code/core/Mage/GiftMessage}/locale/es_ES/Mage_GiftMessage.csv
  188. 0 app/{ → code/core/Mage/GiftMessage}/locale/fr_FR/Mage_GiftMessage.csv
  189. 0 app/{ → code/core/Mage/GiftMessage}/locale/nl_NL/Mage_GiftMessage.csv
  190. 0 app/{ → code/core/Mage/GiftMessage}/locale/pt_BR/Mage_GiftMessage.csv
  191. 0 app/{ → code/core/Mage/GiftMessage}/locale/zh_CN/Mage_GiftMessage.csv
  192. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/de_DE/Mage_GoogleAnalytics.csv
  193. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/en_US/Mage_GoogleAnalytics.csv
  194. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/es_ES/Mage_GoogleAnalytics.csv
  195. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/fr_FR/Mage_GoogleAnalytics.csv
  196. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/nl_NL/Mage_GoogleAnalytics.csv
  197. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/pt_BR/Mage_GoogleAnalytics.csv
  198. 0 app/{ → code/core/Mage/GoogleAnalytics}/locale/zh_CN/Mage_GoogleAnalytics.csv
  199. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/de_DE/Mage_GoogleCheckout.csv
  200. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/en_US/Mage_GoogleCheckout.csv
  201. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/es_ES/Mage_GoogleCheckout.csv
  202. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/fr_FR/Mage_GoogleCheckout.csv
  203. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/nl_NL/Mage_GoogleCheckout.csv
  204. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/pt_BR/Mage_GoogleCheckout.csv
  205. 0 app/{ → code/core/Mage/GoogleCheckout}/locale/zh_CN/Mage_GoogleCheckout.csv
  206. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/de_DE/Mage_GoogleOptimizer.csv
  207. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/en_US/Mage_GoogleOptimizer.csv
  208. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/es_ES/Mage_GoogleOptimizer.csv
  209. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/fr_FR/Mage_GoogleOptimizer.csv
  210. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/nl_NL/Mage_GoogleOptimizer.csv
  211. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/pt_BR/Mage_GoogleOptimizer.csv
  212. 0 app/{ → code/core/Mage/GoogleOptimizer}/locale/zh_CN/Mage_GoogleOptimizer.csv
  213. 0 app/{ → code/core/Mage/GoogleShopping}/locale/en_US/Mage_GoogleShopping.csv
  214. 0 app/{ → code/core/Mage/ImportExport}/locale/de_DE/Mage_ImportExport.csv
  215. 0 app/{ → code/core/Mage/ImportExport}/locale/en_US/Mage_ImportExport.csv
  216. 0 app/{ → code/core/Mage/ImportExport}/locale/es_ES/Mage_ImportExport.csv
  217. 0 app/{ → code/core/Mage/ImportExport}/locale/fr_FR/Mage_ImportExport.csv
  218. 0 app/{ → code/core/Mage/ImportExport}/locale/nl_NL/Mage_ImportExport.csv
  219. 0 app/{ → code/core/Mage/ImportExport}/locale/pt_BR/Mage_ImportExport.csv
  220. 0 app/{ → code/core/Mage/ImportExport}/locale/zh_CN/Mage_ImportExport.csv
  221. 0 app/{ → code/core/Mage/Index}/locale/de_DE/Mage_Index.csv
  222. 0 app/{ → code/core/Mage/Index}/locale/en_US/Mage_Index.csv
  223. 0 app/{ → code/core/Mage/Index}/locale/es_ES/Mage_Index.csv
  224. 0 app/{ → code/core/Mage/Index}/locale/fr_FR/Mage_Index.csv
  225. 0 app/{ → code/core/Mage/Index}/locale/nl_NL/Mage_Index.csv
  226. 0 app/{ → code/core/Mage/Index}/locale/pt_BR/Mage_Index.csv
  227. 0 app/{ → code/core/Mage/Index}/locale/zh_CN/Mage_Index.csv
  228. +47 −0 app/code/core/Mage/Install/Helper/Data.php
  229. +6 −6 app/code/core/Mage/Install/Model/Installer/Abstract.php
  230. +2 −2 app/code/core/Mage/Install/Model/Installer/Console.php
  231. +11 −0 app/code/core/Mage/Install/controllers/IndexController.php
  232. 0 app/{ → code/core/Mage/Install}/locale/de_DE/Mage_Install.csv
  233. 0 app/{ → code/core/Mage/Install}/locale/en_US/Mage_Install.csv
  234. 0 app/{ → code/core/Mage/Install}/locale/es_ES/Mage_Install.csv
  235. 0 app/{ → code/core/Mage/Install}/locale/fr_FR/Mage_Install.csv
  236. 0 app/{ → code/core/Mage/Install}/locale/nl_NL/Mage_Install.csv
  237. 0 app/{ → code/core/Mage/Install}/locale/pt_BR/Mage_Install.csv
  238. 0 app/{ → code/core/Mage/Install}/locale/zh_CN/Mage_Install.csv
  239. 0 app/{ → code/core/Mage/Log}/locale/de_DE/Mage_Log.csv
  240. 0 app/{ → code/core/Mage/Log}/locale/en_US/Mage_Log.csv
  241. 0 app/{ → code/core/Mage/Log}/locale/es_ES/Mage_Log.csv
  242. 0 app/{ → code/core/Mage/Log}/locale/fr_FR/Mage_Log.csv
  243. 0 app/{ → code/core/Mage/Log}/locale/nl_NL/Mage_Log.csv
  244. 0 app/{ → code/core/Mage/Log}/locale/pt_BR/Mage_Log.csv
  245. 0 app/{ → code/core/Mage/Log}/locale/zh_CN/Mage_Log.csv
  246. 0 app/{ → code/core/Mage/Media}/locale/de_DE/Mage_Media.csv
  247. 0 app/{ → code/core/Mage/Media}/locale/en_US/Mage_Media.csv
  248. 0 app/{ → code/core/Mage/Media}/locale/es_ES/Mage_Media.csv
  249. 0 app/{ → code/core/Mage/Media}/locale/fr_FR/Mage_Media.csv
  250. 0 app/{ → code/core/Mage/Media}/locale/nl_NL/Mage_Media.csv
  251. 0 app/{ → code/core/Mage/Media}/locale/pt_BR/Mage_Media.csv
  252. 0 app/{ → code/core/Mage/Media}/locale/zh_CN/Mage_Media.csv
  253. 0 app/{ → code/core/Mage/Newsletter}/locale/de_DE/Mage_Newsletter.csv
  254. 0 app/{ → code/core/Mage/Newsletter}/locale/en_US/Mage_Newsletter.csv
  255. 0 app/{ → code/core/Mage/Newsletter}/locale/es_ES/Mage_Newsletter.csv
  256. 0 app/{ → code/core/Mage/Newsletter}/locale/fr_FR/Mage_Newsletter.csv
  257. 0 app/{ → code/core/Mage/Newsletter}/locale/nl_NL/Mage_Newsletter.csv
  258. 0 app/{ → code/core/Mage/Newsletter}/locale/pt_BR/Mage_Newsletter.csv
  259. 0 app/{ → code/core/Mage/Newsletter}/locale/zh_CN/Mage_Newsletter.csv
  260. 0 app/{locale/zh_CN → code/core/Mage/Oauth/locale/de_DE}/Mage_Oauth.csv
  261. 0 app/{locale/pt_BR → code/core/Mage/Oauth/locale/en_US}/Mage_Oauth.csv
  262. 0 app/{locale/nl_NL → code/core/Mage/Oauth/locale/es_ES}/Mage_Oauth.csv
  263. 0 app/{ → code/core/Mage/Oauth}/locale/fr_FR/Mage_Oauth.csv
  264. 0 app/{locale/es_ES → code/core/Mage/Oauth/locale/nl_NL}/Mage_Oauth.csv
  265. 0 app/{locale/en_US → code/core/Mage/Oauth/locale/pt_BR}/Mage_Oauth.csv
  266. 0 app/{locale/de_DE → code/core/Mage/Oauth/locale/zh_CN}/Mage_Oauth.csv
  267. 0 app/{ → code/core/Mage/Ogone}/locale/de_DE/Mage_Ogone.csv
  268. 0 app/{ → code/core/Mage/Ogone}/locale/en_US/Mage_Ogone.csv
  269. 0 app/{ → code/core/Mage/Ogone}/locale/es_ES/Mage_Ogone.csv
  270. 0 app/{ → code/core/Mage/Ogone}/locale/fr_FR/Mage_Ogone.csv
  271. 0 app/{ → code/core/Mage/Ogone}/locale/nl_NL/Mage_Ogone.csv
  272. 0 app/{ → code/core/Mage/Ogone}/locale/pt_BR/Mage_Ogone.csv
  273. 0 app/{ → code/core/Mage/Ogone}/locale/zh_CN/Mage_Ogone.csv
  274. 0 app/{ → code/core/Mage/Page}/locale/de_DE/Mage_Page.csv
  275. 0 app/{ → code/core/Mage/Page}/locale/en_US/Mage_Page.csv
  276. 0 app/{ → code/core/Mage/Page}/locale/es_ES/Mage_Page.csv
  277. 0 app/{ → code/core/Mage/Page}/locale/fr_FR/Mage_Page.csv
  278. 0 app/{ → code/core/Mage/Page}/locale/nl_NL/Mage_Page.csv
  279. 0 app/{ → code/core/Mage/Page}/locale/pt_BR/Mage_Page.csv
  280. 0 app/{ → code/core/Mage/Page}/locale/zh_CN/Mage_Page.csv
  281. 0 app/{ → code/core/Mage/PageCache}/locale/de_DE/Mage_PageCache.csv
  282. 0 app/{ → code/core/Mage/PageCache}/locale/en_US/Mage_PageCache.csv
  283. 0 app/{ → code/core/Mage/PageCache}/locale/es_ES/Mage_PageCache.csv
  284. 0 app/{ → code/core/Mage/PageCache}/locale/fr_FR/Mage_PageCache.csv
  285. 0 app/{ → code/core/Mage/PageCache}/locale/nl_NL/Mage_PageCache.csv
  286. 0 app/{ → code/core/Mage/PageCache}/locale/pt_BR/Mage_PageCache.csv
  287. 0 app/{ → code/core/Mage/PageCache}/locale/zh_CN/Mage_PageCache.csv
  288. 0 app/{ → code/core/Mage/Paygate}/locale/de_DE/Mage_Paygate.csv
  289. 0 app/{ → code/core/Mage/Paygate}/locale/en_US/Mage_Paygate.csv
  290. 0 app/{ → code/core/Mage/Paygate}/locale/es_ES/Mage_Paygate.csv
  291. 0 app/{ → code/core/Mage/Paygate}/locale/fr_FR/Mage_Paygate.csv
  292. 0 app/{ → code/core/Mage/Paygate}/locale/nl_NL/Mage_Paygate.csv
  293. 0 app/{ → code/core/Mage/Paygate}/locale/pt_BR/Mage_Paygate.csv
  294. 0 app/{ → code/core/Mage/Paygate}/locale/zh_CN/Mage_Paygate.csv
  295. 0 app/{ → code/core/Mage/Payment}/locale/de_DE/Mage_Payment.csv
  296. 0 app/{ → code/core/Mage/Payment}/locale/en_US/Mage_Payment.csv
  297. 0 app/{ → code/core/Mage/Payment}/locale/es_ES/Mage_Payment.csv
  298. 0 app/{ → code/core/Mage/Payment}/locale/fr_FR/Mage_Payment.csv
  299. 0 app/{ → code/core/Mage/Payment}/locale/nl_NL/Mage_Payment.csv
  300. 0 app/{ → code/core/Mage/Payment}/locale/pt_BR/Mage_Payment.csv
Sorry, we could not display the entire diff because too many files (666) changed.
View
17 CHANGELOG.markdown
@@ -1,3 +1,18 @@
+Update as of 7/26/2012
+=====================
+* Implemented Magento Validator library in order to have clear solid mechanism and formal rules of input data validation
+* Moved translations to module directories, so that it is much more convenient to manage module resources
+* Updated inline translation mechanism to support locales inheritance
+* Implemented ability to navigate through pending reviews with Prev/Next buttons, no need to switch to grid and back
+* Fixed issues:
+ * Unable to use shell-installer after changes in Backend area routing process
+ * Incorrect redirect after entering wrong captcha on the "Forgot your user name or password?" backend page
+ * Translation is absent for several strings in Sales module `guest/form.phtml` template
+ * Exception during installation process, when `var` directory is not empty
+ * Node `modules` is merged to all modules' config XML-files, although it must be merged to `config.xml` only
+* GitHub requests:
+ * [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json`, which was announced at previous update, but mistakenly omitted from publishing
+
Update as of 7/19/2012
=====================
* Implemented inheritance of locales. Inheritance is declared in `app/locale/<locale_name>/config.xml`
@@ -25,7 +40,7 @@ Update as of 7/19/2012
* Other small fixes
* GitHub requests:
* [#37](https://github.com/magento/magento2/pull/37) -- fixed particular case of "HEADERS ALREADY SENT" error in WYSIWYG thumbnail
- * [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json`
+ * [#39](https://github.com/magento/magento2/pull/39) -- added `composer.json` (actually, doesn't come with this update due to a mistake in publishing process)
* [#40](https://github.com/magento/magento2/pull/40) -- fixed generation of "secret key" in backend URLs to honor `_forward` in controllers
Update as of 7/3/2012
View
0 app/locale/de_DE/Phoenix_Moneybookers.csv → ...ers/locale/de_DE/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/en_US/Phoenix_Moneybookers.csv → ...ers/locale/en_US/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/es_ES/Phoenix_Moneybookers.csv → ...ers/locale/es_ES/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/fr_FR/Phoenix_Moneybookers.csv → ...ers/locale/fr_FR/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/nl_NL/Phoenix_Moneybookers.csv → ...ers/locale/nl_NL/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/pt_BR/Phoenix_Moneybookers.csv → ...ers/locale/pt_BR/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/zh_CN/Phoenix_Moneybookers.csv → ...ers/locale/zh_CN/Phoenix_Moneybookers.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_AdminNotification.csv → ...n/locale/de_DE/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_AdminNotification.csv → ...n/locale/en_US/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_AdminNotification.csv → ...n/locale/es_ES/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_AdminNotification.csv → ...n/locale/fr_FR/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_AdminNotification.csv → ...n/locale/nl_NL/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_AdminNotification.csv → ...n/locale/pt_BR/Mage_AdminNotification.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_AdminNotification.csv → ...n/locale/zh_CN/Mage_AdminNotification.csv
File renamed without changes.
View
41 app/code/core/Mage/Adminhtml/Block/Review/Edit.php
@@ -41,6 +41,37 @@ public function __construct()
$this->_objectId = 'id';
$this->_controller = 'review';
+ /** @var $actionPager Mage_Review_Helper_Action_Pager */
+ $actionPager = Mage::helper('Mage_Review_Helper_Action_Pager');
+ $actionPager->setStorageId('reviews');
+
+ $reviewId = $this->getRequest()->getParam('id');
+ $prevId = $actionPager->getPreviousItemId($reviewId);
+ $nextId = $actionPager->getNextItemId($reviewId);
+ if ($prevId !== false) {
+ $this->addButton('previous', array(
+ 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Previous'),
+ 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('id' => $prevId)) . '\')'
+ ), 3, 10);
+
+ $this->addButton('save_and_previous', array(
+ 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Save and Previous'),
+ 'onclick' => 'submitAndGo(\'' . $prevId . '\')',
+ 'class' => 'save'
+ ), 3, 11);
+ }
+ if ($nextId !== false) {
+ $this->addButton('save_and_next', array(
+ 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Save and Next'),
+ 'onclick' => 'submitAndGo(\'' . $nextId . '\')',
+ 'class' => 'save'
+ ), 3, 100);
+
+ $this->addButton('next', array(
+ 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Next'),
+ 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('id' => $nextId)) . '\')'
+ ), 3, 105);
+ }
$this->_updateButton('save', 'label', Mage::helper('Mage_Review_Helper_Data')->__('Save Review'));
$this->_updateButton('save', 'id', 'save_button');
$this->_updateButton('delete', 'label', Mage::helper('Mage_Review_Helper_Data')->__('Delete Review'));
@@ -97,6 +128,16 @@ public function __construct()
}
$this->_formInitScripts[] = '
+ function submitAndGo(id)
+ {
+ var nextIdElement = document.createElement("input");
+ nextIdElement.name = "next_item";
+ nextIdElement.type = "text";
+ nextIdElement.value = id;
+ document.getElementById("edit_form").appendChild(nextIdElement);
+ editForm.submit();
+ }
+
var review = {
updateRating: function() {
elements = [
View
88 app/code/core/Mage/Adminhtml/Block/Review/Grid.php
@@ -27,23 +27,53 @@
/**
* Adminhtml reviews grid
*
+ * @method int getProductId() getProductId()
+ * @method Mage_Adminhtml_Block_Review_Grid setProductId() setProductId(int $productId)
+ * @method int getCustomerId() getCustomerId()
+ * @method Mage_Adminhtml_Block_Review_Grid setCustomerId() setCustomerId(int $customerId)
+ * @method Mage_Adminhtml_Block_Review_Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
+ *
* @category Mage
* @package Mage_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-class Mage_Adminhtml_Block_Review_Grid extends Mage_Adminhtml_Block_Widget_Grid
+class Mage_Adminhtml_Block_Review_Grid extends Mage_Backend_Block_Widget_Grid
{
-
+ /**
+ * Initialize grid
+ */
public function __construct()
{
parent::__construct();
$this->setId('reviwGrid');
$this->setDefaultSort('created_at');
}
+ /**
+ * Save search results
+ *
+ * @return Mage_Backend_Block_Widget_Grid
+ */
+ protected function _afterLoadCollection()
+ {
+ /** @var $actionPager Mage_Review_Helper_Action_Pager */
+ $actionPager = Mage::helper('Mage_Review_Helper_Action_Pager');
+ $actionPager->setStorageId('reviews');
+ $actionPager->setItems($this->getCollection()->getResultingIds());
+
+ return parent::_afterLoadCollection();
+ }
+
+ /**
+ * Prepare collection
+ *
+ * @return Mage_Adminhtml_Block_Review_Grid
+ */
protected function _prepareCollection()
{
+ /** @var $model Mage_Review_Model_Review */
$model = Mage::getModel('Mage_Review_Model_Review');
+ /** @var $collection Mage_Review_Model_Resource_Review_Product_Collection */
$collection = $model->getProductCollection();
if ($this->getProductId() || $this->getRequest()->getParam('productId', false)) {
@@ -74,18 +104,25 @@ protected function _prepareCollection()
return parent::_prepareCollection();
}
+ /**
+ * Prepare grid columns
+ *
+ * @return Mage_Backend_Block_Widget_Grid
+ */
protected function _prepareColumns()
{
+ /** @var $helper Mage_Review_Helper_Data */
+ $helper = Mage::helper('Mage_Review_Helper_Data');
$this->addColumn('review_id', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('ID'),
+ 'header' => $helper->__('ID'),
'align' => 'right',
'width' => '50px',
'filter_index' => 'rt.review_id',
'index' => 'review_id',
));
$this->addColumn('created_at', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Created On'),
+ 'header' => $helper->__('Created On'),
'align' => 'left',
'type' => 'datetime',
'width' => '100px',
@@ -95,18 +132,18 @@ protected function _prepareColumns()
if( !Mage::registry('usePendingFilter') ) {
$this->addColumn('status', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Status'),
+ 'header' => $helper->__('Status'),
'align' => 'left',
'type' => 'options',
- 'options' => Mage::helper('Mage_Review_Helper_Data')->getReviewStatuses(),
+ 'options' => $helper->getReviewStatuses(),
'width' => '100px',
'filter_index' => 'rt.status_id',
'index' => 'status_id',
));
}
$this->addColumn('title', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Title'),
+ 'header' => $helper->__('Title'),
'align' => 'left',
'width' => '100px',
'filter_index' => 'rdt.title',
@@ -117,7 +154,7 @@ protected function _prepareColumns()
));
$this->addColumn('nickname', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Nickname'),
+ 'header' => $helper->__('Nickname'),
'align' => 'left',
'width' => '100px',
'filter_index' => 'rdt.nickname',
@@ -128,7 +165,7 @@ protected function _prepareColumns()
));
$this->addColumn('detail', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Review'),
+ 'header' => $helper->__('Review'),
'align' => 'left',
'index' => 'detail',
'filter_index' => 'rdt.detail',
@@ -143,31 +180,31 @@ protected function _prepareColumns()
*/
if (!Mage::app()->isSingleStoreMode()) {
$this->addColumn('visible_in', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Visible In'),
+ 'header' => $helper->__('Visible In'),
'index' => 'stores',
'type' => 'store',
'store_view' => true,
));
}
$this->addColumn('type', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Type'),
+ 'header' => $helper->__('Type'),
'type' => 'select',
'index' => 'type',
'filter' => 'Mage_Adminhtml_Block_Review_Grid_Filter_Type',
'renderer' => 'Mage_Adminhtml_Block_Review_Grid_Renderer_Type'
));
$this->addColumn('name', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Product Name'),
+ 'header' => $helper->__('Product Name'),
'align' =>'left',
'type' => 'text',
'index' => 'name',
'escape' => true
));
$this->addColumn('sku', array(
- 'header' => Mage::helper('Mage_Review_Helper_Data')->__('Product SKU'),
+ 'header' => $helper->__('Product SKU'),
'align' => 'right',
'type' => 'text',
'width' => '50px',
@@ -204,8 +241,16 @@ protected function _prepareColumns()
return parent::_prepareColumns();
}
+ /**
+ * Prepare grid mass actions
+ *
+ * @return Mage_Backend_Block_Widget_Grid|void
+ */
protected function _prepareMassaction()
{
+ /** @var $helper Mage_Review_Helper_Data */
+ $helper = Mage::helper('Mage_Review_Helper_Data');
+
$this->setMassactionIdField('review_id');
$this->setMassactionIdFilter('rt.review_id');
$this->setMassactionIdFieldOnlyIndexValue(true);
@@ -220,10 +265,10 @@ protected function _prepareMassaction()
'confirm' => Mage::helper('Mage_Review_Helper_Data')->__('Are you sure?')
));
- $statuses = Mage::helper('Mage_Review_Helper_Data')->getReviewStatusesOptionArray();
+ $statuses = $helper->getReviewStatusesOptionArray();
array_unshift($statuses, array('label'=>'', 'value'=>''));
$this->getMassactionBlock()->addItem('update_status', array(
- 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Update Status'),
+ 'label' => $helper->__('Update Status'),
'url' => $this->getUrl(
'*/*/massUpdateStatus',
array('ret' => Mage::registry('usePendingFilter') ? 'pending' : 'index')
@@ -233,13 +278,19 @@ protected function _prepareMassaction()
'name' => 'status',
'type' => 'select',
'class' => 'required-entry',
- 'label' => Mage::helper('Mage_Review_Helper_Data')->__('Status'),
+ 'label' => $helper->__('Status'),
'values' => $statuses
)
)
));
}
+ /**
+ * Get row url
+ *
+ * @param Mage_Review_Model_Review|Varien_Object $row
+ * @return string
+ */
public function getRowUrl($row)
{
return $this->getUrl('*/catalog_product_review/edit', array(
@@ -250,6 +301,11 @@ public function getRowUrl($row)
));
}
+ /**
+ * Get grid url
+ *
+ * @return string
+ */
public function getGridUrl()
{
if( $this->getProductId() || $this->getCustomerId() ) {
View
7 app/code/core/Mage/Adminhtml/controllers/Catalog/Product/ReviewController.php
@@ -160,7 +160,12 @@ public function saveAction()
}
}
- return $this->getResponse()->setRedirect($this->getUrl($this->getRequest()->getParam('ret') == 'pending' ? '*/*/pending' : '*/*/'));
+ $nextId = (int) $this->getRequest()->getParam('next_item');
+ $url = $this->getUrl($this->getRequest()->getParam('ret') == 'pending' ? '*/*/pending' : '*/*/');
+ if ($nextId) {
+ $url = $this->getUrl('*/*/edit', array('id' => $nextId));
+ }
+ return $this->getResponse()->setRedirect($url);
}
$this->_redirect('*/*/');
}
View
0 app/locale/de_DE/Mage_Adminhtml.csv → ...Adminhtml/locale/de_DE/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Adminhtml.csv → ...Adminhtml/locale/en_US/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Adminhtml.csv → ...Adminhtml/locale/es_ES/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Adminhtml.csv → ...Adminhtml/locale/fr_FR/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Adminhtml.csv → ...Adminhtml/locale/nl_NL/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Adminhtml.csv → ...Adminhtml/locale/pt_BR/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Adminhtml.csv → ...Adminhtml/locale/zh_CN/Mage_Adminhtml.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Api.csv → ...e/core/Mage/Api/locale/de_DE/Mage_Api.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Api.csv → ...e/core/Mage/Api/locale/en_US/Mage_Api.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Api.csv → ...e/core/Mage/Api/locale/es_ES/Mage_Api.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Api.csv → ...e/core/Mage/Api/locale/fr_FR/Mage_Api.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Api.csv → ...e/core/Mage/Api/locale/nl_NL/Mage_Api.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Api.csv → ...e/core/Mage/Api/locale/pt_BR/Mage_Api.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Api.csv → ...e/core/Mage/Api/locale/zh_CN/Mage_Api.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Authorizenet.csv → ...izenet/locale/de_DE/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Authorizenet.csv → ...izenet/locale/en_US/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Authorizenet.csv → ...izenet/locale/es_ES/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Authorizenet.csv → ...izenet/locale/fr_FR/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Authorizenet.csv → ...izenet/locale/nl_NL/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Authorizenet.csv → ...izenet/locale/pt_BR/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Authorizenet.csv → ...izenet/locale/zh_CN/Mage_Authorizenet.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Backup.csv → .../Mage/Backup/locale/de_DE/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Backup.csv → .../Mage/Backup/locale/en_US/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Backup.csv → .../Mage/Backup/locale/es_ES/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Backup.csv → .../Mage/Backup/locale/fr_FR/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Backup.csv → .../Mage/Backup/locale/nl_NL/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Backup.csv → .../Mage/Backup/locale/pt_BR/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Backup.csv → .../Mage/Backup/locale/zh_CN/Mage_Backup.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Bundle.csv → .../Mage/Bundle/locale/de_DE/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Bundle.csv → .../Mage/Bundle/locale/en_US/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Bundle.csv → .../Mage/Bundle/locale/es_ES/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Bundle.csv → .../Mage/Bundle/locale/fr_FR/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Bundle.csv → .../Mage/Bundle/locale/nl_NL/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Bundle.csv → .../Mage/Bundle/locale/pt_BR/Mage_Bundle.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Bundle.csv → .../Mage/Bundle/locale/zh_CN/Mage_Bundle.csv
File renamed without changes.
View
2 app/code/core/Mage/Captcha/Model/Observer.php
@@ -205,7 +205,7 @@ public function checkUserForgotPasswordBackend($observer)
$this->_getBackendSession()->setEmail((string) $controller->getRequest()->getPost('email'));
$controller->setFlag('', Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH, true);
$this->_getBackendSession()->addError(Mage::helper('Mage_Captcha_Helper_Data')->__('Incorrect CAPTCHA.'));
- $controller->getResponse()->setRedirect(Mage::getUrl('*/*/forgotpassword'));
+ $controller->getResponse()->setRedirect($controller->getUrl('*/*/forgotpassword', array('_nosecret' => true)));
}
}
}
View
18 app/code/core/Mage/Captcha/etc/config.xml
@@ -71,14 +71,6 @@
</captcha>
</observers>
</controller_action_predispatch_customer_account_createpost>
- <controller_action_predispatch_adminhtml_auth_forgotpassword>
- <observers>
- <captcha>
- <class>Mage_Captcha_Model_Observer</class>
- <method>checkUserForgotPasswordBackend</method>
- </captcha>
- </observers>
- </controller_action_predispatch_adminhtml_auth_forgotpassword>
<admin_user_authenticate_before>
<observers>
<captcha>
@@ -154,6 +146,16 @@
</captcha>
</updates>
</layout>
+ <events>
+ <controller_action_predispatch_adminhtml_auth_forgotpassword>
+ <observers>
+ <captcha>
+ <class>Mage_Captcha_Model_Observer</class>
+ <method>checkUserForgotPasswordBackend</method>
+ </captcha>
+ </observers>
+ </controller_action_predispatch_adminhtml_auth_forgotpassword>
+ </events>
</adminhtml>
<default>
<system>
View
0 app/locale/de_DE/Mage_Captcha.csv → ...age/Captcha/locale/de_DE/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Captcha.csv → ...age/Captcha/locale/en_US/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Captcha.csv → ...age/Captcha/locale/es_ES/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Captcha.csv → ...age/Captcha/locale/fr_FR/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Captcha.csv → ...age/Captcha/locale/nl_NL/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Captcha.csv → ...age/Captcha/locale/pt_BR/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Captcha.csv → ...age/Captcha/locale/zh_CN/Mage_Captcha.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Catalog.csv → ...age/Catalog/locale/de_DE/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Catalog.csv → ...age/Catalog/locale/en_US/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Catalog.csv → ...age/Catalog/locale/es_ES/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Catalog.csv → ...age/Catalog/locale/fr_FR/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Catalog.csv → ...age/Catalog/locale/nl_NL/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Catalog.csv → ...age/Catalog/locale/pt_BR/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Catalog.csv → ...age/Catalog/locale/zh_CN/Mage_Catalog.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_CatalogInventory.csv → ...ry/locale/de_DE/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_CatalogInventory.csv → ...ry/locale/en_US/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_CatalogInventory.csv → ...ry/locale/es_ES/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_CatalogInventory.csv → ...ry/locale/fr_FR/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_CatalogInventory.csv → ...ry/locale/nl_NL/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_CatalogInventory.csv → ...ry/locale/pt_BR/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_CatalogInventory.csv → ...ry/locale/zh_CN/Mage_CatalogInventory.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_CatalogRule.csv → ...logRule/locale/de_DE/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_CatalogRule.csv → ...logRule/locale/en_US/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_CatalogRule.csv → ...logRule/locale/es_ES/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_CatalogRule.csv → ...logRule/locale/fr_FR/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_CatalogRule.csv → ...logRule/locale/nl_NL/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_CatalogRule.csv → ...logRule/locale/pt_BR/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_CatalogRule.csv → ...logRule/locale/zh_CN/Mage_CatalogRule.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_CatalogSearch.csv → ...earch/locale/de_DE/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_CatalogSearch.csv → ...earch/locale/en_US/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_CatalogSearch.csv → ...earch/locale/es_ES/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_CatalogSearch.csv → ...earch/locale/fr_FR/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_CatalogSearch.csv → ...earch/locale/nl_NL/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_CatalogSearch.csv → ...earch/locale/pt_BR/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_CatalogSearch.csv → ...earch/locale/zh_CN/Mage_CatalogSearch.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Centinel.csv → ...e/Centinel/locale/de_DE/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Centinel.csv → ...e/Centinel/locale/en_US/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Centinel.csv → ...e/Centinel/locale/es_ES/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Centinel.csv → ...e/Centinel/locale/fr_FR/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Centinel.csv → ...e/Centinel/locale/nl_NL/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Centinel.csv → ...e/Centinel/locale/pt_BR/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Centinel.csv → ...e/Centinel/locale/zh_CN/Mage_Centinel.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Checkout.csv → ...e/Checkout/locale/de_DE/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Checkout.csv → ...e/Checkout/locale/en_US/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Checkout.csv → ...e/Checkout/locale/es_ES/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Checkout.csv → ...e/Checkout/locale/fr_FR/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Checkout.csv → ...e/Checkout/locale/nl_NL/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Checkout.csv → ...e/Checkout/locale/pt_BR/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Checkout.csv → ...e/Checkout/locale/zh_CN/Mage_Checkout.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Cms.csv → ...e/core/Mage/Cms/locale/de_DE/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Cms.csv → ...e/core/Mage/Cms/locale/en_US/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Cms.csv → ...e/core/Mage/Cms/locale/es_ES/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Cms.csv → ...e/core/Mage/Cms/locale/fr_FR/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Cms.csv → ...e/core/Mage/Cms/locale/nl_NL/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Cms.csv → ...e/core/Mage/Cms/locale/pt_BR/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Cms.csv → ...e/core/Mage/Cms/locale/zh_CN/Mage_Cms.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Connect.csv → ...age/Connect/locale/de_DE/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Connect.csv → ...age/Connect/locale/en_US/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Connect.csv → ...age/Connect/locale/es_ES/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Connect.csv → ...age/Connect/locale/fr_FR/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Connect.csv → ...age/Connect/locale/nl_NL/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Connect.csv → ...age/Connect/locale/pt_BR/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Connect.csv → ...age/Connect/locale/zh_CN/Mage_Connect.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Contacts.csv → ...e/Contacts/locale/de_DE/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Contacts.csv → ...e/Contacts/locale/en_US/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Contacts.csv → ...e/Contacts/locale/es_ES/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Contacts.csv → ...e/Contacts/locale/fr_FR/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Contacts.csv → ...e/Contacts/locale/nl_NL/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Contacts.csv → ...e/Contacts/locale/pt_BR/Mage_Contacts.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Contacts.csv → ...e/Contacts/locale/zh_CN/Mage_Contacts.csv
File renamed without changes.
View
2 app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -33,7 +33,7 @@ class Mage_Core_Controller_Varien_Router_Standard extends Mage_Core_Controller_V
/**
* @param array $options
*
- * @@SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(array $options = array())
{
View
37 app/code/core/Mage/Core/Model/Config.php
@@ -189,6 +189,13 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base
protected $_allowedAreas = null;
/**
+ * Paths to module's directories (etc, sql, locale etc)
+ *
+ * @var array
+ */
+ protected $_moduleDirs = array();
+
+ /**
* Class construct
*
* @param mixed $sourceData
@@ -884,9 +891,12 @@ public function loadModulesConfiguration($fileName, $mergeToObject = null, $merg
}
foreach ($fileName as $configFile) {
- $configFile = $this->getModuleDir('etc', $modName).DS.$configFile;
- if ($mergeModel->loadFile($configFile)) {
+ $configFilePath = $this->getModuleDir('etc', $modName).DS.$configFile;
+ if ($mergeModel->loadFile($configFilePath)) {
$mergeToObject->extend($mergeModel, true);
+ if ($configFile !== 'config.xml') {
+ continue;
+ }
//Prevent overriding <active> node of module if it was redefined in etc/modules
$mergeToObject->extend(new Mage_Core_Model_Config_Base(
"<config><modules><{$modName}><active>true</active></{$modName}></modules></config>"),
@@ -1053,8 +1063,12 @@ public function createDirIfNotExists($dir)
*/
public function getModuleDir($type, $moduleName)
{
+ if (isset($this->_moduleDirs[$moduleName][$type])) {
+ return $this->_moduleDirs[$moduleName][$type];
+ }
+
$codePool = (string)$this->getModuleConfig($moduleName)->codePool;
- $dir = $this->getOptions()->getCodeDir().DS.$codePool.DS.uc_words($moduleName, DS);
+ $dir = $this->getOptions()->getCodeDir() . DS . $codePool . DS . uc_words($moduleName, DS);
switch ($type) {
case 'etc':
@@ -1072,6 +1086,23 @@ public function getModuleDir($type, $moduleName)
}
/**
+ * Set path to the corresponding module directory
+ *
+ * @param string $moduleName
+ * @param string $type directory type (etc, controllers, locale etc)
+ * @param string $path
+ * @return Mage_Core_Model_Config
+ */
+ public function setModuleDir($moduleName, $type, $path)
+ {
+ if (!isset($this->_moduleDirs[$moduleName])) {
+ $this->_moduleDirs[$moduleName] = array();
+ }
+ $this->_moduleDirs[$moduleName][$type] = $path;
+ return $this;
+ }
+
+ /**
* Load event observers for an area (front, admin)
*
* @param string $area
View
15 app/code/core/Mage/Core/Model/Translate.php
@@ -124,10 +124,10 @@ public function __construct(array $data = array())
$this->_localeHierarchy = $data['locale_hierarchy'];
} else {
// Try to load locale inheritance from Magento configuration
- $localeInheritanceNode = Mage::getConfig()->getNode(self::XML_PATH_LOCALE_INHERITANCE);
- if ($localeInheritanceNode instanceof Varien_Simplexml_Element) {
+ $inheritanceNode = Mage::getConfig()->getNode(self::XML_PATH_LOCALE_INHERITANCE);
+ if ($inheritanceNode instanceof Varien_Simplexml_Element) {
$this->_localeHierarchy = Mage::helper('Mage_Core_Helper_Translate')->composeLocaleHierarchy(
- $localeInheritanceNode->asCanonicalArray()
+ $inheritanceNode->asCanonicalArray()
);
}
}
@@ -330,8 +330,11 @@ protected function _loadThemeTranslation($forceReload = false)
*/
protected function _loadDbTranslation($forceReload = false)
{
- $arr = $this->getResource()->getTranslationArray(null, $this->getLocale());
- $this->_addData($arr, $this->getConfig(self::CONFIG_KEY_STORE), $forceReload);
+ $requiredLocaleList = $this->_composeRequiredLocaleList($this->getLocale());
+ foreach ($requiredLocaleList as $locale) {
+ $arr = $this->getResource()->getTranslationArray(null, $locale);
+ $this->_addData($arr, $this->getConfig(self::CONFIG_KEY_STORE), $forceReload);
+ }
return $this;
}
@@ -345,7 +348,7 @@ protected function _loadDbTranslation($forceReload = false)
*/
protected function _getModuleFilePath($module, $fileName, $locale)
{
- $file = Mage::getBaseDir('locale');
+ $file = Mage::getModuleDir('locale', $module);
$file .= DS . $locale . DS . $fileName;
return $file;
}
View
0 app/locale/de_DE/Mage_Core.csv → ...core/Mage/Core/locale/de_DE/Mage_Core.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Core.csv → ...core/Mage/Core/locale/en_US/Mage_Core.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Core.csv → ...core/Mage/Core/locale/es_ES/Mage_Core.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Core.csv → ...core/Mage/Core/locale/fr_FR/Mage_Core.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Core.csv → ...core/Mage/Core/locale/nl_NL/Mage_Core.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Core.csv → ...core/Mage/Core/locale/pt_BR/Mage_Core.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Core.csv → ...core/Mage/Core/locale/zh_CN/Mage_Core.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Cron.csv → ...core/Mage/Cron/locale/de_DE/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Cron.csv → ...core/Mage/Cron/locale/en_US/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Cron.csv → ...core/Mage/Cron/locale/es_ES/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Cron.csv → ...core/Mage/Cron/locale/fr_FR/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Cron.csv → ...core/Mage/Cron/locale/nl_NL/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Cron.csv → ...core/Mage/Cron/locale/pt_BR/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Cron.csv → ...core/Mage/Cron/locale/zh_CN/Mage_Cron.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_CurrencySymbol.csv → ...mbol/locale/de_DE/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_CurrencySymbol.csv → ...mbol/locale/en_US/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_CurrencySymbol.csv → ...mbol/locale/es_ES/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_CurrencySymbol.csv → ...mbol/locale/fr_FR/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_CurrencySymbol.csv → ...mbol/locale/nl_NL/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_CurrencySymbol.csv → ...mbol/locale/pt_BR/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_CurrencySymbol.csv → ...mbol/locale/zh_CN/Mage_CurrencySymbol.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Customer.csv → ...e/Customer/locale/de_DE/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Customer.csv → ...e/Customer/locale/en_US/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Customer.csv → ...e/Customer/locale/es_ES/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Customer.csv → ...e/Customer/locale/fr_FR/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Customer.csv → ...e/Customer/locale/nl_NL/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Customer.csv → ...e/Customer/locale/pt_BR/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Customer.csv → ...e/Customer/locale/zh_CN/Mage_Customer.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Dataflow.csv → ...e/Dataflow/locale/de_DE/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Dataflow.csv → ...e/Dataflow/locale/en_US/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Dataflow.csv → ...e/Dataflow/locale/es_ES/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Dataflow.csv → ...e/Dataflow/locale/fr_FR/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Dataflow.csv → ...e/Dataflow/locale/nl_NL/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Dataflow.csv → ...e/Dataflow/locale/pt_BR/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Dataflow.csv → ...e/Dataflow/locale/zh_CN/Mage_Dataflow.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Directory.csv → ...Directory/locale/de_DE/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Directory.csv → ...Directory/locale/en_US/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Directory.csv → ...Directory/locale/es_ES/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Directory.csv → ...Directory/locale/fr_FR/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Directory.csv → ...Directory/locale/nl_NL/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Directory.csv → ...Directory/locale/pt_BR/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Directory.csv → ...Directory/locale/zh_CN/Mage_Directory.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Downloadable.csv → ...adable/locale/de_DE/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Downloadable.csv → ...adable/locale/en_US/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Downloadable.csv → ...adable/locale/es_ES/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Downloadable.csv → ...adable/locale/fr_FR/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Downloadable.csv → ...adable/locale/nl_NL/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Downloadable.csv → ...adable/locale/pt_BR/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Downloadable.csv → ...adable/locale/zh_CN/Mage_Downloadable.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Eav.csv → ...e/core/Mage/Eav/locale/de_DE/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Eav.csv → ...e/core/Mage/Eav/locale/en_US/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Eav.csv → ...e/core/Mage/Eav/locale/es_ES/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Eav.csv → ...e/core/Mage/Eav/locale/fr_FR/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Eav.csv → ...e/core/Mage/Eav/locale/nl_NL/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Eav.csv → ...e/core/Mage/Eav/locale/pt_BR/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Eav.csv → ...e/core/Mage/Eav/locale/zh_CN/Mage_Eav.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_GiftMessage.csv → ...Message/locale/de_DE/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_GiftMessage.csv → ...Message/locale/en_US/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_GiftMessage.csv → ...Message/locale/es_ES/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_GiftMessage.csv → ...Message/locale/fr_FR/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_GiftMessage.csv → ...Message/locale/nl_NL/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_GiftMessage.csv → ...Message/locale/pt_BR/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_GiftMessage.csv → ...Message/locale/zh_CN/Mage_GiftMessage.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_GoogleAnalytics.csv → ...ics/locale/de_DE/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_GoogleAnalytics.csv → ...ics/locale/en_US/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_GoogleAnalytics.csv → ...ics/locale/es_ES/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_GoogleAnalytics.csv → ...ics/locale/fr_FR/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_GoogleAnalytics.csv → ...ics/locale/nl_NL/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_GoogleAnalytics.csv → ...ics/locale/pt_BR/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_GoogleAnalytics.csv → ...ics/locale/zh_CN/Mage_GoogleAnalytics.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_GoogleCheckout.csv → ...kout/locale/de_DE/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_GoogleCheckout.csv → ...kout/locale/en_US/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_GoogleCheckout.csv → ...kout/locale/es_ES/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_GoogleCheckout.csv → ...kout/locale/fr_FR/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_GoogleCheckout.csv → ...kout/locale/nl_NL/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_GoogleCheckout.csv → ...kout/locale/pt_BR/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_GoogleCheckout.csv → ...kout/locale/zh_CN/Mage_GoogleCheckout.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_GoogleOptimizer.csv → ...zer/locale/de_DE/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_GoogleOptimizer.csv → ...zer/locale/en_US/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_GoogleOptimizer.csv → ...zer/locale/es_ES/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_GoogleOptimizer.csv → ...zer/locale/fr_FR/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_GoogleOptimizer.csv → ...zer/locale/nl_NL/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_GoogleOptimizer.csv → ...zer/locale/pt_BR/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_GoogleOptimizer.csv → ...zer/locale/zh_CN/Mage_GoogleOptimizer.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_GoogleShopping.csv → ...ping/locale/en_US/Mage_GoogleShopping.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_ImportExport.csv → ...Export/locale/de_DE/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_ImportExport.csv → ...Export/locale/en_US/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_ImportExport.csv → ...Export/locale/es_ES/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_ImportExport.csv → ...Export/locale/fr_FR/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_ImportExport.csv → ...Export/locale/nl_NL/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_ImportExport.csv → ...Export/locale/pt_BR/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_ImportExport.csv → ...Export/locale/zh_CN/Mage_ImportExport.csv
File renamed without changes.
View
0 app/locale/de_DE/Mage_Index.csv → ...re/Mage/Index/locale/de_DE/Mage_Index.csv
File renamed without changes.
View
0 app/locale/en_US/Mage_Index.csv → ...re/Mage/Index/locale/en_US/Mage_Index.csv
File renamed without changes.
View
0 app/locale/es_ES/Mage_Index.csv → ...re/Mage/Index/locale/es_ES/Mage_Index.csv
File renamed without changes.
View
0 app/locale/fr_FR/Mage_Index.csv → ...re/Mage/Index/locale/fr_FR/Mage_Index.csv
File renamed without changes.
View
0 app/locale/nl_NL/Mage_Index.csv → ...re/Mage/Index/locale/nl_NL/Mage_Index.csv
File renamed without changes.
View
0 app/locale/pt_BR/Mage_Index.csv → ...re/Mage/Index/locale/pt_BR/Mage_Index.csv
File renamed without changes.
View
0 app/locale/zh_CN/Mage_Index.csv → ...re/Mage/Index/locale/zh_CN/Mage_Index.csv
File renamed without changes.
View
47 app/code/core/Mage/Install/Helper/Data.php
@@ -29,5 +29,52 @@
*/
class Mage_Install_Helper_Data extends Mage_Core_Helper_Abstract
{
+ /**
+ * The list of var children directories that have to be cleaned before the install
+ *
+ * @var array
+ */
+ protected $_varSubFolders;
+ /**
+ * Delete all service folders from var directory
+ */
+ public function cleanVarFolder()
+ {
+ foreach ($this->getVarSubFolders() as $folder) {
+ Varien_Io_File::rmdirRecursive($folder);
+ }
+ }
+
+ /**
+ * Retrieve the list of service directories located in var folder
+ *
+ * @return array
+ */
+ public function getVarSubFolders()
+ {
+ if ($this->_varSubFolders == null) {
+ $this->_varSubFolders = array(
+ Mage::getConfig()->getTempVarDir() . DS . 'session',
+ Mage::getConfig()->getTempVarDir() . DS . 'cache',
+ Mage::getConfig()->getTempVarDir() . DS . 'locks',
+ Mage::getConfig()->getTempVarDir() . DS . 'log',
+ Mage::getConfig()->getTempVarDir() . DS . 'report',
+ Mage::getConfig()->getTempVarDir() . DS . 'maps'
+ );
+ }
+ return $this->_varSubFolders;
+ }
+
+ /**
+ * Set the list of service directories located in var folder
+ *
+ * @param array $varSubFolders
+ * @return Mage_Install_Helper_Data
+ */
+ public function setVarSubFolders(array $varSubFolders)
+ {
+ $this->_varSubFolders = $varSubFolders;
+ return $this;
+ }
}
View
12 app/code/core/Mage/Install/Model/Installer/Abstract.php
@@ -74,20 +74,20 @@ protected function _checkSessionSave($value)
}
/**
- * Validate admin frontname value.
- * If empty, "admin" will be returned
+ * Validate backend area frontname value.
+ * If empty, "backend" will be returned
*
* @param string $value
* @return string
* @throws Exception
*/
- protected function _checkAdminFrontname($value)
+ protected function _checkBackendFrontname($value)
{
if (empty($value)) {
- return 'admin';
+ return 'backend';
}
- if (!preg_match('/^[a-z]+[a-z0-9_]+$/i', $value)) {
- throw new Exception('admin_frontname value must contain only letters (a-z or A-Z), numbers (0-9) or underscore(_), first character should be a letter.');
+ if (!preg_match('/^[a-z]+[a-z0-9_]+$/', $value)) {
+ throw new Exception('backend_frontname value must contain only letters (a-z), numbers (0-9) or underscore(_), first character should be a letter.');
}
return $value;
}
View
4 app/code/core/Mage/Install/Model/Installer/Console.php
@@ -59,7 +59,7 @@ class Mage_Install_Model_Installer_Console extends Mage_Install_Model_Installer_
'admin_no_form_key' => array('required' => 0),
'encryption_key' => array('required' => 0),
'session_save' => array('required' => 0),
- 'admin_frontname' => array('required' => 0),
+ 'backend_frontname' => array('required' => 0),
'enable_charts' => array('required' => 0),
'order_increment_prefix' => array('required' => 0),
);
@@ -229,7 +229,7 @@ public function install(array $options)
'secure_base_url' => $options['secure_base_url'],
'use_secure_admin' => $this->_getFlagValue($options['use_secure_admin']),
'session_save' => $this->_checkSessionSave($options['session_save']),
- 'admin_frontname' => $this->_checkAdminFrontname($options['admin_frontname']),
+ 'backend_frontname' => $this->_checkBackendFrontname($options['backend_frontname']),
'admin_no_form_key' => $this->_getFlagValue($options['admin_no_form_key']),
'skip_url_validation' => $this->_getFlagValue($options['skip_url_validation']),
'enable_charts' => $this->_getFlagValue($options['enable_charts']),
View
11 app/code/core/Mage/Install/controllers/IndexController.php
@@ -35,12 +35,23 @@
class Mage_Install_IndexController extends Mage_Install_Controller_Action
{
+ /**
+ * Dispatch event before action
+ *
+ * @return void