- removed internal version in Marello EE

- updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json
marellocommerce · Feb 14, 2020 · 1999cc1 · 1999cc1
1 parent 7e9afaa
commit 1999cc1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "OSL-3.0",
     "authors": [
         {
-            "name": "Madia B.V.",
+            "name": "Marello B.V.",
             "homepage": "https://www.marello.com"
         }
     ],
@@ -20,7 +20,6 @@
         }
     },
     "require": {
-        "php": ">=7.1.26",
         "oro/platform": "4.1.*",
         "oro/platform-serialised-fields": "4.1.*",
         "oro/calendar-bundle": "4.1.*",

diff --git a/src/Marello/Bundle/InvoiceBundle/Resources/translations/messages.en.yml b/src/Marello/Bundle/InvoiceBundle/Resources/translations/messages.en.yml
@@ -22,7 +22,7 @@ marello:
         currency.label:             Currency
         status.label:               Status
         customer.label:             Customer
-        sales_channel.label:        Salse Channel
+        sales_channel.label:        Sales Channel
         items.label:                Items
         subtotal.label:             Subtotal
         total_tax.label:            Tax Total
@@ -59,7 +59,7 @@ marello:
             currency.label:             Currency
             status.label:               Status
             customer.label:             Customer
-            sales_channel.label:        Salse Channel
+            sales_channel.label:        Sales Channel
             items.label:                Items
             subtotal.label:             Subtotal
             total_tax.label:            Tax Total
@@ -138,7 +138,7 @@ marello:
             currency.label:             Currency
             status.label:               Status
             customer.label:             Customer
-            sales_channel.label:        Salse Channel
+            sales_channel.label:        Sales Channel
             items.label:                Items
             subtotal.label:             Subtotal
             total_tax.label:            Tax Total

diff --git a/src/Marello/Bundle/PdfBundle/Resources/translations/messages.en.yml b/src/Marello/Bundle/PdfBundle/Resources/translations/messages.en.yml
@@ -18,7 +18,7 @@ marello:
                     tooltip: "Localization applied number- and date-fields on PDF document."
                 logo:
                     label: "Company logo"
-                    tooltip: "Upload a logo that will be displayed on top of your PDF document(image/jpeg, image/png, image/gif)."
+                    tooltip: "Upload a logo that will be displayed on top of your PDF document(image/jpeg, image/png, image/gif, image/svg)."
                 company_address:
                     label: "Company address"
                     tooltip: "Enter company address information here, including the company name and country."