From 2d7c2c3d25a35afbb253b458634a95455f41bd2b Mon Sep 17 00:00:00 2001
From: MaWoScha <manfredwormschaefer@gmail.com>
Date: Thu, 10 Sep 2015 18:31:24 +0200
Subject: [PATCH] Version 0.4.3, Add
 'var/package/Delete_EmailTemplates_en_US-1.0.0.xml' and merge with 'diglin'

---
 README.md                                           | 13 ++++++++++++-
 .../Model/System/Config/Source/Locale.php           |  4 ++--
 .../community/German/LocaleFallback/etc/config.xml  |  2 +-
 var/connect/German_LocaleFallback.xml               |  9 +++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 939b068..f692b20 100644
--- a/README.md
+++ b/README.md
@@ -57,4 +57,15 @@ v0.4.2
 Small fix in "etc/system.xml"
 
 Prevent locale fallback in backend, provided by diglin:
-* https://github.com/MaWoScha/German_LocaleFallback/commit/0a8421bcc4a1910adeec18f1987596429c5fb7a0
+* https://github.com/diglin/German_LocaleFallback/commit/0a8421bcc4a1910adeec18f1987596429c5fb7a0
+
+v0.4.3
+
+Die Datei
+* var/package/Delete_EmailTemplates_en_US-1.0.0.xml
+erlaubt die vorinstallierten englischsprachigen E-Mail-Vorlagen über den "Magento Connect Manager" zu löschen und
+*  [German LocalePack en_US](https://github.com/MaWoScha/German_LocalePack_en_US)
+ohne Rückgriff auf FTP oder Dateimanager zu installieren.
+
+Fix issue with string expected but object is return from getlocale, provided by diglin:
+* https://github.com/diglin/German_LocaleFallback/commit/38c2654cbc3e66bdd9db6035cc8d56ff991ce613
diff --git a/app/code/community/German/LocaleFallback/Model/System/Config/Source/Locale.php b/app/code/community/German/LocaleFallback/Model/System/Config/Source/Locale.php
index 62138c1..22a434b 100644
--- a/app/code/community/German/LocaleFallback/Model/System/Config/Source/Locale.php
+++ b/app/code/community/German/LocaleFallback/Model/System/Config/Source/Locale.php
@@ -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.3.0
+ * @version   0.4.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  * @source    http://github.com/magento-hackathon/Hackathon_LocaleFallback
  */
@@ -30,7 +30,7 @@ public function toOptionArray()
 			$_more_Languages = str_replace(";", ",", $_more_Languages); // only Comma Not Semicolon
 			$_more_Languages = explode( ',', $_more_Languages );
 
-			$languages = Mage::app()->getLocale()->getTranslationList('language', Mage::app()->getLocale());
+			$languages = Mage::app()->getLocale()->getTranslationList('language', Mage::app()->getLocale()->getLocaleCode());
 			$countries = Mage::app()->getLocale()->getCountryTranslationList();
 
 			foreach ($_more_Languages as $code_lang) {
diff --git a/app/code/community/German/LocaleFallback/etc/config.xml b/app/code/community/German/LocaleFallback/etc/config.xml
index 4d32ca7..56d43bd 100644
--- a/app/code/community/German/LocaleFallback/etc/config.xml
+++ b/app/code/community/German/LocaleFallback/etc/config.xml
@@ -13,7 +13,7 @@
 <config>
     <modules>
         <German_LocaleFallback>
-            <version>0.4.2</version>
+            <version>0.4.3</version>
             <title>Locale Fallback</title>
             <link_git>https://github.com/MaWoScha/German_LocaleFallback</link_git>
         </German_LocaleFallback>
diff --git a/var/connect/German_LocaleFallback.xml b/var/connect/German_LocaleFallback.xml
index 28f4337..118496d 100644
--- a/var/connect/German_LocaleFallback.xml
+++ b/var/connect/German_LocaleFallback.xml
@@ -16,7 +16,7 @@ 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.4.2</version>
+   <version>0.4.3</version>
    <stability>stable</stability>
    <notes>none/keine</notes>
    <authors>
@@ -47,7 +47,7 @@ Complemento de paquetes de idioma para Magento Commerce
             <max/>
          </max>
          <files>
-            <files>                                                      </files>
+            <files/>
          </files>
       </package>
       <extension>
@@ -72,6 +72,7 @@ Complemento de paquetes de idioma para Magento Commerce
          <target>magelocale</target>
          <target>magelocale</target>
          <target>magelocale</target>
+         <target>mage</target>
       </target>
       <path>
          <path/>
@@ -82,6 +83,7 @@ Complemento de paquetes de idioma para Magento Commerce
          <path>es_ES/German_LocaleFallback.csv</path>
          <path>fr_FR/German_LocaleFallback.csv</path>
          <path>pt_PT/German_LocaleFallback.csv</path>
+         <path>var/package/Delete_EmailTemplates_en_US-1.0.0.xml</path>
       </path>
       <type>
          <type>file</type>
@@ -92,6 +94,7 @@ Complemento de paquetes de idioma para Magento Commerce
          <type>file</type>
          <type>file</type>
          <type>file</type>
+         <type>file</type>
       </type>
       <include>
          <include/>
@@ -102,6 +105,7 @@ Complemento de paquetes de idioma para Magento Commerce
          <include/>
          <include/>
          <include/>
+         <include/>
       </include>
       <ignore>
          <ignore/>
@@ -112,6 +116,7 @@ Complemento de paquetes de idioma para Magento Commerce
          <ignore>#^.DS_Store#</ignore>
          <ignore>#^.DS_Store#</ignore>
          <ignore>#^.DS_Store#</ignore>
+         <ignore>#^.DS_Store#</ignore>
       </ignore>
    </contents>
 </_>