diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index cfe5d58b7..30504453b 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -317,7 +317,7 @@ trait Modules $file = $response->getBody()->getContents(); $path = 'temp-' . md5(mt_rand()); - $temp_path = storage_path('app/temp') . '/' . $path; + $temp_path = storage_path('app/temp/' . $path); $file_path = $temp_path . '/upload.zip'; @@ -359,7 +359,7 @@ trait Modules ]; } - $temp_path = storage_path('app/temp') . '/' . $path; + $temp_path = storage_path('app/temp/' . $path); $file = $temp_path . '/upload.zip'; @@ -394,7 +394,9 @@ trait Modules public function installModule($path) { - if (empty($path)) { + $temp_path = storage_path('app/temp/' . $path); + + if (empty($path) || !is_file($temp_path . '/module.json')) { return [ 'success' => false, 'error' => true, @@ -403,8 +405,6 @@ trait Modules ]; } - $temp_path = storage_path('app/temp') . '/' . $path; - $modules_path = config('module.paths.modules'); // Create modules directory diff --git a/composer.json b/composer.json index 80228c163..ef698baf2 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "laravel/ui": "^2.0", "laravelcollective/html": "6.1.*", "league/omnipay": "3.0.*", - "lorisleiva/laravel-search-string": "1.0.*", + "lorisleiva/laravel-search-string": "0.1.*", "maatwebsite/excel": "3.1.*", "misterphilip/maintenance-mode": "2.0.*", "monooso/unobserve": "^2.0", diff --git a/composer.lock b/composer.lock index d0e213afc..c93bdad2e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c44aedb0ed90d8deff47a73d86074257", + "content-hash": "d1b643139c31f613261680c874c1d145", "packages": [ { "name": "akaunting/firewall", @@ -2753,789 +2753,6 @@ ], "time": "2019-07-01T23:21:34+00:00" }, - { - "name": "hoa/compiler", - "version": "3.17.08.08", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Compiler.git", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/aa09caf0bf28adae6654ca6ee415ee2f522672de", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/file": "~1.0", - "hoa/iterator": "~2.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/regex": "~1.0", - "hoa/visitor": "~2.0" - }, - "require-dev": { - "hoa/json": "~2.0", - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Compiler\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Compiler library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "algebraic", - "ast", - "compiler", - "context-free", - "coverage", - "exhaustive", - "grammar", - "isotropic", - "language", - "lexer", - "library", - "ll1", - "llk", - "parser", - "pp", - "random", - "regular", - "rule", - "sampler", - "syntax", - "token", - "trace", - "uniform" - ], - "time": "2017-08-08T07:44:07+00:00" - }, - { - "name": "hoa/consistency", - "version": "1.17.05.02", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Consistency.git", - "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f", - "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f", - "shasum": "" - }, - "require": { - "hoa/exception": "~1.0", - "php": ">=5.5.0" - }, - "require-dev": { - "hoa/stream": "~1.0", - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Consistency\\": "." - }, - "files": [ - "Prelude.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Consistency library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "autoloader", - "callable", - "consistency", - "entity", - "flex", - "keyword", - "library" - ], - "time": "2017-05-02T12:18:12+00:00" - }, - { - "name": "hoa/event", - "version": "1.17.01.13", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Event.git", - "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54", - "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Event\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Event library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "event", - "library", - "listener", - "observer" - ], - "time": "2017-01-13T15:30:50+00:00" - }, - { - "name": "hoa/exception", - "version": "1.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Exception.git", - "reference": "091727d46420a3d7468ef0595651488bfc3a458f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f", - "reference": "091727d46420a3d7468ef0595651488bfc3a458f", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Exception\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Exception library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "exception", - "library" - ], - "time": "2017-01-16T07:53:27+00:00" - }, - { - "name": "hoa/file", - "version": "1.17.07.11", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/File.git", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/stream": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\File\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\File library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Socket", - "directory", - "file", - "finder", - "library", - "link", - "temporary" - ], - "time": "2017-07-11T07:42:15+00:00" - }, - { - "name": "hoa/iterator", - "version": "2.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Iterator.git", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Iterator\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Iterator library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "iterator", - "library" - ], - "time": "2017-01-10T10:34:47+00:00" - }, - { - "name": "hoa/math", - "version": "1.17.05.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Math.git", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Math/zipball/7150785d30f5d565704912116a462e9f5bc83a0c", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c", - "shasum": "" - }, - "require": { - "hoa/compiler": "~3.0", - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/protocol": "~1.0", - "hoa/zformat": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Math\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Math library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "arrangement", - "combination", - "combinatorics", - "counting", - "library", - "math", - "permutation", - "sampler", - "set" - ], - "time": "2017-05-16T08:02:17+00:00" - }, - { - "name": "hoa/protocol", - "version": "1.17.01.14", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Protocol.git", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Protocol\\": "." - }, - "files": [ - "Wrapper.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Protocol library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "protocol", - "resource", - "stream", - "wrapper" - ], - "time": "2017-01-14T12:26:10+00:00" - }, - { - "name": "hoa/regex", - "version": "1.17.01.13", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Regex.git", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Regex/zipball/7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/ustring": "~4.0", - "hoa/visitor": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Regex\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Regex library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "compiler", - "library", - "regex" - ], - "time": "2017-01-13T16:10:24+00:00" - }, - { - "name": "hoa/stream", - "version": "1.17.02.21", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Stream.git", - "reference": "3293cfffca2de10525df51436adf88a559151d82" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", - "reference": "3293cfffca2de10525df51436adf88a559151d82", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/protocol": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Stream\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Stream library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Context", - "bucket", - "composite", - "filter", - "in", - "library", - "out", - "protocol", - "stream", - "wrapper" - ], - "time": "2017-02-21T16:01:06+00:00" - }, - { - "name": "hoa/ustring", - "version": "4.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Ustring.git", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "suggest": { - "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", - "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Ustring\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Ustring library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "search", - "string", - "unicode" - ], - "time": "2017-01-16T07:08:25+00:00" - }, - { - "name": "hoa/visitor", - "version": "2.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Visitor.git", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/c18fe1cbac98ae449e0d56e87469103ba08f224a", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Visitor\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Visitor library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "structure", - "visit", - "visitor" - ], - "time": "2017-01-16T07:02:03+00:00" - }, - { - "name": "hoa/zformat", - "version": "1.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Zformat.git", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Zformat\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Zformat library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "parameter", - "zformat" - ], - "time": "2017-01-10T10:39:54+00:00" - }, { "name": "intervention/image", "version": "2.5.1", @@ -4603,20 +3820,19 @@ }, { "name": "lorisleiva/laravel-search-string", - "version": "v1.0.1", + "version": "v0.1.6", "source": { "type": "git", "url": "https://github.com/lorisleiva/laravel-search-string.git", - "reference": "f5b0df4be4b774076fc726a0daeb891491d04385" + "reference": "68189cad7614d0c9cb09a83315e1ccfe49e7f0c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/f5b0df4be4b774076fc726a0daeb891491d04385", - "reference": "f5b0df4be4b774076fc726a0daeb891491d04385", + "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/68189cad7614d0c9cb09a83315e1ccfe49e7f0c1", + "reference": "68189cad7614d0c9cb09a83315e1ccfe49e7f0c1", "shasum": "" }, "require": { - "hoa/compiler": "^3.17", "illuminate/support": "^5.5|^6.0|^7.0" }, "require-dev": { @@ -4646,7 +3862,7 @@ } ], "description": "Generates database queries based on one unique string using a simple and customizable syntax.", - "time": "2020-07-04T11:30:30+00:00" + "time": "2020-04-05T15:40:30+00:00" }, { "name": "maatwebsite/excel", diff --git a/phpunit.xml b/phpunit.xml index d59f4c3a9..4a514d787 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ diff --git a/resources/lang/da-DK/install.php b/resources/lang/da-DK/install.php index 0b5e468dc..918f39e6b 100644 --- a/resources/lang/da-DK/install.php +++ b/resources/lang/da-DK/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fejl: Anmod din host om at bruge PHP :php_version eller højere for både HTTP og CLI', 'connection' => 'Error: Kunne ikke forbinde til databasen! Kontroller, at oplysningerne er korrekte.', ], diff --git a/resources/lang/es-MX/install.php b/resources/lang/es-MX/install.php index 24998fab2..7be16519d 100644 --- a/resources/lang/es-MX/install.php +++ b/resources/lang/es-MX/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Error: solicite a su proveedor de hosting que use PHP: php_version o superior para HTTP y CLI.', 'connection' => 'Error: ¡No se pudo conectar a la base de datos! Por favor, asegúrese de que los datos son correctos.', ], diff --git a/resources/lang/it-IT/install.php b/resources/lang/it-IT/install.php index fc6603a16..398d21588 100644 --- a/resources/lang/it-IT/install.php +++ b/resources/lang/it-IT/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Errore: chiedi al tuo provider di usare PHP :php_version o superiore sia per HTTP che per CLI.', 'connection' => 'Errore: Impossibile connettersi al database! Per favore, assicurati che i dettagli siano corretti.', ], diff --git a/resources/lang/it-IT/modules.php b/resources/lang/it-IT/modules.php index ceecb48dd..486426a2a 100644 --- a/resources/lang/it-IT/modules.php +++ b/resources/lang/it-IT/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nuovo', 'top_free' => 'Top gratis', 'free' => 'GRATIS', - 'search' => 'Ricerca', 'install' => 'Installa', 'buy_now' => 'Acquista ora', 'get_api_key' => 'Clicca qui per ottenere la tua chiave API.', diff --git a/resources/lang/ne-NP/auth.php b/resources/lang/ne-NP/auth.php index dcea5d6ab..761e5754a 100644 --- a/resources/lang/ne-NP/auth.php +++ b/resources/lang/ne-NP/auth.php @@ -16,15 +16,15 @@ return [ 'landing_page' => 'अवतरण पृष्ठ', 'password' => [ - 'current' => 'प्रवेश शब्द', - 'current_confirm' => 'प्रवेश शब्दको सुनिश्चितत़ा', - 'new' => 'नयाँँ प्रवेश शब्द लिनुहोस', - 'new_confirm' => 'नयाँ प्रवेश शब्दको सुनिश्चितत़ा', + 'current' => 'संकेत शब्द', + 'current_confirm' => 'संकेत शब्दको सुनिश्चितत़ा', + 'new' => 'नयाँँ संकेत शब्द लिनुहोस', + 'new_confirm' => 'नयाँ संकेत शब्दको सुनिश्चितत़ा', ], 'error' => [ - 'self_delete' => 'त्रुटि: तपाई आफैंलाई हटाउन सक्नुहुन्न !', - 'self_disable' => 'त्रुटि: आफैँ हटाउन सकिदैन!', + 'self_delete' => 'त्रुटि: आफैंलाई हटाउन सकिदैन !', + 'self_disable' => 'त्रुटि: आफैँलाइ असक्षम गराउन सकिदैन!', 'no_company' => 'त्रुटि: तपाईको खातासँग सम्बन्धित कम्पनि तोकिएको छैन । कृपया प्प्ररणाली शासकसँग सम्पर्क गर्नुहोस।', ], diff --git a/resources/lang/ne-NP/install.php b/resources/lang/ne-NP/install.php index 54c0afd50..780243d09 100644 --- a/resources/lang/ne-NP/install.php +++ b/resources/lang/ne-NP/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Error: Ask your hosting provider to use PHP :php_version or higher for both HTTP and CLI.', 'connection' => 'त्रुटि: डाटाबेसमा जोड्न सकिएन! कृपया, सम्पूर्ण विवरण ठीक छन् भनि निश्चित गर्नुहोस।', ], diff --git a/resources/lang/pt-BR/install.php b/resources/lang/pt-BR/install.php index 565d53f4f..a6a05bd37 100644 --- a/resources/lang/pt-BR/install.php +++ b/resources/lang/pt-BR/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Erro: Peça ao seu provedor de hospedagem para usar PHP :php_version ou superior para HTTP e CLI.', 'connection' => 'Erro: Não foi possível conectar ao banco de dados! Certifique-se de que os detalhes estão corretos.', ], diff --git a/resources/lang/pt-PT/install.php b/resources/lang/pt-PT/install.php index aa813276d..b74ae0e5e 100644 --- a/resources/lang/pt-PT/install.php +++ b/resources/lang/pt-PT/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Erro: Peça ao seu fornecedor de alojamento web para usar PHP :php_version ou superior para HTTP e CLI.', 'connection' => 'Erro: Não foi possível ligar à base de dados! Por favor, verifique se a informação que inseriu está correcta.', ], diff --git a/resources/lang/sq-AL/install.php b/resources/lang/sq-AL/install.php index c3ad2385c..714b0fbc7 100644 --- a/resources/lang/sq-AL/install.php +++ b/resources/lang/sq-AL/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Gabim: Kërkoni nga ofruesi juaj i hosting të përdorë PHP :php_version ose më të lartë si për HTTP dhe CLI.', 'connection' => 'Gabim: Nuk mund të lidhej me database! Ju lutemi, sigurohuni që të dhënat janë të sakta.', ], diff --git a/resources/lang/sq-AL/modules.php b/resources/lang/sq-AL/modules.php index cc90d9938..445fd3367 100644 --- a/resources/lang/sq-AL/modules.php +++ b/resources/lang/sq-AL/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'I ri', 'top_free' => 'Më të mirët Falas', 'free' => 'FALAS', - 'search' => 'Kërko', 'install' => 'Instalo', 'buy_now' => 'Bli Tani', 'get_api_key' => 'Klikoni këtu për të marrë çelësin tuaj API.', diff --git a/resources/lang/sv-SE/bills.php b/resources/lang/sv-SE/bills.php index 7c6da4f16..f805f9191 100644 --- a/resources/lang/sv-SE/bills.php +++ b/resources/lang/sv-SE/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Pris', 'sub_total' => 'Delsumma', 'discount' => 'Rabatt', + 'item_discount' => 'Line Discount', 'tax_total' => 'Summa moms', 'total' => 'Summa', @@ -30,6 +31,7 @@ return [ 'add_payment' => 'Lägg till betalning', 'mark_paid' => 'Markera som betald', 'mark_received' => 'Markerad som mottagen', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Ladda ner PDF', 'send_mail' => 'Skicka E-post', 'create_bill' => 'Skapa faktura', @@ -43,11 +45,13 @@ return [ 'paid' => 'Betald', 'overdue' => 'Förfallen', 'unpaid' => 'Obetald', + 'cancelled' => 'Cancelled', ], 'messages' => [ - 'received' => 'Faktura markerad som mottagen!', + 'marked_received' => 'Bill marked as received!', 'marked_paid' => 'Fakturan markerad som betald!', + 'marked_cancelled' => 'Bill marked as cancelled!', 'draft' => 'Detta är ett DRAFT förslag och kommer att stämmas av innan den mottages.', 'status' => [ diff --git a/resources/lang/sv-SE/bulk_actions.php b/resources/lang/sv-SE/bulk_actions.php index 2478a571a..4e5f6017a 100644 --- a/resources/lang/sv-SE/bulk_actions.php +++ b/resources/lang/sv-SE/bulk_actions.php @@ -15,6 +15,7 @@ return [ 'paid' => 'Är du säker på att du vill markera vald faktura som betald?|Är du säker på att du vill markera markerade fakturor som betalada?', 'sent' => 'Är du säker på att du vill markera vald faktura som skickad?|Vill du verkligen markera markerade fakturor som skickade?', 'received' => 'Är du säker på att du vill markera vald faktura som mottagen?|Är du säker på att du vill markera markerade räkningar som mottagna?', + 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/sv-SE/install.php b/resources/lang/sv-SE/install.php index 821afcb89..8c673be3c 100644 --- a/resources/lang/sv-SE/install.php +++ b/resources/lang/sv-SE/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature måste inaktiveras!', 'extension' => ':extension tillägget måste vara installerad och laddad!', 'directory' => ':directory katalogen måste vara skrivbar!', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ @@ -38,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fel: Be ditt webbhotell leverantör att använda PHP :php_version eller högre för både HTTP och CLI.', 'connection' => 'Fel: Kunde inte ansluta till databasen! Snälla, se till att uppgifterna stämmer.', ], diff --git a/resources/lang/sv-SE/invoices.php b/resources/lang/sv-SE/invoices.php index def631baf..564007586 100644 --- a/resources/lang/sv-SE/invoices.php +++ b/resources/lang/sv-SE/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Pris', 'sub_total' => 'Delsumma', 'discount' => 'Rabatt', + 'item_discount' => 'Line Discount', 'tax_total' => 'Summa Skatt', 'total' => 'Totalt', @@ -30,6 +31,7 @@ return [ 'mark_paid' => 'Markera som betald', 'mark_sent' => 'Markera som skickad', 'mark_viewed' => 'Markera som visad', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Ladda ner PDF', 'send_mail' => 'Skicka E-post', 'all_invoices' => 'Logga in för att visa alla fakturor', @@ -47,12 +49,15 @@ return [ 'paid' => 'Betald', 'overdue' => 'Förfallen', 'unpaid' => 'Obetald', + 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'E-postadress till faktura har skickats!', 'marked_sent' => 'Faktura markerad som skickad!', 'marked_paid' => 'Faktura markerad som betald!', + 'marked_viewed' => 'Invoice marked as viewed!', + 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'Ingen e-postadress för den här kunden!', 'draft' => 'Detta är en utkast faktura och kommer att speglas till diagramet efter det skickas.', diff --git a/resources/lang/sv-SE/modules.php b/resources/lang/sv-SE/modules.php index f60006f7a..a8e72b158 100644 --- a/resources/lang/sv-SE/modules.php +++ b/resources/lang/sv-SE/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nytt', 'top_free' => 'Bästa gratis', 'free' => 'Fri', - 'search' => 'Sök', 'install' => 'Installera', 'buy_now' => 'Köp nu', 'get_api_key' => 'Klicka här för att få din API-nyckel.', diff --git a/resources/lang/sv-SE/settings.php b/resources/lang/sv-SE/settings.php index c7158e685..b8a9f8688 100644 --- a/resources/lang/sv-SE/settings.php +++ b/resources/lang/sv-SE/settings.php @@ -29,6 +29,12 @@ return [ 'before' => 'Innan nummret', 'after' => 'Efter nummret', ], + 'discount_location' => [ + 'name' => 'Discount Location', + 'item' => 'At line', + 'total' => 'At total', + 'both' => 'Both line and total', + ], ], 'invoice' => [ diff --git a/resources/lang/tr-TR/install.php b/resources/lang/tr-TR/install.php index ff9417118..ed4bc73d2 100644 --- a/resources/lang/tr-TR/install.php +++ b/resources/lang/tr-TR/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Hata: HTTP ve CLI için PHP sürümün :php_version ve üstü olması gerektiğini hosting firmanıza bildirin.', 'connection' => 'Hata: Veritabanına bağlanamıyoruz! Lütfen veritabanı bilgilerini kontrol ediniz.', ], diff --git a/resources/lang/tr-TR/modules.php b/resources/lang/tr-TR/modules.php index 7f0afe3b5..f46eef49d 100644 --- a/resources/lang/tr-TR/modules.php +++ b/resources/lang/tr-TR/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Yeni', 'top_free' => 'Popüler Ücretsiz', 'free' => 'Ücretsiz', - 'search' => 'Arama', 'install' => 'Yükle', 'buy_now' => 'Şimdi Satın Al', 'get_api_key' => 'API Anahtarını almak için buraya tıklayın.',