diff --git a/Web/Presenters/AboutPresenter.php b/Web/Presenters/AboutPresenter.php index dd503aff..1070f56b 100644 --- a/Web/Presenters/AboutPresenter.php +++ b/Web/Presenters/AboutPresenter.php @@ -76,6 +76,9 @@ final class AboutPresenter extends OpenVKPresenter $this->assertNoCSRF(); setLanguage($_GET['lg']); } + + if(!is_null($_GET['jReturnTo'])) + $this->redirect(rawurldecode($_GET['jReturnTo'])); } function renderExportJSLanguage($lg = NULL): void diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 8fe554c7..df163417 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -263,9 +263,17 @@ {_footer_blog} {_footer_help} {_footer_developers} - {_footer_choose_language} {_footer_privacy} +
+ {var $currentUrl = $_SERVER["REQUEST_URI"]} + {foreach array_slice(getLanguages(), 0, 3) as $language} + + + + {/foreach} + all languages » +
OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}
{php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]}
diff --git a/Web/Presenters/templates/About/Language.xml b/Web/Presenters/templates/About/Language.xml
index 05aa90c7..a55bda3d 100644
--- a/Web/Presenters/templates/About/Language.xml
+++ b/Web/Presenters/templates/About/Language.xml
@@ -40,7 +40,7 @@
{var $result = preg_match("/(.+)\((.+)\)/", $language['native_name'], $name)}
-
{if $result == 1}
{$name[1]}
diff --git a/locales/list.yml b/locales/list.yml
index b6ff0a44..042651c2 100644
--- a/locales/list.yml
+++ b/locales/list.yml
@@ -5,7 +5,7 @@ list:
native_name: "Русский"
author: "OpenVK Team"
- code: "en"
- flag: "us"
+ flag: "gb"
name: "English"
native_name: "English"
author: "OpenVK Team"