Skip to content

Commit b7189dd

Browse files
committed
2.0.0.0-dev52
* Better Navigation menu rendering due to improved Caching of Categories * Added Magento\Filesystem\Directory and Magento\Filesystem\File to the library * Various improvements: * Added a static test to check for incorrect dependencies in the library * Moved Magento\Core\Model\Theme to the Magento\View component * Moved Magento\Core\Model\Design to the Magento\View component * Consistent declaration of page-types * The Framework part of the Cache functionality moved out from modules * Themes update: * Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme * Refactored and removed duplicate Persistent module templates * Plushe theme made responsive * Fixed bugs: * Fixed inability to print order, invoice, or creditmemo in the frontend * Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test * Fixed the broken link when the MAP feature is enabled and actual product price is set to be displayed in the shopping cart * Moved the following methods from Core Helpers to the appropriate libraries: * Moved the Data Helper date format related functions to \Magento\Core\Model\Locale * Moved the Data Helper array decoration related functions to Magento\Stdlib\ArrayUtils * Moved the Data Helper functions that copy data from one object to another to \Magento\Object\Copy
1 parent d0422ba commit b7189dd

File tree

1,091 files changed

+26976
-13081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,091 files changed

+26976
-13081
lines changed

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
2.0.0.0-dev52
2+
=============
3+
* Better Navigation menu rendering due to improved Caching of Categories
4+
* Added Magento\Filesystem\Directory and Magento\Filesystem\File to the library
5+
* Various improvements:
6+
* Added a static test to check for incorrect dependencies in the library
7+
* Moved Magento\Core\Model\Theme to the Magento\View component
8+
* Moved Magento\Core\Model\Design to the Magento\View component
9+
* Consistent declaration of page-types
10+
* The Framework part of the Cache functionality moved out from modules
11+
* Themes update:
12+
* Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme
13+
* Refactored and removed duplicate Persistent module templates
14+
* Plushe theme made responsive
15+
* Fixed bugs:
16+
* Fixed inability to print order, invoice, or creditmemo in the frontend
17+
* Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test
18+
* Fixed the broken link when the MAP feature is enabled and actual product price is set to be displayed in the shopping cart
19+
* Moved the following methods from Core Helpers to the appropriate libraries:
20+
* Moved the Data Helper date format related functions to \Magento\Core\Model\Locale
21+
* Moved the Data Helper array decoration related functions to Magento\Stdlib\ArrayUtils
22+
* Moved the Data Helper functions that copy data from one object to another to \Magento\Object\Copy
23+
124
2.0.0.0-dev51
225
=============
326
* Application areas rework:

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ class CacheOutdated
3737
protected $_authorization;
3838

3939
/**
40-
* @var \Magento\Core\Model\Cache\TypeListInterface
40+
* @var \Magento\App\Cache\TypeListInterface
4141
*/
4242
protected $_cacheTypeList;
4343

