diff --git a/README.md b/README.md index f692b20..82aa719 100644 --- a/README.md +++ b/README.md @@ -49,15 +49,13 @@ v0.4.1 Fix incorrect loading of theme translation. Sets the global locale to fallback locale to be able to retrieve the correct path to the themes translate.csv in Mage_Core_Model_Design_Package::getLocaleBaseDir() -Provided by access3000: -* https://github.com/access3000/Hackathon_LocaleFallback/commit/b011bf1e0ea60341c7fe685c37ce4d65545aa842 +Provided by [access3000] (https://github.com/access3000/Hackathon_LocaleFallback/commit/b011bf1e0ea60341c7fe685c37ce4d65545aa842) v0.4.2 Small fix in "etc/system.xml" -Prevent locale fallback in backend, provided by diglin: -* https://github.com/diglin/German_LocaleFallback/commit/0a8421bcc4a1910adeec18f1987596429c5fb7a0 +Prevent locale fallback in backend, provided by [diglin] (https://github.com/diglin/German_LocaleFallback/commit/0a8421bcc4a1910adeec18f1987596429c5fb7a0) v0.4.3 @@ -67,5 +65,14 @@ erlaubt die vorinstallierten englischsprachigen E-Mail-Vorlagen über den "Magen * [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 +Fix issue with string expected but object is return from getlocale, provided by [diglin] (https://github.com/diglin/German_LocaleFallback/commit/38c2654cbc3e66bdd9db6035cc8d56ff991ce613) + +v0.4.4 + +Übersetzung für "Email Support Template" ergänzt. + +v0.4.5 + +Die Datei "var/package/Delete_EmailTemplates_en_US-1.2.0.xml" berücksichtigt zusätzlich dazugekommene englischsprachige E-Mail-Vorlagen + +Italienische Lokalisierung hinzugefügt. 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 dc4eda5..6f53941 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.3.1 + * @version 0.4.5 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ class German_LocaleFallback_Block_System_Config_Form_Fieldset_Instructions @@ -13,6 +13,7 @@ class German_LocaleFallback_Block_System_Config_Form_Fieldset_Instructions public function render(Varien_Data_Form_Element_Abstract $element) { $helper = Mage::helper("localefallback"); + $html = $this->_getHeaderHtml($element); $html .= "

"; $html .= $helper->__("Magento has only one variable available for the locale (locale). This extension now provides two settings:", @@ -42,7 +43,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) Mage::helper('adminhtml')->getUrl('adminhtml/cms_block')); $html .= "

"; $html .= "

"; - $html .= $helper->__("powered by")." MaWoScha"; + $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 8309c0f..95ae7d2 100644 --- a/app/code/community/German/LocaleFallback/etc/config.xml +++ b/app/code/community/German/LocaleFallback/etc/config.xml @@ -13,7 +13,7 @@ - 0.4.4 + 0.4.5 Locale Fallback https://github.com/MaWoScha/German_LocaleFallback diff --git a/app/code/community/German/LocaleFallback/etc/system.xml b/app/code/community/German/LocaleFallback/etc/system.xml index d8a00aa..fc5d205 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.4.4 + * @version 0.4.5 * @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 @@ -105,7 +105,7 @@ 1 0 0 - GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.]]> + GitHub for more language packs.]]> diff --git a/app/locale/de_DE/German_LocaleFallback.csv b/app/locale/de_DE/German_LocaleFallback.csv index 01ef2c0..601567d 100644 --- a/app/locale/de_DE/German_LocaleFallback.csv +++ b/app/locale/de_DE/German_LocaleFallback.csv @@ -1,6 +1,6 @@ "Information","Information" "Contact","Kontakt" -"Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.","Bitte besuchen Sie uns auf GitHub für mehr Sprachpakete.

Bitte treten Sie bei Fragen mit uns in Kontakt über unsere Webseite oder über mawoscha@siempro.co." +"Please visit us on GitHub for more language packs.","Bitte besuchen Sie uns auf GitHub für mehr Sprachpakete." "powered by","bereitgestellt von" "Installed Language Packs","Installierte Sprachpakete" "You have installed the following:","Sie haben Folgendes installiert:" diff --git a/app/locale/en_US/German_LocaleFallback.csv b/app/locale/en_US/German_LocaleFallback.csv index 9795a87..ed417c9 100644 --- a/app/locale/en_US/German_LocaleFallback.csv +++ b/app/locale/en_US/German_LocaleFallback.csv @@ -1,6 +1,6 @@ "Information","Information" "Contact","Contact" -"Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.","Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question." +"Please visit us on GitHub for more language packs.","Please visit us on GitHub for more language packs." "powered by","powered by" "Installed Language Packs","Installed Language Packs" "You have installed the following:","You have installed the following:" diff --git a/app/locale/es_ES/German_LocaleFallback.csv b/app/locale/es_ES/German_LocaleFallback.csv index 318aacd..36b87dd 100644 --- a/app/locale/es_ES/German_LocaleFallback.csv +++ b/app/locale/es_ES/German_LocaleFallback.csv @@ -1,6 +1,6 @@ "Information","Información" "Contact","Contacto" -"Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.","Por favor, visitenos en GitHub para ver más paquetes de idioma.

