Skip to content

Commit

Permalink
Version 0.3.1, Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaWoScha
MaWoScha committed Feb 11, 2015
1 parent 45ef9ad commit c0f150b
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 44 deletions.
4 changes: 2 additions & 2 deletions ...m/Config/Form/Fieldset/ExtensionsList.php → ...m/Config/Form/Fieldset/Extensionslist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* @package German_LocaleFallback
* @authors MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
* @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
* @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)
Expand Down
16 changes: 8 additions & 8 deletions app/code/community/German/LocaleFallback/Block/System/Config/Form/Fieldset/Instructions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package German_LocaleFallback
* @authors MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
* @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
* @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
Expand All @@ -30,19 +30,19 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$html .= "<p>".$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.")."</p>";
$html .= "<hr style='margin-top:20px;'>";

$html .= $helper->__("This package is simply adding tree Static Blocks to the <a href='%s'>E-Mail-Templates</a>:",
$html .= $helper->__("This package is simply adding three Static Blocks to the <a href='%s'>E-Mail-Templates</a>:",
Mage::helper('adminhtml')->getUrl('adminhtml/system_email_template'));
$html .= '<ul style="list-style-position: outside; list-style-type: disc; margin-left:18px;">';
$html .= '<li>email_template_say_hello &nbsp; ('.$helper->__('Salutation').')</li>';
$html .= '<li>email_template_contact &nbsp; ('.$helper->__('Contact information').')</li>';
$html .= '<li>email_template_say_bye &nbsp; ('.$helper->__('Closing formula').')</li>';
$html .= '</ul>';
$html .= "<ul style='list-style-position: outside; list-style-type: disc; margin-left:18px;'>";
$html .= "<li>email_template_say_hello &nbsp; (".$helper->__("Salutation").")</li>";
$html .= "<li>email_template_contact &nbsp; (".$helper->__("Contact information").")</li>";
$html .= "<li>email_template_say_bye &nbsp; (".$helper->__("Closing formula").")</li>";
$html .= "</ul>";
$html .= "<p>";
$html .= $helper->__("The static blocks can be managed by the <a href='%s'>CMS system</a> in the admin area.",
Mage::helper('adminhtml')->getUrl('adminhtml/cms_block'));
$html .= "</p>";
$html .= "<p style='text-align:right;'>";
$html .= $helper->__("powered by <a>Me</a>");
$html .= $helper->__("powered by")." <a href='http://blog.siempro.co/' target='_blank'>MaWoScha</a>";
$html .= "</p>";
$html .= $this->_getFooterHtml($element);

Expand Down
17 changes: 14 additions & 3 deletions app/code/community/German/LocaleFallback/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<config>
<modules>
<German_LocaleFallback>
<version>0.3.0</version>
<version>0.3.1</version>
<title>Locale Fallback</title>
<link_git>https://github.com/MaWoScha/German_LocaleFallback</link_git>
</German_LocaleFallback>
</modules>

Expand Down Expand Up @@ -43,12 +44,22 @@
</rewrite>
</core>
</models>
<template>
<email>
<design_email_support translate="label" module="core">
<label>Email - Support</label>
<file>html/support.html</file>
<type>text</type>
</design_email_support>
</email>
</template>
</global>

<default>
<localefallback>
<extra_locales>
<extra_locale_list><![CDATA[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]]></extra_locale_list>
<extra_fallback_list><![CDATA[ar,en,ur]]></extra_fallback_list>
<extra_locale_list>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</extra_locale_list>
<extra_fallback_list>ar,en,ur</extra_fallback_list>
</extra_locales>
</localefallback>
</default>
Expand Down
53 changes: 35 additions & 18 deletions app/code/community/German/LocaleFallback/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @package German_LocaleFallback
* @authors MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Bastian Ike <b-ike@b-ike.de>
* @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Bastian Ike <b-ike@b-ike.de>
* @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
Expand All @@ -20,6 +20,40 @@
</tabs>

<sections>
<general>
<groups>
<locale>
<fields>
<code_fallback>
<label>Locale Fallback</label>
<frontend_type>select</frontend_type>
<source_model>localefallback/system_config_source_locale</source_model>
<sort_order>6</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</code_fallback>
</fields>
</locale>
</groups>
</general>
<design>
<groups>
<email>
<fields>
<support>
<label>Email Support Template</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_email_template</source_model>
<sort_order>40</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</support>
</fields>
</email>
</groups>
</design>
<localefallback translate="label" module="localefallback">
<label>Information</label>
<tab>localepacks</tab>
Expand Down Expand Up @@ -85,22 +119,5 @@
</extensions>
</groups>
</localefallback>
<general>
<groups>
<locale>
<fields>
<code_fallback>
<label>Locale Fallback</label>
<frontend_type>select</frontend_type>
<source_model>localefallback/system_config_source_locale</source_model>
<sort_order>6</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</code_fallback>
</fields>
</locale>
</groups>
</general>
</sections>
</config>
26 changes: 13 additions & 13 deletions var/connect/German_LocaleFallback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
<version_ids>1</version_ids>
</version_ids>
<summary>German Modules - LocaleFallback Extension</summary>
<description>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
<description>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</description>
<license>OSL</license>
<license_uri>http://www.opensource.org/licenses/osl-3.0.php</license_uri>
<version>0.3.0</version>
<version>0.3.1</version>
<stability>stable</stability>
<notes>none/keine</notes>
<authors>
Expand Down Expand Up @@ -98,11 +98,11 @@ Complemento de paquetes de idioma para Magento Commerce
</include>
<ignore>
<ignore/>
<ignore>.DS_Store</ignore>
<ignore>.DS_Store</ignore>
<ignore>.DS_Store</ignore>
<ignore>.DS_Store</ignore>
<ignore>.DS_Store</ignore>
<ignore>#^.DS_Store#</ignore>
<ignore>#^.DS_Store#</ignore>
<ignore>#^.DS_Store#</ignore>
<ignore>#^.DS_Store#</ignore>
<ignore>#^.DS_Store#</ignore>
</ignore>
</contents>
</_>

0 comments on commit c0f150b

Please sign in to comment.