4444
/**
4545
* @param \Magento\AuthorizationInterface $authorization
4646
* @param \Magento\UrlInterface $urlBuilder
47-
* @param \Magento\Core\Model\Cache\TypeListInterface $cacheTypeList
47+
* @param \Magento\App\Cache\TypeListInterface $cacheTypeList
4848
*/
4949
public function __construct(
5050
\Magento\AuthorizationInterface $authorization,
5151
\Magento\UrlInterface $urlBuilder,
52-
\Magento\Core\Model\Cache\TypeListInterface $cacheTypeList
52+
\Magento\App\Cache\TypeListInterface $cacheTypeList
5353
) {
5454
$this->_authorization = $authorization;
5555
$this->_urlBuilder = $urlBuilder;

app/code/Magento/Adminhtml/Block/Media/Uploader.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
4242
protected $_template = 'Magento_Adminhtml::media/uploader.phtml';
4343

4444
/**
45-
* @var \Magento\Core\Model\View\Url
45+
* @var \Magento\View\Url
4646
*/
4747
protected $_viewUrl;
4848

@@ -54,14 +54,14 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
5454
/**
5555
* @param \Magento\Core\Helper\Data $coreData
5656
* @param \Magento\Backend\Block\Template\Context $context
57-
* @param \Magento\Core\Model\View\Url $viewUrl
57+
* @param \Magento\View\Url $viewUrl
5858
* @param \Magento\File\Size $fileSize
5959
* @param array $data
6060
*/
6161
public function __construct(
6262
\Magento\Core\Helper\Data $coreData,
6363
\Magento\Backend\Block\Template\Context $context,
64-
\Magento\Core\Model\View\Url $viewUrl,
64+
\Magento\View\Url $viewUrl,
6565
\Magento\File\Size $fileSize,
6666
array $data = array()
6767
) {

app/code/Magento/Adminhtml/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<config>
2727
<type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
2828
<param name="attributeLabelCache">
29-
<instance type="Magento\Core\Model\Cache\Type\Translate" />
29+
<instance type="Magento\App\Cache\Type\Translate" />
3030
</param>
3131
</type>
3232
<type name="Magento\Backend\Helper\Dashboard\Data">

app/code/Magento/Adminhtml/i18n/de_DE.csv

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"All Files","Alle Dateien"
9292
"All Reviews","Alle Beurteilungen"
9393
"All Store Views","Alle Ladenansichten"
94-
"All Tags","Alle Tags"
9594
"All Websites","Alle Websites"
9695
"All countries","Alle Länder"
9796
"All fields","Alle Felder"
@@ -143,7 +142,6 @@
143142
"Area","Bereich"
144143
"As low as:","Unterster Wert:"
145144
"Assigned","Zugewiesen"
146-
"Tags","Verknüpfte Tags"
147145
"Attribute Set Name:","Name der Attributmenge:"
148146
"Attributes","Attribute"
149147
"Automatic","Automatisch"
@@ -558,7 +556,6 @@
558556
"New Sitemap","Neue Sitemap"
559557
"New Store View","Neue Ladenansicht"
560558
"New System Template","Neue Systemvorlage"
561-
"New Tag","Neues Tag"
562559
"New Template","Neue Vorlage"
563560
"New User","Neuer Benutzer"
564561
"New Variable","Neue Variable"
@@ -633,7 +630,6 @@
633630
"Payment method is not available.","Zahlungsform ist nicht verfügbar."
634631
"Payment method must be specified.","Angabe der Zahlungsmethode erforderlich."
635632
"Pending Reviews","Ausstehende Beurteilungen"
636-
"Pending Tags","Ausstehende Tags"
637633
"Per Item","Je Element"
638634
"Per Order","Je Bestellung"
639635
"Percent","Prozent"
@@ -678,7 +674,6 @@
678674
"Please select one of the above options.","Wählen Sie bitte eine der obigen Optionen aus."
679675
"Please select one of the options.","Wählen Sie eine der Optionen aus."
680676
"Please select review(s).","Wählen Sie (eine) Beurteilung aus."
681-
"Please select tag(s).","Wählen Sie bitte einen oder mehrere Tags aus."
682677
"Please specify backup creation options","Bitte die Optionen für die Ausführung des Backups bestimmen"
683678
"Please specify the admin custom URL.","Geben Sie bitte die Admin-URL des Kunden ein."
684679
"Please try to logout and sign in again.","Melden Sie sich ab und melden Sie sich dann erneut an."
@@ -883,7 +878,6 @@
883878
"System","System"
884879
"System Section","Systembereich"
885880
"System busy","System belegt"
886-
"Tags","Tags"
887881
"Target Path","Zielpfad"
888882
"Tax","Steuern"
889883
"Tb","TB"
@@ -961,8 +955,6 @@
961955
"The shipment has been created.","Die Lieferung wurde erstellt."
962956
"The shipment has been sent.","Die Sendung ist ausgeliefert worden."
963957
"The shipping label has been created.","Das Versandlabel wurde erstellt."
964-
"The tag has been deleted.","Das Tag wurde gelöscht."
965-
"The tag has been saved.","Der Tag (dt. Etikett, Marke) ist gesichert worden."
966958
"The transaction details have been updated.","Die Transaktionsdetails sind aktualisiert worden."
967959
"The user has been deleted.","Der Benutzer wurde gelöscht."
968960
"The user has been saved.","Der Benutzer ist gespeichert worden."
@@ -1022,7 +1014,6 @@
10221014
"URL Rewrite Management","URL-Rewrite-Verwaltung"
10231015
"Unable to cancel the credit memo.","Gutschrift kann nicht storniert werden."
10241016
"Unable to find a Email Template to delete.","Keine E-Mail-Vorlage zum Löschen gefunden."
1025-
"Unable to find a tag to delete.","Kein Tag zum Löschen gefunden."
10261017
"Unable to find a user to delete.","Kein zu löschender Benutzer auffindbar."
10271018
"Unable to initialize import model","Importmodell kann nicht initialisiert werden."
10281019
"Unable to refresh lifetime statistics.","Lebenszeitstatistik kann nicht aktualisiert werden."
@@ -1106,7 +1097,6 @@
11061097
"Wrong newsletter template.","Falsche Newsletter-Vorlage."
11071098
"Wrong quote item.","Falsches Inhaltselement."
11081099
"Wrong tab configuration.","Fehlerhafte Konfiguration der Registerkarte."
1109-
"Wrong tag was specified.","Falsches Tag angegeben."
11101100
"Wrong transaction ID specified.","Falsche Transaktions-ID angegeben."
11111101
"XML","XML"
11121102
"XML data is invalid.","XML-Daten sind ungültig."

app/code/Magento/Adminhtml/i18n/en_US.csv

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"All Files","All Files"
9292
"All Reviews","All Reviews"
9393
"All Store Views","All Store Views"
94-
"All Tags","All Tags"
9594
"All Websites","All Websites"
9695
"All countries","All countries"
9796
"All fields","All fields"
@@ -143,7 +142,6 @@
143142
"Area","Area"
144143
"As low as:","As low as:"
145144
"Assigned","Assigned"
146-
"Tags","Tags"
147145
"Attribute Set Name:","Attribute Set Name:"
148146
"Attributes","Attributes"
149147
"Automatic (equalize price ranges)","Automatic (equalize price ranges)"
@@ -568,7 +566,6 @@
568566
"New Sitemap","New Sitemap"
569567
"New Store View","New Store View"
570568
"New System Template","New System Template"
571-
"New Tag","New Tag"
572569
"New Template","New Template"
573570
"New User","New User"
574571
"New Variable","New Variable"
@@ -644,7 +641,6 @@
644641
"Payment method is not available.","Payment method is not available."
645642
"Payment method must be specified.","Payment method must be specified."
646643
"Pending Reviews","Pending Reviews"
647-
"Pending Tags","Pending Tags"
648644
"Per Item","Per Item"
649645
"Per Order","Per Order"
650646
"Percent","Percent"
@@ -689,7 +685,6 @@
689685
"Please select one of the above options.","Please select one of the above options."
690686
"Please select one of the options.","Please select one of the options."
691687
"Please select review(s).","Please select review(s)."
692-
"Please select tag(s).","Please select tag(s)."
693688
"Please specify backup creation options","Please specify backup creation options"
694689
"Please specify the admin custom URL.","Please specify the admin custom URL."
695690
"Please try to logout and sign in again.","Please try to logout and sign in again."
@@ -900,7 +895,6 @@
900895
"System","System"
901896
"System Section","System Section"
902897
"System busy","System busy"
903-
"Tags","Tags"
904898
"Target Path","Target Path"
905899
"Tax","Tax"
906900
"Tb","Tb"
@@ -978,8 +972,6 @@
978972
"The shipment has been created.","The shipment has been created."
979973
"The shipment has been sent.","The shipment has been sent."
980974
"The shipping label has been created.","The shipping label has been created."
981-
"The tag has been deleted.","The tag has been deleted."
982-
"The tag has been saved.","The tag has been saved."
983975
"The transaction details have been updated.","The transaction details have been updated."
984976
"The user has been deleted.","The user has been deleted."
985977
"The user has been saved.","The user has been saved."
@@ -1040,7 +1032,6 @@
10401032
"URL Rewrite Management","URL Rewrite Management"
10411033
"Unable to cancel the credit memo.","Unable to cancel the credit memo."
10421034
"Unable to find a Email Template to delete.","Unable to find a Email Template to delete."
1043-
"Unable to find a tag to delete.","Unable to find a tag to delete."
10441035
"Unable to find a user to delete.","Unable to find a user to delete."
10451036
"Unable to initialize import model","Unable to initialize import model"
10461037
"Unable to refresh lifetime statistics.","Unable to refresh lifetime statistics."
@@ -1124,7 +1115,6 @@
11241115
"Wrong newsletter template.","Wrong newsletter template."
11251116
"Wrong quote item.","Wrong quote item."
11261117
"Wrong tab configuration.","Wrong tab configuration."
1127-
"Wrong tag was specified.","Wrong tag was specified."
11281118
"Wrong transaction ID specified.","Wrong transaction ID specified."
11291119
"XML","XML"
11301120
"XML data is invalid.","XML data is invalid."

app/code/Magento/Adminhtml/i18n/es_ES.csv

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"All Files","Todos los Archivos"
9292
"All Reviews","Todas las Revisiones"
9393
"All Store Views","Todas las vistas de tienda"
94-
"All Tags","Todas la Etiquetas"
9594
"All Websites","Todos los Sitios Web"
9695
"All countries","Todos los países"
9796
"All fields","Todos los campos"
@@ -143,7 +142,6 @@
143142
"Area","Área"
144143
"As low as:","Tan bajo como:"
145144
"Assigned","Asignado"
146-
"Tags","Etiquetas asociadas"
147145
"Attribute Set Name:","Nombre del conjunto de atributos:"
148146
"Attributes","Atributos"
149147
"Automatic","Automático"
@@ -558,7 +556,6 @@
558556
"New Sitemap","Nuevo mapa del sitio web"
559557
"New Store View","Nueva vista de tienda"
560558
"New System Template","Nueva plantilla del sistema"
561-
"New Tag","Nueva Etiqueta"
562559
"New Template","Nueva Plantilla"
563560
"New User","Nuevo usuario"
564561
"New Variable","Nueva variable"
@@ -633,7 +630,6 @@
633630
"Payment method is not available.","No está disponible el método de pago."
634631
"Payment method must be specified.","Se debe especificar el método de pago."
635632
"Pending Reviews","Revisiones Pendientes"
636-
"Pending Tags","Etiquetas Pendientes"
637633
"Per Item","Por artículo"
638634
"Per Order","Por Pedido"
639635
"Percent","Porcentaje"
@@ -678,7 +674,6 @@
678674
"Please select one of the above options.","Por favor, selecciona una de las opciones anteriores."
679675
"Please select one of the options.","Seleccione una de las opciones."
680676
"Please select review(s).","Seleccione reseñas."
681-
"Please select tag(s).","Por favor, selecciona la(s) etiqueta(s):"
682677
"Please specify backup creation options","Por favor especifica las opciones de creación de la copia de seguridad"
683678
"Please specify the admin custom URL.","Por favor, especifica la dirección URL personalizada de administración."
684679
"Please try to logout and sign in again.","Intente cerrar sesión y volver a iniciarla."
@@ -883,7 +878,6 @@
883878
"System","Sistema"
884879
"System Section","Selección de Sistema"
885880
"System busy","El sistema está ocupado"
886-
"Tags","Etiquetas"
887881
"Target Path","Ruta objetivo"
888882
"Tax","Impuestos"
889883
"Tb","Tb"
@@ -961,8 +955,6 @@
961955
"The shipment has been created.","Se creó el en"
962956
"The shipment has been sent.","Se ha enviado el pedido."
963957
"The shipping label has been created.","Se ha creado la etiqueta de envío."
964-
"The tag has been deleted.","Se ha borrado la etiqueta."
965-
"The tag has been saved.","Se ha guardado la etiqueta."
966958
"The transaction details have been updated.","Se han actualizado los detalles de la transacción."
967959
"The user has been deleted.","Se eliminó el usuario."
968960
"The user has been saved.","Se ha guardado el usuario."
@@ -1022,7 +1014,6 @@
10221014
"URL Rewrite Management","Administración de la reescritura de la URL"
10231015
"Unable to cancel the credit memo.","Deshabilitar cancelación de nota de crédito."
10241016
"Unable to find a Email Template to delete.","Deshabilitar encontrar plantilla de email para eliminar."
1025-
"Unable to find a tag to delete.","Incapaz de encontrar el tag a eliminar"
10261017
"Unable to find a user to delete.","No se puede encontrar un usuario para eliminar."
10271018
"Unable to initialize import model","Incapaz de iniciar el modelo de importación"
10281019
"Unable to refresh lifetime statistics.","Incapaz de volver a cargar estadísticas totales."
@@ -1106,7 +1097,6 @@
11061097
"Wrong newsletter template.","Plantilla de boletín de noticias errónea."
11071098
"Wrong quote item.","Artículo mal expresado."
11081099
"Wrong tab configuration.","Configuración de pestañas no válido."
1109-
"Wrong tag was specified.","Se ha especificado una etiqueta errónea."
11101100
"Wrong transaction ID specified.","ID de transacción especificada errónea."
11111101
"XML","XML"
11121102
"XML data is invalid.","dato XML inválido"

app/code/Magento/Adminhtml/i18n/fr_FR.csv

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"All Files","Tous les Fichiers"
9292
"All Reviews","Tous les avis"
9393
"All Store Views","Toutes les vues de la boutique"
94-
"All Tags","Tous les tags"
9594
"All Websites","Tous les sites web"
9695
"All countries","Tous les pays"
9796
"All fields","Tous les champs"
@@ -143,7 +142,6 @@
143142
"Area","Zone"
144143
"As low as:","Aussi bas que :"
145144
"Assigned","Assigné"
146-
"Tags","Tags associés"
147145
"Attribute Set Name:","Nom du jeu d'attributs:"
148146
"Attributes","Attributs"
149147
"Automatic","Automatique"
@@ -558,7 +556,6 @@
558556
"New Sitemap","Nouveau plan du site"
559557
"New Store View","Vue nouvelle boutique"
560558
"New System Template","Nouveau modèle de livraison"
561-
"New Tag","Nouveau tag"
562559
"New Template","Nouveau modèle"
563560
"New User","Nouvel utilisateur"
564561
"New Variable","Nouvelle variable"
@@ -633,7 +630,6 @@
633630
"Payment method is not available.","La méthode de paiement n'est pas disponible."
634631
"Payment method must be specified.","Le mode de paiement doit être précisé."
635632
"Pending Reviews","Avis en attente"
636-
"Pending Tags","Tags en attente"
637633
"Per Item","Par article"
638634
"Per Order","Par commande"
639635
"Percent","pour cent"
@@ -678,7 +674,6 @@
678674
"Please select one of the above options.","Veuillez sélectionner l'un des choix ci-dessus."
679675
"Please select one of the options.","Veuillez sélectionner l'une des options."
680676
"Please select review(s).","Veuillez sélectionner les avis."
681-
"Please select tag(s).","Veuillez sélectionner une/des étiquette(s)."
682677
"Please specify backup creation options","Veuillez préciser les options de création de la sauvegarde"
683678
"Please specify the admin custom URL.","Veuillez préciser la nouvelle URL d'aminnistration."
684679
"Please try to logout and sign in again.","Veuillez essayer de vous déconnecter, puis de vous connecter à nouveau."
@@ -883,7 +878,6 @@
883878
"System","Système"
884879
"System Section","Section système"
885880
"System busy","Le système est occupé"
886-
"Tags","Étiquettes"
887881
"Target Path","Chemin cible"
888882
"Tax","Taxe"
889883
"Tb","Tb"
@@ -961,8 +955,6 @@
961955
"The shipment has been created.","L'envoi a été créé."
962956
"The shipment has been sent.","La commande a été expédiée."
963957
"The shipping label has been created.","L'étiquette d'expédition a été créée."
964-
"The tag has been deleted.","L'étiquette a été supprimée"
965-
"The tag has been saved.","L'étiquette a été sauvegardée."
966958
"The transaction details have been updated.","Les détails de la transaction ont été mis a jour."
967959
"The user has been deleted.","L'utilisateur a été supprimé."
968960
"The user has been saved.","L'utilisateur a été sauvegardé."
@@ -1022,7 +1014,6 @@
10221014
"URL Rewrite Management","Gestion de la réécriture URL"
10231015
"Unable to cancel the credit memo.","Impossible d'annuler l'avoir."
10241016
"Unable to find a Email Template to delete.","Impossible de trouver un modèle d'email à supprimer."
1025-
"Unable to find a tag to delete.","Impossible de trouver une étiquette à supprimer."
10261017
"Unable to find a user to delete.","Impossible de trouver un utilisateur à effacer."
10271018
"Unable to initialize import model","Impossible d'initialiser le modèle importé"
10281019
"Unable to refresh lifetime statistics.","Impossible de réactualiser les statistiques de durée de vie"
@@ -1106,7 +1097,6 @@
11061097
"Wrong newsletter template.","Mauvais modèle de lettre de diffusion"
11071098
"Wrong quote item.","Mauvais objet"
11081099
"Wrong tab configuration.","L'onglet de configuration est erroné."
1109-
"Wrong tag was specified.","Une mauvaise étiquette a été définie."
11101100
"Wrong transaction ID specified.","Mauvais identifiant transaction défini."
11111101
"XML","XML"
11121102
"XML data is invalid.","Données XML invalides"

0 commit comments

Comments
 (0)