Merge ef24294fc6 into 73eeaa8b3c

chandler/Database/Log.php

@@ -40,12 +40,12 @@ class Log extends DBEntity
 
     function getType(): string
     {
-        return ["добавил", "отредактировал", "удалил", "восстановил"][$this->getTypeRaw()];
+        return [tr("logs_added"), tr("logs_edited"), tr("logs_removed"), tr("logs_restored")][$this->getTypeRaw()];
     }
 
     function getTypeNom(): string
     {
-        return ["Создание", "Редактирование", "Удаление", "Восстановление"][$this->getTypeRaw()];
+        return [tr("logs_adding"), tr("logs_editing"), tr("logs_removing"), tr("logs_restoring")][$this->getTypeRaw()];
     }
 
     function getObjectType(): string

chandler/MVC/Routing/Router.php

@@ -278,7 +278,7 @@ class Router
     function execute(string $url, ?string $parentModule = null): ?string
     {
         $this->scope = [];
-        $this->url   = chandler_escape_url(parse_url($url, PHP_URL_PATH));
+        $this->url   = chandler_escape_url((string) parse_url(preg_replace("%/+%", "/", $url), PHP_URL_PATH));
         
         if(!is_null($parentModule)) {
             $GLOBALS["parentModule"]     = $parentModule;