diff --git a/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/ExtensionsList.php b/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Extensionslist.php similarity index 97% rename from app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/ExtensionsList.php rename to app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Extensionslist.php index fecf911..549a64e 100644 --- a/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/ExtensionsList.php +++ b/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Extensionslist.php @@ -4,10 +4,10 @@ * @package German_LocaleFallback * @authors MaWoScha * @developer MaWoScha - * @version 0.1.0 + * @version 0.3.1 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -class German_LocaleFallback_Block_System_Config_Form_Fieldset_ExtensionsList +class German_LocaleFallback_Block_System_Config_Form_Fieldset_Extensionslist extends Mage_Adminhtml_Block_System_Config_Form_Fieldset { public function render(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Instructions.php b/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Instructions.php index 408fa3e..dc4eda5 100644 --- a/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Instructions.php +++ b/app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Instructions.php @@ -4,7 +4,7 @@ * @package German_LocaleFallback * @authors MaWoScha * @developer MaWoScha - * @version 0.1.0 + * @version 0.3.1 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class German_LocaleFallback_Block_System_Config_Form_Fieldset_Instructions @@ -30,19 +30,19 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html .= "

".$helper->__("The fallback language, which complements the missing entries of their own language pack, can be defined here. First, however, one's own language pack must be installed. The process can be reversed.")."

"; $html .= "
"; - $html .= $helper->__("This package is simply adding tree Static Blocks to the E-Mail-Templates:", + $html .= $helper->__("This package is simply adding three Static Blocks to the E-Mail-Templates:", Mage::helper('adminhtml')->getUrl('adminhtml/system_email_template')); - $html .= '
    '; - $html .= '
  • email_template_say_hello   ('.$helper->__('Salutation').')
    • '; - $html .= '
  • email_template_contact   ('.$helper->__('Contact information').')
    • '; - $html .= '
  • email_template_say_bye   ('.$helper->__('Closing formula').')
    • '; - $html .= '
'; + $html .= "
    "; + $html .= "
  • email_template_say_hello   (".$helper->__("Salutation").")
    • "; + $html .= "
  • email_template_contact   (".$helper->__("Contact information").")
    • "; + $html .= "
  • email_template_say_bye   (".$helper->__("Closing formula").")
    • "; + $html .= "
"; $html .= "

"; $html .= $helper->__("The static blocks can be managed by the CMS system in the admin area.", Mage::helper('adminhtml')->getUrl('adminhtml/cms_block')); $html .= "

"; $html .= "

"; - $html .= $helper->__("powered by Me"); + $html .= $helper->__("powered by")." MaWoScha"; $html .= "

"; $html .= $this->_getFooterHtml($element); diff --git a/app/code/community/German/LocaleFallback/etc/config.xml b/app/code/community/German/LocaleFallback/etc/config.xml index 2a21898..9baa3a4 100644 --- a/app/code/community/German/LocaleFallback/etc/config.xml +++ b/app/code/community/German/LocaleFallback/etc/config.xml @@ -13,8 +13,9 @@ - 0.3.0 + 0.3.1 Locale Fallback + https://github.com/MaWoScha/German_LocaleFallback @@ -43,12 +44,22 @@ + + - - + ar_YE,de_LU,en_BZ,en_GY,en_HK,en_IN,en_ZA,es_CU,fr_BE,fr_CH,fr_DZ,fr_GY,fr_LU,fr_PF,fr_SN,pt_MZ,ur_IN,ur_PK + ar,en,ur diff --git a/app/code/community/German/LocaleFallback/etc/system.xml b/app/code/community/German/LocaleFallback/etc/system.xml index 7181323..52400b4 100644 --- a/app/code/community/German/LocaleFallback/etc/system.xml +++ b/app/code/community/German/LocaleFallback/etc/system.xml @@ -5,7 +5,7 @@ * @package German_LocaleFallback * @authors MaWoScha , Bastian Ike * @developer MaWoScha , Bastian Ike - * @version 0.3.0 + * @version 0.3.1 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * @source http://www.magentocommerce.com/wiki/modules_reference/german/klassen * @source http://github.com/magento-hackathon/Hackathon_LocaleFallback @@ -20,6 +20,40 @@ + + + + + + + select + localefallback/system_config_source_locale + 6 + 1 + 1 + 1 + + + + + + + + + + + + select + adminhtml/system_config_source_email_template + 40 + 1 + 1 + 1 + + + + + localepacks @@ -85,22 +119,5 @@ - - - - - - - select - localefallback/system_config_source_locale - 6 - 1 - 1 - 1 - - - - - diff --git a/var/connect/German_LocaleFallback.xml b/var/connect/German_LocaleFallback.xml index 7a8a280..0198d49 100644 --- a/var/connect/German_LocaleFallback.xml +++ b/var/connect/German_LocaleFallback.xml @@ -7,17 +7,17 @@ 1 German Modules - LocaleFallback Extension - Complement to language packages for Magento Commerce -* Defines a fallback language additional to the locale - -Ergänzung zu Sprachpaketen für Magento Commerce: -* Definiert zu der Sprachumgebung eine Ausweichsprache - -Complemento de paquetes de idioma para Magento Commerce + Complement to language packages for Magento Commerce +* Defines a fallback language additional to the locale + +Ergänzung zu Sprachpaketen für Magento Commerce: +* Definiert zu der Sprachumgebung eine Ausweichsprache + +Complemento de paquetes de idioma para Magento Commerce * Definido además de la configuración regional un idioma de segunda opción OSL http://www.opensource.org/licenses/osl-3.0.php - 0.3.0 + 0.3.1 stable none/keine @@ -98,11 +98,11 @@ Complemento de paquetes de idioma para Magento Commerce - .DS_Store - .DS_Store - .DS_Store - .DS_Store - .DS_Store + #^.DS_Store# + #^.DS_Store# + #^.DS_Store# + #^.DS_Store# + #^.DS_Store#