Por favor, póngase con cualquier pregunta en contacto con nosotros a través de nuestro sitio web o por mawoscha@siempro.co." +"Please visit us on GitHub for more language packs.","Por favor, visitenos en GitHub para ver más paquetes de idioma." "powered by","proporcionado por" "Installed Language Packs","Paquetes de idioma instalados" "You have installed the following:","Ha instalado lo siguiente:" diff --git a/app/locale/fr_FR/German_LocaleFallback.csv b/app/locale/fr_FR/German_LocaleFallback.csv index 721f056..63df705 100644 --- a/app/locale/fr_FR/German_LocaleFallback.csv +++ b/app/locale/fr_FR/German_LocaleFallback.csv @@ -1,6 +1,6 @@ "Information","Informations" "Contact","Contact" -"Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.","Se il vous plaît visitez-nous sur GitHub pour plus de packs de langues.

Vous pouvez nous contacter via notre site Web ou au mawoscha@siempro.co, si vous avez des questions." +"Please visit us on GitHub for more language packs.","Se il vous plaît visitez-nous sur GitHub pour plus de packs de langues." "powered by","alimenté par" "Installed Language Packs","Packs langues Installé" "You have installed the following:","Vous avez installé le suivant:" diff --git a/app/locale/it_IT/German_LocaleFallback.csv b/app/locale/it_IT/German_LocaleFallback.csv new file mode 100644 index 0000000..e59a5cd --- /dev/null +++ b/app/locale/it_IT/German_LocaleFallback.csv @@ -0,0 +1,28 @@ +"Information","Informazioni" +"Contact","Contatto" +"Please visit us on GitHub for more language packs.","Per favore, visitaci su GitHub per vedere altri pacchetti di lingue." +"powered by","fornito da" +"Installed Language Packs","Pacchetti di lingue installati" +"You have installed the following:","Hai installato il seguente:" +"Instructions","Istruzione" +"The %s language pack in version %s has been successfully installed.","Il pacchetto di lingue %s nella versione %s è stato installato correttamente." +"Magento has only one variable available for the locale (locale). This extension now provides two settings:","Magento mantiene solo una variabile per la locale (locale). Questa estensione offre ora due configurazioni disponibili:" +"Locale Fallback","Seconda opzione linguistica" +"Locale Preferred","Lingua preferita" +"Now it is possible to use a preferred language with a fallback language. Thus it can be set as the preferred language a partially available language, the fallback language then takes over the lack of rest.","Ora è possibile utilizzare un lingua preferita con una seconda opzione linguistica. Così può essere impostato come lingua preferita una lingua parzialmente disponibile, quindi la lingua di riserva riprende il resto mancante." +"You want to sell and make use of the language of your target audience. Magento supports it – at least in theory. Practically, it is then but so that for most languages no language packs are available for Magento. Creating your own custom language pack fails again mostly at the expense: The language files of Magento contain several thousand entries.","Vuole vendere e utilizzare la lingua del suo pubblico di destinazione. Magento supporta questo – almeno in teoria. In pratica, lo è, ma così per la maggior parte delle lingue non sono disponibili pacchetti linguistici per Magento. La creazione di un proprio pacchetto di lingue personalizzato fallisce nuovamente a spese principalmente: i file di lingua Magento contengono diverse migliaia di voci." +"However, the complexity is significantly lower when only a limited selection of entries had to be translated and for the rest a fallback language could be defined. That would be also safe in case of updating the Magento software.","Tuttavia, la complessità è significativamente inferiore quando è necessario tradurre solo una selezione limitata di voci e per il resto è possibile definire una lingua alternativa. Questo sarebbe anche sicuro in caso di aggiornamento del software Magento." +"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.","Qui è possibile definire la lingua di riserva, che integra le voci mancanti del proprio pacchetti di lingue. Innanzitutto, è necessario installare un pacchetti di lingue per account. Il processo può essere invertito." +"This package is simply adding three Static Blocks to the E-Mail-Templates:","Questa estensione aggiunge semplicemente tre blocchi statici ai modelli di posta elettronica:" +"Salutation","Saluto" +"Contact information","Informazioni di contatto" +"Closing formula","Formula di chiusura" +"The static blocks can be managed by the CMS system in the admin area.","I blocchi statici possono essere gestiti dal sistema CMS nell'area di amministrazione." +"Translations are differing, values from Locale Fallback will be used.","Le traduzioni sono diverse, verrà utilizzata la seconda opzione linguistica." +"Translations are identical, you can safely switch off the Locale Fallback.","Le traduzioni sono identiche, la seconda opzione linguistica può essere disabilitata." +"Extra locales","Configurazione aggiuntiva" +"Locale list","Impostazioni regionali" +"Fallback list","Seconda opzione linguistica" +"You can type in here more locales, comma-separated, like ""de_LU,en_IN,en_ZA,es_CU,fr_BE"".","Qui puoi inserire più locali, separati da virgole, come ""de_LU,en_IN,en_ZA,es_CU,fr_BE""." +"You can type in here more fallback languages, comma-separated, like ""ar,en,ur"".","Qui puoi inserire più lingua di riserva, separate da virgole, come ad esempio ""ar,en,ur""." +"Email Support Template","Email - Modello per i contatti" diff --git a/app/locale/pt_PT/German_LocaleFallback.csv b/app/locale/pt_PT/German_LocaleFallback.csv index 921b39c..61a622b 100644 --- a/app/locale/pt_PT/German_LocaleFallback.csv +++ b/app/locale/pt_PT/German_LocaleFallback.csv @@ -1,6 +1,6 @@ "Information","Informações" "Contact","Contato" -"Please visit us on GitHub for more language packs.

