Merge branch 'master' of github.com:mrvautin/expressCart

README.md

@@ -2,4 +2,4 @@
 
 Check out the documentation [here](https://github.com/mrvautin/expressCart/wiki).
 
-View the demo shop [here](https://demo.expresscart.markmoffat.com/).
+View the demo shop [here](https://expresscart-demo.markmoffat.com/).

config/settingsSchema.json

@@ -65,7 +65,7 @@
         },
         "currencyISO": {
             "type": "string",
-            "enum": ["USD", "EUR", "GBP"],
+            "enum": ["USD", "EUR", "GBP", "RON"],
             "default": "USD"
         },
         "paymentGateway": {

locales/en.json

@@ -113,7 +113,7 @@
 	"Currency symbol": "Currency symbol",
 	"Set this to your currency symbol. Eg: $, £, €": "Set this to your currency symbol. Eg: $, £, €",
 	"Theme": "Theme",
-	"Theme_Info": "Themes are loaded from `/public/themes/`",
+	"Theme_Info": "Themes are loaded from `/views/themes/`",
 	"Products per row": "Products per row",
 	"The number of products to be displayed across the page.": "The number of products to be displayed across the page.",
 	"Products per page": "Products per page",
@@ -226,4 +226,4 @@
 	"The Serial number, GTIN or Barcode": "The Serial number, GTIN or Barcode",
 	"Product Brand": "Product Brand",
 	"The brand of the product": "The brand of the product"
-}
+}

locales/it.json

@@ -115,7 +115,7 @@
 	"Currency symbol": "Simbolo valuta",
 	"Set this to your currency symbol. Eg: $, £, €": "Configura il simbolo della tua valuta. Es: $, £, €",
 	"Theme": "Tema",
-	"Theme_Info": "I temi sono caricati da `/public/themes/`",
+	"Theme_Info": "I temi sono caricati da `/views/themes/`",
 	"Products per row": "Prodotti per riga",
 	"The number of products to be displayed across the page.": "Il numero di prodotti visualizzati per riga nella pagina",
 	"Products per page": "Prodotti per pagina",
@@ -185,4 +185,4 @@
 	"Password": "Password",
 	"Create Order": "Create Order",
 	"Create order": "Create order"
-}
+}