diff --git a/admin/check.php b/admin/check.php index 9cdfa5bc4c29baf4a222bad336ab22520426f064..0f8acea35c1b39acb2a318836f7eb0c8c360107b 100644 --- a/admin/check.php +++ b/admin/check.php @@ -25,7 +25,7 @@ define('ROOT_DIR', __DIR__ . '/../'); /** * Checking for missing vendors. */ -if (!file_exists(ROOT_DIR . 'vendor/autoload.php') || !file_exists(ROOT_DIR . 'vendor/o80/i18n/src/shortcuts.php')) { +if (!file_exists(ROOT_DIR . 'vendor/autoload.php')) { die ("ERROR: You should use <code>composer install</code> to fetch dependant libraries."); } @@ -33,7 +33,6 @@ if (!file_exists(ROOT_DIR . 'vendor/autoload.php') || !file_exists(ROOT_DIR . 'v * Stripped ini sequence */ require_once ROOT_DIR . 'vendor/autoload.php'; -require_once ROOT_DIR . 'vendor/o80/i18n/src/shortcuts.php'; require_once ROOT_DIR . 'app/inc/constants.php'; if (session_id() === '') { session_start(); diff --git a/app/inc/init.php b/app/inc/init.php index 47a7bd739c7556599679afcf4731aab4d5bf7901..cb3694bfbb8f0de98c3ca224098600e024f76dcc 100644 --- a/app/inc/init.php +++ b/app/inc/init.php @@ -25,7 +25,6 @@ use Framadate\Services\LogService; // Autoloading of dependencies with Composer require_once __DIR__ . '/../../vendor/autoload.php'; -require_once __DIR__ . '/../../vendor/o80/i18n/src/shortcuts.php'; if (session_id() === '') { session_start(); diff --git a/composer.json b/composer.json index 8405dc79ac80fb6e2a9044acd0ef6a107eb9b0f6..e29ca9c36c72100f6c524c32479a93e7d7eaa766 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,6 @@ "php": ">=5.6.0", "ext-pdo": "*", "smarty/smarty": "^3.1", - "o80/i18n": "dev-develop", "phpmailer/phpmailer": "~6.0", "ircmaxell/password-compat": "dev-master", "roave/security-advisories": "dev-master", diff --git a/composer.lock b/composer.lock index fd91a7bf723afe3cc8b2a5fa85c63fb91fb1f08c..cc2f2bd7d0d70f1ad25bb5d946fbdd38e26d4c52 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": "e66be74bb56015e4d3bb7b83fd8fc044", + "content-hash": "9726759acaf25655763b7bc70206e571", "packages": [ { "name": "doctrine/annotations", @@ -695,52 +695,6 @@ ], "time": "2017-03-20T21:17:32+00:00" }, - { - "name": "o80/i18n", - "version": "dev-develop", - "source": { - "type": "git", - "url": "https://github.com/olivierperez/o80-i18n.git", - "reference": "8f3fbc7c965559802ed4eda602528a24d641ea15" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/olivierperez/o80-i18n/zipball/8f3fbc7c965559802ed4eda602528a24d641ea15", - "reference": "8f3fbc7c965559802ed4eda602528a24d641ea15", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "o80\\": "src/o80" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache License 2.0" - ], - "authors": [ - { - "name": "Olivier Perez", - "email": "olivier@olivierperez.fr", - "homepage": "http://github.com/olivierperez" - } - ], - "description": "Easy library to manage i18n with PHP.", - "homepage": "https://github.com/olivierperez/o80-i18n", - "keywords": [ - "i18n", - "internationalization", - "php" - ], - "time": "2015-09-21T21:18:45+00:00" - }, { "name": "ocramius/proxy-manager", "version": "1.0.2", @@ -3648,7 +3602,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "o80/i18n": 20, "ircmaxell/password-compat": 20, "roave/security-advisories": 20 },