You can contact us via our website or at mawoscha@siempro.co, if you have any question.","Por favor, visite-nos no GitHub para mais pacotes de idiomas.

Pode contactar-nos através do nosso site ou pelo mawoscha@siempro.co, se você tem alguma dúvida." +"Please visit us on GitHub for more language packs.","Por favor, visite-nos no GitHub para mais pacotes de idiomas." "powered by","distribuído por" "Installed Language Packs","Pacotes de idiomas instalados" "You have installed the following:","Você instalou o seguinte:" diff --git a/composer.json b/composer.json index ccaa2d8..453a15a 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ ["./app/locale/en_US/German_LocaleFallback.csv", "./app/locale/en_US/German_LocaleFallback.csv"], ["./app/locale/es_ES/German_LocaleFallback.csv", "./app/locale/es_ES/German_LocaleFallback.csv"], ["./app/locale/fr_FR/German_LocaleFallback.csv", "./app/locale/fr_FR/German_LocaleFallback.csv"], + ["./app/locale/it_IT/German_LocaleFallback.csv", "./app/locale/it_IT/German_LocaleFallback.csv"], ["./app/locale/pt_PT/German_LocaleFallback.csv", "./app/locale/pt_PT/German_LocaleFallback.csv"] ] }, diff --git a/modman b/modman index 6ba85a4..0067d0e 100644 --- a/modman +++ b/modman @@ -5,4 +5,5 @@ app/locale/de_DE/German_LocaleFallback.csv app/locale/de_DE/German_LocaleFallbac app/locale/en_US/German_LocaleFallback.csv app/locale/en_US/German_LocaleFallback.csv app/locale/es_ES/German_LocaleFallback.csv app/locale/es_ES/German_LocaleFallback.csv app/locale/fr_FR/German_LocaleFallback.csv app/locale/fr_FR/German_LocaleFallback.csv +app/locale/it_IT/German_LocaleFallback.csv app/locale/it_IT/German_LocaleFallback.csv app/locale/pt_PT/German_LocaleFallback.csv app/locale/pt_PT/German_LocaleFallback.csv diff --git a/var/connect/German_LocaleFallback.xml b/var/connect/German_LocaleFallback.xml index 4a1097a..997b1db 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 OSL http://www.opensource.org/licenses/osl-3.0.php - 0.4.4 + 0.4.5 stable none/keine @@ -72,6 +72,7 @@ Complemento de paquetes de idioma para Magento Commerce magelocale magelocale magelocale + magelocale mage @@ -82,8 +83,9 @@ Complemento de paquetes de idioma para Magento Commerce en_US/German_LocaleFallback.csv es_ES/German_LocaleFallback.csv fr_FR/German_LocaleFallback.csv + it_IT/German_LocaleFallback.csv pt_PT/German_LocaleFallback.csv - var/package/Delete_EmailTemplates_en_US-1.0.0.xml + var/package/Delete_EmailTemplates_en_US-1.2.0.xml file @@ -95,6 +97,7 @@ Complemento de paquetes de idioma para Magento Commerce file file file + file @@ -106,6 +109,7 @@ Complemento de paquetes de idioma para Magento Commerce + @@ -117,6 +121,7 @@ Complemento de paquetes de idioma para Magento Commerce #^.DS_Store# #^.DS_Store# #^.DS_Store# + #^.DS_Store# diff --git a/var/package/Delete_EmailTemplates_en_US-1.2.0.xml b/var/package/Delete_EmailTemplates_en_US-1.2.0.xml new file mode 100644 index 0000000..919311b --- /dev/null +++ b/var/package/Delete_EmailTemplates_en_US-1.2.0.xml @@ -0,0 +1,20 @@ + + + Delete_EmailTemplates_en_US + 1.2.0 + stable + GPL + community + + E-Mail-Templates only! + +Uninstall them, before installing "German LocalePack en US"! + Löscht die von Magento vorinstallierten englischsprachigen E-Mail-Templates (en_US) + keine + Manfred Worm SchäferMaWoSchamanfredwormschaefer@gmail.com + 2017-12-12 + + + + 5.2.06.0.0 +