From 020c455d78c74be701ce4f728b180fe028ea95dc Mon Sep 17 00:00:00 2001 From: Charley Wu Date: Sun, 21 Apr 2024 08:23:02 +0800 Subject: [PATCH] Fixes typo --- .devcontainer/{compose.yml => compose.yaml} | 0 .devcontainer/devcontainer.json | 2 +- joomla/administrator/language/en-GB/en-GB.com_magebridge.ini | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .devcontainer/{compose.yml => compose.yaml} (100%) diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yaml similarity index 100% rename from .devcontainer/compose.yml rename to .devcontainer/compose.yaml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e986db62..f365c135 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ // Update the PHP_VERSION arg in docker-compose.yml to pick a PHP version { "name": "MageBridge", - "dockerComposeFile": "compose.yml", + "dockerComposeFile": "compose.yaml", "service": "joomla", "workspaceFolder": "/workspace", "customizations": { diff --git a/joomla/administrator/language/en-GB/en-GB.com_magebridge.ini b/joomla/administrator/language/en-GB/en-GB.com_magebridge.ini index f09d5489..7970cedc 100644 --- a/joomla/administrator/language/en-GB/en-GB.com_magebridge.ini +++ b/joomla/administrator/language/en-GB/en-GB.com_magebridge.ini @@ -295,7 +295,7 @@ COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_TIMEOUT="CURL timeout" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_TIMEOUT_DESC="The number of seconds before the CURL connection will timeout" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION="CURL HTTP Version" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_DESC="The HTTP version for the CURL connection will be used" -COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_OPTION_NONE="Lets CURL decide" +COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_OPTION_NONE="Let CURL decide" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_OPTION_1_1="Forces HTTP/1.1" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_OPTION_2="Attempts HTTP 2" COM_MAGEBRIDGE_MODEL_CONFIG_FIELD_CURL_HTTP_VERSION_OPTION_2TLS="Attempts HTTP 2 over TLS only"