update2

2018-08-07 10:42:11 +02:00 · 2018-08-07 10:42:11 +02:00 · 8a69e45efa
commit 8a69e45efa
parent 98419bd18d
4919 changed files with 28311 additions and 224136 deletions
--- a/pfosten/vendor/nesbot/carbon/.php_cs.dist
+++ b/pfosten/vendor/nesbot/carbon/.php_cs.dist
@ -1,57 +0,0 @@
-<?php
-
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
-
-$rules = [
-    '@PSR2' => true,
-    'array_syntax' => [
-        'syntax' => 'long',
-    ],
-    'binary_operator_spaces' => [
-        'align_double_arrow' => false,
-        'align_equals' => false,
-    ],
-    'blank_line_before_return' => true,
-    'cast_spaces' => true,
-    'concat_space' => [
-        'spacing' => 'none',
-    ],
-    'ereg_to_preg' => true,
-    'method_separation' => true,
-    'no_blank_lines_after_phpdoc' => true,
-    'no_extra_consecutive_blank_lines' => true,
-    'no_short_bool_cast' => true,
-    'no_unneeded_control_parentheses' => true,
-    'no_unused_imports' => true,
-    'no_whitespace_in_blank_line' => true,
-    'ordered_imports' => true,
-    'phpdoc_align' => true,
-    'phpdoc_indent' => true,
-    'phpdoc_inline_tag' => true,
-    'phpdoc_no_access' => true,
-    'phpdoc_no_alias_tag' => [
-        'type' => 'var',
-    ],
-    'phpdoc_no_package' => true,
-    'phpdoc_order' => true,
-    'phpdoc_scalar' => true,
-    'phpdoc_separation' => true,
-    'phpdoc_to_comment' => true,
-    'phpdoc_trim' => true,
-    'phpdoc_types' => true,
-    'phpdoc_var_without_name' => true,
-    'self_accessor' => true,
-    'single_quote' => true,
-    'space_after_semicolon' => true,
-    'standardize_not_equals' => true,
-    'ternary_operator_spaces' => true,
-    'trailing_comma_in_multiline_array' => true,
-    'trim_array_spaces' => true,
-    'unary_operator_spaces' => true,
-];
-
-return Config::create()->setRules($rules)
-             ->setFinder(Finder::create()->in(__DIR__))
-             ->setUsingCache(true)
-             ->setRiskyAllowed(true);
--- a/pfosten/vendor/nesbot/carbon/LICENSE
+++ b/pfosten/vendor/nesbot/carbon/LICENSE
--- a/pfosten/vendor/nesbot/carbon/composer.json
+++ b/pfosten/vendor/nesbot/carbon/composer.json
@ -21,16 +21,16 @@
        }
    ],
    "require": {
-        "php": ">=5.3.0",
-        "symfony/translation": "~2.6 || ~3.0"
+        "php": ">=5.3.9",
+        "symfony/translation": "~2.6 || ~3.0 || ~4.0"
    },
    "require-dev": {
        "friendsofphp/php-cs-fixer": "~2",
-        "phpunit/phpunit": "~4.0 || ~5.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.7"
    },
    "autoload": {
        "psr-4": {
-            "Carbon\\": "src/Carbon/"
+            "": "src/"
        }
    },
    "autoload-dev": {
@ -38,17 +38,23 @@
            "Tests\\": "tests/"
        }
    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.23-dev"
-        }
-    },
    "config": {
        "sort-packages": true
    },
    "scripts": {
-        "test": "./vendor/bin/phpunit; ./vendor/bin/php-cs-fixer fix -v --diff --dry-run;",
-        "phpunit": "./vendor/bin/phpunit;",
-        "phpcs": "./vendor/bin/php-cs-fixer fix -v --diff --dry-run;"
+        "test": [
+            "@phpunit",
+            "@phpcs"
+        ],
+        "phpunit": "phpunit --verbose --coverage-clover=coverage.xml",
+        "phpcs": "php-cs-fixer fix -v --diff --dry-run",
+        "phpstan": "phpstan analyse --configuration phpstan.neon --level 3 src tests"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Carbon\\Laravel\\ServiceProvider"
+            ]
+        }
    }
 }
--- a/pfosten/vendor/nesbot/carbon/readme.md
+++ b/pfosten/vendor/nesbot/carbon/readme.md
@ -6,6 +6,7 @@
 [![StyleCI](https://styleci.io/repos/5724990/shield?style=flat)](https://styleci.io/repos/5724990)
 [![codecov.io](https://codecov.io/github/briannesbitt/Carbon/coverage.svg?branch=master)](https://codecov.io/github/briannesbitt/Carbon?branch=master)
 [![PHP-Eye](https://php-eye.com/badge/nesbot/carbon/tested.svg?style=flat)](https://php-eye.com/package/nesbot/carbon)
+[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)

 A simple PHP API extension for DateTime. [http://carbon.nesbot.com](http://carbon.nesbot.com)

@ -16,7 +17,7 @@ printf("Right now is %s", Carbon::now()->toDateTimeString());
 printf("Right now in Vancouver is %s", Carbon::now('America/Vancouver'));  //implicit __toString()
 $tomorrow = Carbon::now()->addDay();
 $lastWeek = Carbon::now()->subWeek();
-$nextSummerOlympics = Carbon::createFromDate(2012)->addYears(4);
+$nextSummerOlympics = Carbon::createFromDate(2016)->addYears(4);

 $officialDate = Carbon::now()->toRfc2822String();

@ -24,13 +25,13 @@ $howOldAmI = Carbon::createFromDate(1975, 5, 21)->age;

 $noonTodayLondonTime = Carbon::createFromTime(12, 0, 0, 'Europe/London');

-$worldWillEnd = Carbon::createFromDate(2012, 12, 21, 'GMT');
+$internetWillBlowUpOn = Carbon::create(2038, 01, 19, 3, 14, 7, 'GMT');

-// Don't really want to die so mock now
+// Don't really want this to happen so mock now
 Carbon::setTestNow(Carbon::createFromDate(2000, 1, 1));

 // comparisons are always done in UTC
-if (Carbon::now()->gte($worldWillEnd)) {
+if (Carbon::now()->gte($internetWillBlowUpOn)) {
    die();
 }

@ -74,6 +75,7 @@ printf("Now: %s", Carbon::now());
 ```

 <a name="install-nocomposer"/>
+
 ### Without Composer

 Why are you not using [composer](http://getcomposer.org/)? Download [Carbon.php](https://github.com/briannesbitt/Carbon/blob/master/src/Carbon/Carbon.php) from the repo and save the file into your project path somewhere.
@ -89,4 +91,4 @@ printf("Now: %s", Carbon::now());

 ## Docs

-[http://carbon.nesbot.com/docs](http://carbon.nesbot.com/docs)
+[http://carbon.nesbot.com/docs](http://carbon.nesbot.com/docs)
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Carbon.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Carbon.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/CarbonInterval.php
@ -11,10 +11,12 @@

 namespace Carbon;

+use Closure;
 use DateInterval;
 use InvalidArgumentException;
-use Symfony\Component\Translation\Loader\ArrayLoader;
-use Symfony\Component\Translation\Translator;
+use ReflectionClass;
+use ReflectionFunction;
+use ReflectionMethod;
 use Symfony\Component\Translation\TranslatorInterface;

 /**
@ -31,6 +33,14 @@ use Symfony\Component\Translation\TranslatorInterface;
 * @property int $seconds Total seconds of the current interval.
 * @property-read int $dayzExcludeWeeks Total days remaining in the final week of the current instance (days % 7).
 * @property-read int $daysExcludeWeeks alias of dayzExcludeWeeks
+ * @property-read float $totalYears Number of years equivalent to the interval.
+ * @property-read float $totalMonths Number of months equivalent to the interval.
+ * @property-read float $totalWeeks Number of weeks equivalent to the interval.
+ * @property-read float $totalDays Number of days equivalent to the interval.
+ * @property-read float $totalDayz Alias for totalDays.
+ * @property-read float $totalHours Number of hours equivalent to the interval.
+ * @property-read float $totalMinutes Number of minutes equivalent to the interval.
+ * @property-read float $totalSeconds Number of seconds equivalent to the interval.
 *
 * @method static CarbonInterval years($years = 1) Create instance specifying a number of years.
 * @method static CarbonInterval year($years = 1) Alias for years()
@ -47,21 +57,21 @@ use Symfony\Component\Translation\TranslatorInterface;
 * @method static CarbonInterval minute($minutes = 1) Alias for minutes()
 * @method static CarbonInterval seconds($seconds = 1) Create instance specifying a number of seconds.
 * @method static CarbonInterval second($seconds = 1) Alias for seconds()
- * @method CarbonInterval years() years($years = 1) Set the years portion of the current interval.
- * @method CarbonInterval year() year($years = 1) Alias for years().
- * @method CarbonInterval months() months($months = 1) Set the months portion of the current interval.
- * @method CarbonInterval month() month($months = 1) Alias for months().
- * @method CarbonInterval weeks() weeks($weeks = 1) Set the weeks portion of the current interval.  Will overwrite dayz value.
- * @method CarbonInterval week() week($weeks = 1) Alias for weeks().
- * @method CarbonInterval days() days($days = 1) Set the days portion of the current interval.
- * @method CarbonInterval dayz() dayz($days = 1) Alias for days().
- * @method CarbonInterval day() day($days = 1) Alias for days().
- * @method CarbonInterval hours() hours($hours = 1) Set the hours portion of the current interval.
- * @method CarbonInterval hour() hour($hours = 1) Alias for hours().
- * @method CarbonInterval minutes() minutes($minutes = 1) Set the minutes portion of the current interval.
- * @method CarbonInterval minute() minute($minutes = 1) Alias for minutes().
- * @method CarbonInterval seconds() seconds($seconds = 1) Set the seconds portion of the current interval.
- * @method CarbonInterval second() second($seconds = 1) Alias for seconds().
+ * @method CarbonInterval years($years = 1) Set the years portion of the current interval.
+ * @method CarbonInterval year($years = 1) Alias for years().
+ * @method CarbonInterval months($months = 1) Set the months portion of the current interval.
+ * @method CarbonInterval month($months = 1) Alias for months().
+ * @method CarbonInterval weeks($weeks = 1) Set the weeks portion of the current interval.  Will overwrite dayz value.
+ * @method CarbonInterval week($weeks = 1) Alias for weeks().
+ * @method CarbonInterval days($days = 1) Set the days portion of the current interval.
+ * @method CarbonInterval dayz($days = 1) Alias for days().
+ * @method CarbonInterval day($days = 1) Alias for days().
+ * @method CarbonInterval hours($hours = 1) Set the hours portion of the current interval.
+ * @method CarbonInterval hour($hours = 1) Alias for hours().
+ * @method CarbonInterval minutes($minutes = 1) Set the minutes portion of the current interval.
+ * @method CarbonInterval minute($minutes = 1) Alias for minutes().
+ * @method CarbonInterval seconds($seconds = 1) Set the seconds portion of the current interval.
+ * @method CarbonInterval second($seconds = 1) Alias for seconds().
 */
 class CarbonInterval extends DateInterval
 {
@ -84,12 +94,77 @@ class CarbonInterval extends DateInterval
     */
    protected static $translator;

+    /**
+     * @var array|null
+     */
+    protected static $cascadeFactors;
+
+    /**
+     * @var array|null
+     */
+    private static $flipCascadeFactors;
+
+    /**
+     * The registered macros.
+     *
+     * @var array
+     */
+    protected static $macros = array();
+
    /**
     * Before PHP 5.4.20/5.5.4 instead of FALSE days will be set to -99999 when the interval instance
-     * was created by DateTime:diff().
+     * was created by DateTime::diff().
     */
    const PHP_DAYS_FALSE = -99999;

+    /**
+     * Mapping of units and factors for cascading.
+     *
+     * Should only be modified by changing the factors or referenced constants.
+     *
+     * @return array
+     */
+    public static function getCascadeFactors()
+    {
+        return static::$cascadeFactors ?: array(
+            'minutes' => array(Carbon::SECONDS_PER_MINUTE, 'seconds'),
+            'hours' => array(Carbon::MINUTES_PER_HOUR, 'minutes'),
+            'dayz' => array(Carbon::HOURS_PER_DAY, 'hours'),
+            'months' => array(Carbon::DAYS_PER_WEEK * Carbon::WEEKS_PER_MONTH, 'dayz'),
+            'years' => array(Carbon::MONTHS_PER_YEAR, 'months'),
+        );
+    }
+
+    private static function standardizeUnit($unit)
+    {
+        $unit = rtrim($unit, 'sz').'s';
+
+        return $unit === 'days' ? 'dayz' : $unit;
+    }
+
+    private static function getFlipCascadeFactors()
+    {
+        if (!self::$flipCascadeFactors) {
+            self::$flipCascadeFactors = array();
+            foreach (static::getCascadeFactors() as $to => $tuple) {
+                list($factor, $from) = $tuple;
+
+                self::$flipCascadeFactors[self::standardizeUnit($from)] = array(self::standardizeUnit($to), $factor);
+            }
+        }
+
+        return self::$flipCascadeFactors;
+    }
+
+    /**
+     * @param array $cascadeFactors
+     */
+    public static function setCascadeFactors(array $cascadeFactors)
+    {
+        self::$flipCascadeFactors = null;
+        static::$cascadeFactors = $cascadeFactors;
+    }
+
    /**
     * Determine if the interval was created via DateTime:diff() or not.
     *
@ -119,32 +194,99 @@ class CarbonInterval extends DateInterval
     */
    public function __construct($years = 1, $months = null, $weeks = null, $days = null, $hours = null, $minutes = null, $seconds = null)
    {
-        $spec = static::PERIOD_PREFIX;
+        $spec = $years;

-        $spec .= $years > 0 ? $years.static::PERIOD_YEARS : '';
-        $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : '';
+        if (!is_string($spec) || floatval($years) || preg_match('/^[0-9.]/', $years)) {
+            $spec = static::PERIOD_PREFIX;

-        $specDays = 0;
-        $specDays += $weeks > 0 ? $weeks * Carbon::DAYS_PER_WEEK : 0;
-        $specDays += $days > 0 ? $days : 0;
+            $spec .= $years > 0 ? $years.static::PERIOD_YEARS : '';
+            $spec .= $months > 0 ? $months.static::PERIOD_MONTHS : '';

-        $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : '';
+            $specDays = 0;
+            $specDays += $weeks > 0 ? $weeks * static::getDaysPerWeek() : 0;
+            $specDays += $days > 0 ? $days : 0;

-        if ($hours > 0 || $minutes > 0 || $seconds > 0) {
-            $spec .= static::PERIOD_TIME_PREFIX;
-            $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : '';
-            $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : '';
-            $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
-        }
+            $spec .= $specDays > 0 ? $specDays.static::PERIOD_DAYS : '';

-        if ($spec === static::PERIOD_PREFIX) {
-            // Allow the zero interval.
-            $spec .= '0'.static::PERIOD_YEARS;
+            if ($hours > 0 || $minutes > 0 || $seconds > 0) {
+                $spec .= static::PERIOD_TIME_PREFIX;
+                $spec .= $hours > 0 ? $hours.static::PERIOD_HOURS : '';
+                $spec .= $minutes > 0 ? $minutes.static::PERIOD_MINUTES : '';
+                $spec .= $seconds > 0 ? $seconds.static::PERIOD_SECONDS : '';
+            }
+
+            if ($spec === static::PERIOD_PREFIX) {
+                // Allow the zero interval.
+                $spec .= '0'.static::PERIOD_YEARS;
+            }
        }

        parent::__construct($spec);
    }

+    /**
+     * Returns the factor for a given source-to-target couple.
+     *
+     * @param string $source
+     * @param string $target
+     *
+     * @return int|null
+     */
+    public static function getFactor($source, $target)
+    {
+        $source = self::standardizeUnit($source);
+        $target = self::standardizeUnit($target);
+        $factors = static::getFlipCascadeFactors();
+        if (isset($factors[$source])) {
+            list($to, $factor) = $factors[$source];
+            if ($to === $target) {
+                return $factor;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns current config for days per week.
+     *
+     * @return int
+     */
+    public static function getDaysPerWeek()
+    {
+        return static::getFactor('dayz', 'weeks') ?: Carbon::DAYS_PER_WEEK;
+    }
+
+    /**
+     * Returns current config for hours per day.
+     *
+     * @return int
+     */
+    public static function getHoursPerDay()
+    {
+        return static::getFactor('hours', 'dayz') ?: Carbon::HOURS_PER_DAY;
+    }
+
+    /**
+     * Returns current config for minutes per hour.
+     *
+     * @return int
+     */
+    public static function getMinutesPerHours()
+    {
+        return static::getFactor('minutes', 'hours') ?: Carbon::MINUTES_PER_HOUR;
+    }
+
+    /**
+     * Returns current config for seconds per minute.
+     *
+     * @return int
+     */
+    public static function getSecondsPerMinutes()
+    {
+        return static::getFactor('seconds', 'minutes') ?: Carbon::SECONDS_PER_MINUTE;
+    }
+
    /**
     * Create a new CarbonInterval instance from specific values.
     * This is an alias for the constructor that allows better fluent
@ -166,6 +308,19 @@ class CarbonInterval extends DateInterval
        return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds);
    }

+    /**
+     * Get a copy of the instance.
+     *
+     * @return static
+     */
+    public function copy()
+    {
+        $date = new static($this->spec());
+        $date->invert = $this->invert;
+
+        return $date;
+    }
+
    /**
     * Provide static helpers to create instances.  Allows CarbonInterval::years(3).
     *
@ -211,6 +366,123 @@ class CarbonInterval extends DateInterval
            case 'second':
                return new static(null, null, null, null, null, null, $arg);
        }
+
+        if (static::hasMacro($name)) {
+            return call_user_func_array(
+                array(new static(0), $name), $args
+            );
+        }
+    }
+
+    /**
+     * Creates a CarbonInterval from string.
+     *
+     * Format:
+     *
+     * Suffix | Unit    | Example | DateInterval expression
+     * -------|---------|---------|------------------------
+     * y      | years   |   1y    | P1Y
+     * mo     | months  |   3mo   | P3M
+     * w      | weeks   |   2w    | P2W
+     * d      | days    |  28d    | P28D
+     * h      | hours   |   4h    | PT4H
+     * m      | minutes |  12m    | PT12M
+     * s      | seconds |  59s    | PT59S
+     *
+     * e. g. `1w 3d 4h 32m 23s` is converted to 10 days 4 hours 32 minutes and 23 seconds.
+     *
+     * Special cases:
+     *  - An empty string will return a zero interval
+     *  - Fractions are allowed for weeks, days, hours and minutes and will be converted
+     *    and rounded to the next smaller value (caution: 0.5w = 4d)
+     *
+     * @param string $intervalDefinition
+     *
+     * @return static
+     */
+    public static function fromString($intervalDefinition)
+    {
+        if (empty($intervalDefinition)) {
+            return new static(0);
+        }
+
+        $years = 0;
+        $months = 0;
+        $weeks = 0;
+        $days = 0;
+        $hours = 0;
+        $minutes = 0;
+        $seconds = 0;
+
+        $pattern = '/(\d+(?:\.\d+)?)\h*([^\d\h]*)/i';
+        preg_match_all($pattern, $intervalDefinition, $parts, PREG_SET_ORDER);
+        while ($match = array_shift($parts)) {
+            list($part, $value, $unit) = $match;
+            $intValue = intval($value);
+            $fraction = floatval($value) - $intValue;
+            switch (strtolower($unit)) {
+                case 'year':
+                case 'years':
+                case 'y':
+                    $years += $intValue;
+                    break;
+
+                case 'month':
+                case 'months':
+                case 'mo':
+                    $months += $intValue;
+                    break;
+
+                case 'week':
+                case 'weeks':
+                case 'w':
+                    $weeks += $intValue;
+                    if ($fraction) {
+                        $parts[] = array(null, $fraction * static::getDaysPerWeek(), 'd');
+                    }
+                    break;
+
+                case 'day':
+                case 'days':
+                case 'd':
+                    $days += $intValue;
+                    if ($fraction) {
+                        $parts[] = array(null, $fraction * static::getHoursPerDay(), 'h');
+                    }
+                    break;
+
+                case 'hour':
+                case 'hours':
+                case 'h':
+                    $hours += $intValue;
+                    if ($fraction) {
+                        $parts[] = array(null, $fraction * static::getMinutesPerHours(), 'm');
+                    }
+                    break;
+
+                case 'minute':
+                case 'minutes':
+                case 'm':
+                    $minutes += $intValue;
+                    if ($fraction) {
+                        $seconds += round($fraction * static::getSecondsPerMinutes());
+                    }
+                    break;
+
+                case 'second':
+                case 'seconds':
+                case 's':
+                    $seconds += $intValue;
+                    break;
+
+                default:
+                    throw new InvalidArgumentException(
+                        sprintf('Invalid part %s in definition %s', $part, $intervalDefinition)
+                    );
+            }
+        }
+
+        return new static($years, $months, $weeks, $days, $hours, $minutes, $seconds);
    }

    /**
@ -220,23 +492,45 @@ class CarbonInterval extends DateInterval
     *
     * @param DateInterval $di
     *
-     * @throws \InvalidArgumentException
-     *
     * @return static
     */
    public static function instance(DateInterval $di)
    {
-        if (static::wasCreatedFromDiff($di)) {
-            throw new InvalidArgumentException('Can not instance a DateInterval object created from DateTime::diff().');
-        }
-
-        $instance = new static($di->y, $di->m, 0, $di->d, $di->h, $di->i, $di->s);
+        $instance = new static(static::getDateIntervalSpec($di));
        $instance->invert = $di->invert;
-        $instance->days = $di->days;

        return $instance;
    }

+    /**
+     * Make a CarbonInterval instance from given variable if possible.
+     *
+     * Always return a new instance. Parse only strings and only these likely to be intervals (skip dates
+     * and recurrences). Throw an exception for invalid format, but otherwise return null.
+     *
+     * @param mixed $var
+     *
+     * @return static|null
+     */
+    public static function make($var)
+    {
+        if ($var instanceof DateInterval) {
+            return static::instance($var);
+        }
+
+        if (is_string($var)) {
+            $var = trim($var);
+
+            if (substr($var, 0, 1) === 'P') {
+                return new static($var);
+            }
+
+            if (preg_match('/^(?:\h*\d+(?:\.\d+)?\h*[a-z]+)+$/i', $var)) {
+                return static::fromString($var);
+            }
+        }
+    }
+
    ///////////////////////////////////////////////////////////////////
    /////////////////////// LOCALIZATION //////////////////////////////
    ///////////////////////////////////////////////////////////////////
@ -249,16 +543,14 @@ class CarbonInterval extends DateInterval
    protected static function translator()
    {
        if (static::$translator === null) {
-            static::$translator = new Translator('en');
-            static::$translator->addLoader('array', new ArrayLoader());
-            static::setLocale('en');
+            static::$translator = Translator::get();
        }

        return static::$translator;
    }

    /**
-     * Get the translator instance in use
+     * Get the translator instance in use.
     *
     * @return \Symfony\Component\Translation\TranslatorInterface
     */
@ -268,7 +560,7 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Set the translator instance to use
+     * Set the translator instance to use.
     *
     * @param TranslatorInterface $translator
     */
@ -278,7 +570,7 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Get the current translator locale
+     * Get the current translator locale.
     *
     * @return string
     */
@ -288,16 +580,13 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Set the current translator locale
+     * Set the current translator locale.
     *
     * @param string $locale
     */
    public static function setLocale($locale)
    {
-        static::translator()->setLocale($locale);
-
-        // Ensure the locale has been loaded.
-        static::translator()->addResource('array', require __DIR__.'/Lang/'.$locale.'.php', $locale);
+        return static::translator()->setLocale($locale) !== false;
    }

    ///////////////////////////////////////////////////////////////////
@ -305,16 +594,20 @@ class CarbonInterval extends DateInterval
    ///////////////////////////////////////////////////////////////////

    /**
-     * Get a part of the CarbonInterval object
+     * Get a part of the CarbonInterval object.
     *
     * @param string $name
     *
     * @throws \InvalidArgumentException
     *
-     * @return int
+     * @return int|float
     */
    public function __get($name)
    {
+        if (substr($name, 0, 5) === 'total') {
+            return $this->total(substr($name, 5));
+        }
+
        switch ($name) {
            case 'years':
                return $this->y;
@ -335,11 +628,11 @@ class CarbonInterval extends DateInterval
                return $this->s;

            case 'weeks':
-                return (int) floor($this->d / Carbon::DAYS_PER_WEEK);
+                return (int) floor($this->d / static::getDaysPerWeek());

            case 'daysExcludeWeeks':
            case 'dayzExcludeWeeks':
-                return $this->d % Carbon::DAYS_PER_WEEK;
+                return $this->d % static::getDaysPerWeek();

            default:
                throw new InvalidArgumentException(sprintf("Unknown getter '%s'", $name));
@ -347,7 +640,7 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Set a part of the CarbonInterval object
+     * Set a part of the CarbonInterval object.
     *
     * @param string $name
     * @param int    $val
@ -366,7 +659,7 @@ class CarbonInterval extends DateInterval
                break;

            case 'weeks':
-                $this->d = $val * Carbon::DAYS_PER_WEEK;
+                $this->d = $val * static::getDaysPerWeek();
                break;

            case 'dayz':
@ -397,11 +690,94 @@ class CarbonInterval extends DateInterval
     */
    public function weeksAndDays($weeks, $days)
    {
-        $this->dayz = ($weeks * Carbon::DAYS_PER_WEEK) + $days;
+        $this->dayz = ($weeks * static::getDaysPerWeek()) + $days;

        return $this;
    }

+    /**
+     * Register a custom macro.
+     *
+     * @param string          $name
+     * @param object|callable $macro
+     *
+     * @return void
+     */
+    public static function macro($name, $macro)
+    {
+        static::$macros[$name] = $macro;
+    }
+
+    /**
+     * Register macros from a mixin object.
+     *
+     * @param object $mixin
+     *
+     * @throws \ReflectionException
+     *
+     * @return void
+     */
+    public static function mixin($mixin)
+    {
+        $reflection = new ReflectionClass($mixin);
+
+        $methods = $reflection->getMethods(
+            ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED
+        );
+
+        foreach ($methods as $method) {
+            $method->setAccessible(true);
+
+            static::macro($method->name, $method->invoke($mixin));
+        }
+    }
+
+    /**
+     * Check if macro is registered.
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public static function hasMacro($name)
+    {
+        return isset(static::$macros[$name]);
+    }
+
+    /**
+     * Call given macro.
+     *
+     * @param string $name
+     * @param array  $parameters
+     *
+     * @return mixed
+     */
+    protected function callMacro($name, $parameters)
+    {
+        $macro = static::$macros[$name];
+
+        $reflection = new ReflectionFunction($macro);
+
+        $reflectionParameters = $reflection->getParameters();
+
+        $expectedCount = count($reflectionParameters);
+        $actualCount = count($parameters);
+
+        if ($expectedCount > $actualCount && $reflectionParameters[$expectedCount - 1]->name === 'self') {
+            for ($i = $actualCount; $i < $expectedCount - 1; $i++) {
+                $parameters[] = $reflectionParameters[$i]->getDefaultValue();
+            }
+
+            $parameters[] = $this;
+        }
+
+        if ($macro instanceof Closure && method_exists($macro, 'bindTo')) {
+            $macro = $macro->bindTo($this, get_class($this));
+        }
+
+        return call_user_func_array($macro, $parameters);
+    }
+
    /**
     * Allow fluent calls on the setters... CarbonInterval::years(3)->months(5)->day().
     *
@ -415,6 +791,10 @@ class CarbonInterval extends DateInterval
     */
    public function __call($name, $args)
    {
+        if (static::hasMacro($name)) {
+            return $this->callMacro($name, $args);
+        }
+
        $arg = count($args) === 0 ? 1 : $args[0];

        switch ($name) {
@ -430,7 +810,7 @@ class CarbonInterval extends DateInterval

            case 'weeks':
            case 'week':
-                $this->dayz = $arg * Carbon::DAYS_PER_WEEK;
+                $this->dayz = $arg * static::getDaysPerWeek();
                break;

            case 'days':
@ -461,24 +841,27 @@ class CarbonInterval extends DateInterval
    /**
     * Get the current interval in a human readable format in the current locale.
     *
+     * @param bool $short (false by default), returns short units if true
+     *
     * @return string
     */
-    public function forHumans()
+    public function forHumans($short = false)
    {
        $periods = array(
-            'year' => $this->years,
-            'month' => $this->months,
-            'week' => $this->weeks,
-            'day' => $this->daysExcludeWeeks,
-            'hour' => $this->hours,
-            'minute' => $this->minutes,
-            'second' => $this->seconds,
+            'year' => array('y', $this->years),
+            'month' => array('m', $this->months),
+            'week' => array('w', $this->weeks),
+            'day' => array('d', $this->daysExcludeWeeks),
+            'hour' => array('h', $this->hours),
+            'minute' => array('min', $this->minutes),
+            'second' => array('s', $this->seconds),
        );

        $parts = array();
-        foreach ($periods as $unit => $count) {
+        foreach ($periods as $unit => $options) {
+            list($shortUnit, $count) = $options;
            if ($count > 0) {
-                array_push($parts, static::translator()->transChoice($unit, $count, array(':count' => $count)));
+                $parts[] = static::translator()->transChoice($short ? $shortUnit : $unit, $count, array(':count' => $count));
            }
        }

@ -496,7 +879,31 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Add the passed interval to the current instance
+     * Convert the interval to a CarbonPeriod.
+     *
+     * @return CarbonPeriod
+     */
+    public function toPeriod()
+    {
+        return CarbonPeriod::createFromArray(
+            array_merge(array($this), func_get_args())
+        );
+    }
+
+    /**
+     * Invert the interval.
+     *
+     * @return $this
+     */
+    public function invert()
+    {
+        $this->invert = $this->invert ? 0 : 1;
+
+        return $this;
+    }
+
+    /**
+     * Add the passed interval to the current instance.
     *
     * @param DateInterval $interval
     *
@ -521,22 +928,48 @@ class CarbonInterval extends DateInterval
    }

    /**
-     * Get the interval_spec string
+     * Multiply current instance given number of times
+     *
+     * @param float $factor
+     *
+     * @return $this
+     */
+    public function times($factor)
+    {
+        if ($factor < 0) {
+            $this->invert = $this->invert ? 0 : 1;
+            $factor = -$factor;
+        }
+
+        $this->years = (int) round($this->years * $factor);
+        $this->months = (int) round($this->months * $factor);
+        $this->dayz = (int) round($this->dayz * $factor);
+        $this->hours = (int) round($this->hours * $factor);
+        $this->minutes = (int) round($this->minutes * $factor);
+        $this->seconds = (int) round($this->seconds * $factor);
+
+        return $this;
+    }
+
+    /**
+     * Get the interval_spec string of a date interval.
+     *
+     * @param DateInterval $interval
     *
     * @return string
     */
-    public function spec()
+    public static function getDateIntervalSpec(DateInterval $interval)
    {
        $date = array_filter(array(
-            static::PERIOD_YEARS => $this->y,
-            static::PERIOD_MONTHS => $this->m,
-            static::PERIOD_DAYS => $this->d,
+            static::PERIOD_YEARS => $interval->y,
+            static::PERIOD_MONTHS => $interval->m,
+            static::PERIOD_DAYS => $interval->d,
        ));

        $time = array_filter(array(
-            static::PERIOD_HOURS => $this->h,
-            static::PERIOD_MINUTES => $this->i,
-            static::PERIOD_SECONDS => $this->s,
+            static::PERIOD_HOURS => $interval->h,
+            static::PERIOD_MINUTES => $interval->i,
+            static::PERIOD_SECONDS => $interval->s,
        ));

        $specString = static::PERIOD_PREFIX;
@ -554,4 +987,144 @@ class CarbonInterval extends DateInterval

        return $specString === static::PERIOD_PREFIX ? 'PT0S' : $specString;
    }
+
+    /**
+     * Get the interval_spec string.
+     *
+     * @return string
+     */
+    public function spec()
+    {
+        return static::getDateIntervalSpec($this);
+    }
+
+    /**
+     * Comparing 2 date intervals.
+     *
+     * @param DateInterval $a
+     * @param DateInterval $b
+     *
+     * @return int
+     */
+    public static function compareDateIntervals(DateInterval $a, DateInterval $b)
+    {
+        $current = Carbon::now();
+        $passed = $current->copy()->add($b);
+        $current->add($a);
+
+        if ($current < $passed) {
+            return -1;
+        }
+        if ($current > $passed) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Comparing with passed interval.
+     *
+     * @param DateInterval $interval
+     *
+     * @return int
+     */
+    public function compare(DateInterval $interval)
+    {
+        return static::compareDateIntervals($this, $interval);
+    }
+
+    /**
+     * Convert overflowed values into bigger units.
+     *
+     * @return $this
+     */
+    public function cascade()
+    {
+        foreach (static::getFlipCascadeFactors() as $source => $cascade) {
+            list($target, $factor) = $cascade;
+
+            if ($source === 'dayz' && $target === 'weeks') {
+                continue;
+            }
+
+            $value = $this->$source;
+            $this->$source = $modulo = $value % $factor;
+            $this->$target += ($value - $modulo) / $factor;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get amount of given unit equivalent to the interval.
+     *
+     * @param string $unit
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return float
+     */
+    public function total($unit)
+    {
+        $realUnit = $unit = strtolower($unit);
+
+        if (in_array($unit, array('days', 'weeks'))) {
+            $realUnit = 'dayz';
+        } elseif (!in_array($unit, array('seconds', 'minutes', 'hours', 'dayz', 'months', 'years'))) {
+            throw new InvalidArgumentException("Unknown unit '$unit'.");
+        }
+
+        $result = 0;
+        $cumulativeFactor = 0;
+        $unitFound = false;
+
+        foreach (static::getFlipCascadeFactors() as $source => $cascade) {
+            list($target, $factor) = $cascade;
+
+            if ($source === $realUnit) {
+                $unitFound = true;
+                $result += $this->$source;
+                $cumulativeFactor = 1;
+            }
+
+            if ($factor === false) {
+                if ($unitFound) {
+                    break;
+                }
+
+                $result = 0;
+                $cumulativeFactor = 0;
+
+                continue;
+            }
+
+            if ($target === $realUnit) {
+                $unitFound = true;
+            }
+
+            if ($cumulativeFactor) {
+                $cumulativeFactor *= $factor;
+                $result += $this->$target * $cumulativeFactor;
+
+                continue;
+            }
+
+            $result = ($result + $this->$source) / $factor;
+        }
+
+        if (isset($target) && !$cumulativeFactor) {
+            $result += $this->$target;
+        }
+
+        if (!$unitFound) {
+            throw new \InvalidArgumentException("Unit $unit have no configuration to get total from other units.");
+        }
+
+        if ($unit === 'weeks') {
+            return $result / static::getDaysPerWeek();
+        }
+
+        return $result;
+    }
 }
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/af.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/af.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 jaar|:count jare',
-    'y' => '1 jaar|:count jare',
-    'month' => '1 maand|:count maande',
-    'm' => '1 maand|:count maande',
-    'week' => '1 week|:count weke',
-    'w' => '1 week|:count weke',
-    'day' => '1 dag|:count dae',
-    'd' => '1 dag|:count dae',
-    'hour' => '1 uur|:count ure',
-    'h' => '1 uur|:count ure',
-    'minute' => '1 minuut|:count minute',
-    'min' => '1 minuut|:count minute',
-    'second' => '1 sekond|:count sekondes',
-    's' => '1 sekond|:count sekondes',
+    'year' => ':count jaar|:count jare',
+    'y' => ':count jaar|:count jare',
+    'month' => ':count maand|:count maande',
+    'm' => ':count maand|:count maande',
+    'week' => ':count week|:count weke',
+    'w' => ':count week|:count weke',
+    'day' => ':count dag|:count dae',
+    'd' => ':count dag|:count dae',
+    'hour' => ':count uur|:count ure',
+    'h' => ':count uur|:count ure',
+    'minute' => ':count minuut|:count minute',
+    'min' => ':count minuut|:count minute',
+    'second' => ':count sekond|:count sekondes',
+    's' => ':count sekond|:count sekondes',
    'ago' => ':time terug',
    'from_now' => ':time van nou af',
    'after' => ':time na',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ar.php
@ -14,8 +14,8 @@ return array(
    'y' => '{0}سنة|{1}سنة|{2}سنتين|[3,10]:count سنوات|[11,Inf]:count سنة',
    'month' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر',
    'm' => '{0}شهر|{1} شهر|{2}شهرين|[3,10]:count أشهر|[11,Inf]:count شهر',
-    'week' => '{0}إسبوع|{1}إسبوع|{2}إسبوعين|[3,10]:count أسابيع|[11,Inf]:count إسبوع',
-    'w' => '{0}إسبوع|{1}إسبوع|{2}إسبوعين|[3,10]:count أسابيع|[11,Inf]:count إسبوع',
+    'week' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع',
+    'w' => '{0}أسبوع|{1}أسبوع|{2}أسبوعين|[3,10]:count أسابيع|[11,Inf]:count أسبوع',
    'day' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم',
    'd' => '{0}يوم|{1}يوم|{2}يومين|[3,10]:count أيام|[11,Inf] يوم',
    'hour' => '{0}ساعة|{1}ساعة|{2}ساعتين|[3,10]:count ساعات|[11,Inf]:count ساعة',
@ -25,7 +25,7 @@ return array(
    'second' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية',
    's' => '{0}ثانية|{1}ثانية|{2}ثانيتين|[3,10]:count ثوان|[11,Inf]:count ثانية',
    'ago' => 'منذ :time',
-    'from_now' => 'من الآن :time',
+    'from_now' => ':time من الآن',
    'after' => 'بعد :time',
    'before' => 'قبل :time',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/az.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/az.php
@ -24,8 +24,8 @@ return array(
    'min' => ':count dəqiqə',
    'second' => ':count saniyə',
    's' => ':count saniyə',
-    'ago' => ':time öncə',
+    'ago' => ':time əvvəl',
    'from_now' => ':time sonra',
    'after' => ':time sonra',
-    'before' => ':time öncə',
+    'before' => ':time əvvəl',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/bg.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/bg.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 година|:count години',
-    'y' => '1 година|:count години',
-    'month' => '1 месец|:count месеца',
-    'm' => '1 месец|:count месеца',
-    'week' => '1 седмица|:count седмици',
-    'w' => '1 седмица|:count седмици',
-    'day' => '1 ден|:count дни',
-    'd' => '1 ден|:count дни',
-    'hour' => '1 час|:count часа',
-    'h' => '1 час|:count часа',
-    'minute' => '1 минута|:count минути',
-    'm' => '1 минута|:count минути',
-    'second' => '1 секунда|:count секунди',
-    's' => '1 секунда|:count секунди',
+    'year' => ':count година|:count години',
+    'y' => ':count година|:count години',
+    'month' => ':count месец|:count месеца',
+    'm' => ':count месец|:count месеца',
+    'week' => ':count седмица|:count седмици',
+    'w' => ':count седмица|:count седмици',
+    'day' => ':count ден|:count дни',
+    'd' => ':count ден|:count дни',
+    'hour' => ':count час|:count часа',
+    'h' => ':count час|:count часа',
+    'minute' => ':count минута|:count минути',
+    'min' => ':count минута|:count минути',
+    'second' => ':count секунда|:count секунди',
+    's' => ':count секунда|:count секунди',
    'ago' => 'преди :time',
    'from_now' => ':time от сега',
    'after' => 'след :time',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/bn.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ca.php
@ -10,22 +10,31 @@
 */

 return array(
-    'year' => '1 any|:count anys',
-    'y' => '1 any|:count anys',
-    'month' => '1 mes|:count mesos',
-    'm' => '1 mes|:count mesos',
-    'week' => '1 setmana|:count setmanes',
-    'w' => '1 setmana|:count setmanes',
-    'day' => '1 dia|:count dies',
-    'd' => '1 dia|:count dies',
-    'hour' => '1 hora|:count hores',
-    'h' => '1 hora|:count hores',
-    'minute' => '1 minut|:count minuts',
-    'min' => '1 minut|:count minuts',
-    'second' => '1 segon|:count segons',
-    's' => '1 segon|:count segons',
+    'year' => ':count any|:count anys',
+    'y' => ':count any|:count anys',
+    'month' => ':count mes|:count mesos',
+    'm' => ':count mes|:count mesos',
+    'week' => ':count setmana|:count setmanes',
+    'w' => ':count setmana|:count setmanes',
+    'day' => ':count dia|:count dies',
+    'd' => ':count dia|:count dies',
+    'hour' => ':count hora|:count hores',
+    'h' => ':count hora|:count hores',
+    'minute' => ':count minut|:count minuts',
+    'min' => ':count minut|:count minuts',
+    'second' => ':count segon|:count segons',
+    's' => ':count segon|:count segons',
    'ago' => 'fa :time',
    'from_now' => 'dins de :time',
    'after' => ':time després',
    'before' => ':time abans',
+    'diff_now' => 'ara mateix',
+    'diff_yesterday' => 'ahir',
+    'diff_tomorrow' => 'demà',
+    'diff_before_yesterday' => "abans d'ahir",
+    'diff_after_tomorrow' => 'demà passat',
+    'period_recurrences' => ':count cop|:count cops',
+    'period_interval' => 'cada :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'fins a :date',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/cs.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/cs.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 rok|:count roky|:count let',
-    'y' => '1 rok|:count roky|:count let',
-    'month' => '1 měsíc|:count měsíce|:count měsíců',
-    'm' => '1 měsíc|:count měsíce|:count měsíců',
-    'week' => '1 týden|:count týdny|:count týdnů',
-    'w' => '1 týden|:count týdny|:count týdnů',
-    'day' => '1 den|:count dny|:count dní',
-    'd' => '1 den|:count dny|:count dní',
-    'hour' => '1 hodinu|:count hodiny|:count hodin',
-    'h' => '1 hodinu|:count hodiny|:count hodin',
-    'minute' => '1 minutu|:count minuty|:count minut',
-    'min' => '1 minutu|:count minuty|:count minut',
-    'second' => '1 sekundu|:count sekundy|:count sekund',
-    's' => '1 sekundu|:count sekundy|:count sekund',
+    'year' => ':count rok|:count roky|:count let',
+    'y' => ':count rok|:count roky|:count let',
+    'month' => ':count měsíc|:count měsíce|:count měsíců',
+    'm' => ':count měsíc|:count měsíce|:count měsíců',
+    'week' => ':count týden|:count týdny|:count týdnů',
+    'w' => ':count týden|:count týdny|:count týdnů',
+    'day' => ':count den|:count dny|:count dní',
+    'd' => ':count den|:count dny|:count dní',
+    'hour' => ':count hodinu|:count hodiny|:count hodin',
+    'h' => ':count hodinu|:count hodiny|:count hodin',
+    'minute' => ':count minutu|:count minuty|:count minut',
+    'min' => ':count minutu|:count minuty|:count minut',
+    'second' => ':count sekundu|:count sekundy|:count sekund',
+    's' => ':count sekundu|:count sekundy|:count sekund',
    'ago' => ':time nazpět',
    'from_now' => 'za :time',
    'after' => ':time později',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/da.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/da.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 år|:count år',
-    'y' => '1 år|:count år',
-    'month' => '1 måned|:count måneder',
-    'm' => '1 måned|:count måneder',
-    'week' => '1 uge|:count uger',
-    'w' => '1 uge|:count uger',
-    'day' => '1 dag|:count dage',
-    'd' => '1 dag|:count dage',
-    'hour' => '1 time|:count timer',
-    'h' => '1 time|:count timer',
-    'minute' => '1 minut|:count minutter',
-    'min' => '1 minut|:count minutter',
-    'second' => '1 sekund|:count sekunder',
-    's' => '1 sekund|:count sekunder',
+    'year' => ':count år|:count år',
+    'y' => ':count år|:count år',
+    'month' => ':count måned|:count måneder',
+    'm' => ':count måned|:count måneder',
+    'week' => ':count uge|:count uger',
+    'w' => ':count uge|:count uger',
+    'day' => ':count dag|:count dage',
+    'd' => ':count dag|:count dage',
+    'hour' => ':count time|:count timer',
+    'h' => ':count time|:count timer',
+    'minute' => ':count minut|:count minutter',
+    'min' => ':count minut|:count minutter',
+    'second' => ':count sekund|:count sekunder',
+    's' => ':count sekund|:count sekunder',
    'ago' => ':time siden',
    'from_now' => 'om :time',
    'after' => ':time efter',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/de.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/de.php
@ -10,31 +10,37 @@
 */

 return array(
-    'year' => '1 Jahr|:count Jahre',
-    'y' => '1J|:countJ',
-    'month' => '1 Monat|:count Monate',
-    'm' => '1Mon|:countMon',
-    'week' => '1 Woche|:count Wochen',
-    'w' => '1Wo|:countWo',
-    'day' => '1 Tag|:count Tage',
-    'd' => '1Tg|:countTg',
-    'hour' => '1 Stunde|:count Stunden',
-    'h' => '1Std|:countStd',
-    'minute' => '1 Minute|:count Minuten',
-    'min' => '1Min|:countMin',
-    'second' => '1 Sekunde|:count Sekunden',
-    's' => '1Sek|:countSek',
+    'year' => ':count Jahr|:count Jahre',
+    'y' => ':countJ|:countJ',
+    'month' => ':count Monat|:count Monate',
+    'm' => ':countMon|:countMon',
+    'week' => ':count Woche|:count Wochen',
+    'w' => ':countWo|:countWo',
+    'day' => ':count Tag|:count Tage',
+    'd' => ':countTg|:countTg',
+    'hour' => ':count Stunde|:count Stunden',
+    'h' => ':countStd|:countStd',
+    'minute' => ':count Minute|:count Minuten',
+    'min' => ':countMin|:countMin',
+    'second' => ':count Sekunde|:count Sekunden',
+    's' => ':countSek|:countSek',
    'ago' => 'vor :time',
    'from_now' => 'in :time',
    'after' => ':time später',
    'before' => ':time zuvor',

-    'year_from_now' => '1 Jahr|:count Jahren',
-    'month_from_now' => '1 Monat|:count Monaten',
-    'week_from_now' => '1 Woche|:count Wochen',
-    'day_from_now' => '1 Tag|:count Tagen',
-    'year_ago' => '1 Jahr|:count Jahren',
-    'month_ago' => '1 Monat|:count Monaten',
-    'week_ago' => '1 Woche|:count Wochen',
-    'day_ago' => '1 Tag|:count Tagen',
+    'year_from_now' => ':count Jahr|:count Jahren',
+    'month_from_now' => ':count Monat|:count Monaten',
+    'week_from_now' => ':count Woche|:count Wochen',
+    'day_from_now' => ':count Tag|:count Tagen',
+    'year_ago' => ':count Jahr|:count Jahren',
+    'month_ago' => ':count Monat|:count Monaten',
+    'week_ago' => ':count Woche|:count Wochen',
+    'day_ago' => ':count Tag|:count Tagen',
+
+    'diff_now' => 'Gerade eben',
+    'diff_yesterday' => 'Gestern',
+    'diff_tomorrow' => 'Heute',
+    'diff_before_yesterday' => 'Vorgestern',
+    'diff_after_tomorrow' => 'Übermorgen',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/el.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/el.php
@ -10,22 +10,22 @@
 */

 return array(
-    'year' => '1 χρόνος|:count χρόνια',
-    'y' => '1 χρόνος|:count χρόνια',
-    'month' => '1 μήνας|:count μήνες',
-    'm' => '1 μήνας|:count μήνες',
-    'week' => '1 εβδομάδα|:count εβδομάδες',
-    'w' => '1 εβδομάδα|:count εβδομάδες',
-    'day' => '1 μέρα|:count μέρες',
-    'd' => '1 μέρα|:count μέρες',
-    'hour' => '1 ώρα|:count ώρες',
-    'h' => '1 ώρα|:count ώρες',
-    'minute' => '1 λεπτό|:count λεπτά',
-    'min' => '1 λεπτό|:count λεπτά',
-    'second' => '1 δευτερόλεπτο|:count δευτερόλεπτα',
-    's' => '1 δευτερόλεπτο|:count δευτερόλεπτα',
-    'ago' => 'πρίν απο :time',
-    'from_now' => 'σε :time απο τώρα',
+    'year' => ':count χρόνος|:count χρόνια',
+    'y' => ':count χρόνος|:count χρόνια',
+    'month' => ':count μήνας|:count μήνες',
+    'm' => ':count μήνας|:count μήνες',
+    'week' => ':count εβδομάδα|:count εβδομάδες',
+    'w' => ':count εβδομάδα|:count εβδομάδες',
+    'day' => ':count μέρα|:count μέρες',
+    'd' => ':count μέρα|:count μέρες',
+    'hour' => ':count ώρα|:count ώρες',
+    'h' => ':count ώρα|:count ώρες',
+    'minute' => ':count λεπτό|:count λεπτά',
+    'min' => ':count λεπτό|:count λεπτά',
+    'second' => ':count δευτερόλεπτο|:count δευτερόλεπτα',
+    's' => ':count δευτερόλεπτο|:count δευτερόλεπτα',
+    'ago' => 'πριν από :time',
+    'from_now' => 'σε :time από τώρα',
    'after' => ':time μετά',
-    'before' => ':time πρίν',
+    'before' => ':time πριν',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/en.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/en.php
@ -10,22 +10,31 @@
 */

 return array(
-    'year' => '1 year|:count years',
-    'y' => '1yr|:countyrs',
-    'month' => '1 month|:count months',
-    'm' => '1mo|:countmos',
-    'week' => '1 week|:count weeks',
-    'w' => '1w|:countw',
-    'day' => '1 day|:count days',
-    'd' => '1d|:countd',
-    'hour' => '1 hour|:count hours',
-    'h' => '1h|:counth',
-    'minute' => '1 minute|:count minutes',
-    'min' => '1m|:countm',
-    'second' => '1 second|:count seconds',
-    's' => '1s|:counts',
+    'year' => ':count year|:count years',
+    'y' => ':countyr|:countyrs',
+    'month' => ':count month|:count months',
+    'm' => ':countmo|:countmos',
+    'week' => ':count week|:count weeks',
+    'w' => ':countw|:countw',
+    'day' => ':count day|:count days',
+    'd' => ':countd|:countd',
+    'hour' => ':count hour|:count hours',
+    'h' => ':counth|:counth',
+    'minute' => ':count minute|:count minutes',
+    'min' => ':countm|:countm',
+    'second' => ':count second|:count seconds',
+    's' => ':counts|:counts',
    'ago' => ':time ago',
    'from_now' => ':time from now',
    'after' => ':time after',
    'before' => ':time before',
+    'diff_now' => 'just now',
+    'diff_yesterday' => 'yesterday',
+    'diff_tomorrow' => 'tomorrow',
+    'diff_before_yesterday' => 'before yesterday',
+    'diff_after_tomorrow' => 'after tomorrow',
+    'period_recurrences' => 'once|:count times',
+    'period_interval' => 'every :interval',
+    'period_start_date' => 'from :date',
+    'period_end_date' => 'to :date',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/eo.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/eo.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 jaro|:count jaroj',
-    'y' => '1 jaro|:count jaroj',
-    'month' => '1 monato|:count monatoj',
-    'm' => '1 monato|:count monatoj',
-    'week' => '1 semajno|:count semajnoj',
-    'w' => '1 semajno|:count semajnoj',
-    'day' => '1 tago|:count tagoj',
-    'd' => '1 tago|:count tagoj',
-    'hour' => '1 horo|:count horoj',
-    'h' => '1 horo|:count horoj',
-    'minute' => '1 minuto|:count minutoj',
-    'min' => '1 minuto|:count minutoj',
-    'second' => '1 sekundo|:count sekundoj',
-    's' => '1 sekundo|:count sekundoj',
+    'year' => ':count jaro|:count jaroj',
+    'y' => ':count jaro|:count jaroj',
+    'month' => ':count monato|:count monatoj',
+    'm' => ':count monato|:count monatoj',
+    'week' => ':count semajno|:count semajnoj',
+    'w' => ':count semajno|:count semajnoj',
+    'day' => ':count tago|:count tagoj',
+    'd' => ':count tago|:count tagoj',
+    'hour' => ':count horo|:count horoj',
+    'h' => ':count horo|:count horoj',
+    'minute' => ':count minuto|:count minutoj',
+    'min' => ':count minuto|:count minutoj',
+    'second' => ':count sekundo|:count sekundoj',
+    's' => ':count sekundo|:count sekundoj',
    'ago' => 'antaŭ :time',
    'from_now' => 'je :time',
    'after' => ':time poste',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/es.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/es.php
@ -10,22 +10,27 @@
 */

 return array(
-    'year' => '1 año|:count años',
-    'y' => '1 año|:count años',
-    'month' => '1 mes|:count meses',
-    'm' => '1 mes|:count meses',
-    'week' => '1 semana|:count semanas',
-    'w' => '1 semana|:count semanas',
-    'day' => '1 día|:count días',
-    'd' => '1 día|:count días',
-    'hour' => '1 hora|:count horas',
-    'h' => '1 hora|:count horas',
-    'minute' => '1 minuto|:count minutos',
-    'min' => '1 minuto|:count minutos',
-    'second' => '1 segundo|:count segundos',
-    's' => '1 segundo|:count segundos',
+    'year' => ':count año|:count años',
+    'y' => ':count año|:count años',
+    'month' => ':count mes|:count meses',
+    'm' => ':count mes|:count meses',
+    'week' => ':count semana|:count semanas',
+    'w' => ':count semana|:count semanas',
+    'day' => ':count día|:count días',
+    'd' => ':count día|:count días',
+    'hour' => ':count hora|:count horas',
+    'h' => ':count hora|:count horas',
+    'minute' => ':count minuto|:count minutos',
+    'min' => ':count minuto|:count minutos',
+    'second' => ':count segundo|:count segundos',
+    's' => ':count segundo|:count segundos',
    'ago' => 'hace :time',
    'from_now' => 'dentro de :time',
    'after' => ':time después',
    'before' => ':time antes',
+    'diff_now' => 'ahora mismo',
+    'diff_yesterday' => 'ayer',
+    'diff_tomorrow' => 'mañana',
+    'diff_before_yesterday' => 'anteayer',
+    'diff_after_tomorrow' => 'pasado mañana',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/et.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/et.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 aasta|:count aastat',
-    'y' => '1 aasta|:count aastat',
-    'month' => '1 kuu|:count kuud',
-    'm' => '1 kuu|:count kuud',
-    'week' => '1 nädal|:count nädalat',
-    'w' => '1 nädal|:count nädalat',
-    'day' => '1 päev|:count päeva',
-    'd' => '1 päev|:count päeva',
-    'hour' => '1 tund|:count tundi',
-    'h' => '1 tund|:count tundi',
-    'minute' => '1 minut|:count minutit',
-    'min' => '1 minut|:count minutit',
-    'second' => '1 sekund|:count sekundit',
-    's' => '1 sekund|:count sekundit',
+    'year' => ':count aasta|:count aastat',
+    'y' => ':count aasta|:count aastat',
+    'month' => ':count kuu|:count kuud',
+    'm' => ':count kuu|:count kuud',
+    'week' => ':count nädal|:count nädalat',
+    'w' => ':count nädal|:count nädalat',
+    'day' => ':count päev|:count päeva',
+    'd' => ':count päev|:count päeva',
+    'hour' => ':count tund|:count tundi',
+    'h' => ':count tund|:count tundi',
+    'minute' => ':count minut|:count minutit',
+    'min' => ':count minut|:count minutit',
+    'second' => ':count sekund|:count sekundit',
+    's' => ':count sekund|:count sekundit',
    'ago' => ':time tagasi',
    'from_now' => ':time pärast',
    'after' => ':time pärast',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/eu.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/eu.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fa.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fa.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fi.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 vuosi|:count vuotta',
-    'y' => '1 vuosi|:count vuotta',
-    'month' => '1 kuukausi|:count kuukautta',
-    'm' => '1 kuukausi|:count kuukautta',
-    'week' => '1 viikko|:count viikkoa',
-    'w' => '1 viikko|:count viikkoa',
-    'day' => '1 päivä|:count päivää',
-    'd' => '1 päivä|:count päivää',
-    'hour' => '1 tunti|:count tuntia',
-    'h' => '1 tunti|:count tuntia',
-    'minute' => '1 minuutti|:count minuuttia',
-    'min' => '1 minuutti|:count minuuttia',
-    'second' => '1 sekunti|:count sekuntia',
-    's' => '1 sekunti|:count sekuntia',
+    'year' => ':count vuosi|:count vuotta',
+    'y' => ':count vuosi|:count vuotta',
+    'month' => ':count kuukausi|:count kuukautta',
+    'm' => ':count kuukausi|:count kuukautta',
+    'week' => ':count viikko|:count viikkoa',
+    'w' => ':count viikko|:count viikkoa',
+    'day' => ':count päivä|:count päivää',
+    'd' => ':count päivä|:count päivää',
+    'hour' => ':count tunti|:count tuntia',
+    'h' => ':count tunti|:count tuntia',
+    'minute' => ':count minuutti|:count minuuttia',
+    'min' => ':count minuutti|:count minuuttia',
+    'second' => ':count sekunti|:count sekuntia',
+    's' => ':count sekunti|:count sekuntia',
    'ago' => ':time sitten',
    'from_now' => ':time tästä hetkestä',
    'after' => ':time sen jälkeen',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fo.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fo.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 ár|:count ár',
-    'y' => '1 ár|:count ár',
-    'month' => '1 mánaður|:count mánaðir',
-    'm' => '1 mánaður|:count mánaðir',
-    'week' => '1 vika|:count vikur',
-    'w' => '1 vika|:count vikur',
-    'day' => '1 dag|:count dagar',
-    'd' => '1 dag|:count dagar',
-    'hour' => '1 tími|:count tímar',
-    'h' => '1 tími|:count tímar',
-    'minute' => '1 minutt|:count minuttir',
-    'min' => '1 minutt|:count minuttir',
-    'second' => '1 sekund|:count sekundir',
-    's' => '1 sekund|:count sekundir',
+    'year' => ':count ár|:count ár',
+    'y' => ':count ár|:count ár',
+    'month' => ':count mánaður|:count mánaðir',
+    'm' => ':count mánaður|:count mánaðir',
+    'week' => ':count vika|:count vikur',
+    'w' => ':count vika|:count vikur',
+    'day' => ':count dag|:count dagar',
+    'd' => ':count dag|:count dagar',
+    'hour' => ':count tími|:count tímar',
+    'h' => ':count tími|:count tímar',
+    'minute' => ':count minutt|:count minuttir',
+    'min' => ':count minutt|:count minuttir',
+    'second' => ':count sekund|:count sekundir',
+    's' => ':count sekund|:count sekundir',
    'ago' => ':time síðan',
    'from_now' => 'um :time',
    'after' => ':time aftaná',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/fr.php
@ -10,22 +10,31 @@
 */

 return array(
-    'year' => '1 an|:count ans',
-    'y' => '1 an|:count ans',
+    'year' => ':count an|:count ans',
+    'y' => ':count an|:count ans',
    'month' => ':count mois',
    'm' => ':count mois',
-    'week' => '1 semaine|:count semaines',
-    'w' => '1 semaine|:count semaines',
-    'day' => '1 jour|:count jours',
-    'd' => '1 jour|:count jours',
-    'hour' => '1 heure|:count heures',
-    'h' => '1 heure|:count heures',
-    'minute' => '1 minute|:count minutes',
-    'min' => '1 minute|:count minutes',
-    'second' => '1 seconde|:count secondes',
-    's' => '1 seconde|:count secondes',
+    'week' => ':count semaine|:count semaines',
+    'w' => ':count sem.',
+    'day' => ':count jour|:count jours',
+    'd' => ':count j.',
+    'hour' => ':count heure|:count heures',
+    'h' => ':count h.',
+    'minute' => ':count minute|:count minutes',
+    'min' => ':count min.',
+    'second' => ':count seconde|:count secondes',
+    's' => ':count sec.',
    'ago' => 'il y a :time',
    'from_now' => 'dans :time',
    'after' => ':time après',
    'before' => ':time avant',
+    'diff_now' => "à l'instant",
+    'diff_yesterday' => 'hier',
+    'diff_tomorrow' => 'demain',
+    'diff_before_yesterday' => 'avant-hier',
+    'diff_after_tomorrow' => 'après-demain',
+    'period_recurrences' => ':count fois',
+    'period_interval' => 'tous les :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'à :date',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/gl.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/gl.php
@ -10,13 +10,13 @@
 */

 return array(
-    'year' => '1 ano|:count anos',
-    'month' => '1 mes|:count meses',
-    'week' => '1 semana|:count semanas',
-    'day' => '1 día|:count días',
-    'hour' => '1 hora|:count horas',
-    'minute' => '1 minuto|:count minutos',
-    'second' => '1 segundo|:count segundos',
+    'year' => ':count ano|:count anos',
+    'month' => ':count mes|:count meses',
+    'week' => ':count semana|:count semanas',
+    'day' => ':count día|:count días',
+    'hour' => ':count hora|:count horas',
+    'minute' => ':count minuto|:count minutos',
+    'second' => ':count segundo|:count segundos',
    'ago' => 'fai :time',
    'from_now' => 'dentro de :time',
    'after' => ':time despois',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/he.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/he.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hr.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hr.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hu.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hy.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/hy.php
@ -11,21 +11,21 @@

 return array(
    'year' => ':count տարի',
-    'y' => ':count տարի',
+    'y' => ':countտ',
    'month' => ':count ամիս',
-    'm' => ':count ամիս',
+    'm' => ':countամ',
    'week' => ':count շաբաթ',
-    'w' => ':count շաբաթ',
+    'w' => ':countշ',
    'day' => ':count օր',
-    'd' => ':count օր',
+    'd' => ':countօր',
    'hour' => ':count ժամ',
-    'h' => ':count ժամ',
+    'h' => ':countժ',
    'minute' => ':count րոպե',
-    'min' => ':count րոպե',
-    'second' => ':count վայրկյան',
-    's' => ':count վայրկյան',
+    'min' => ':countր',
+    'second' => ':count վարկյան',
+    's' => ':countվրկ',
    'ago' => ':time առաջ',
-    'from_now' => ':time հետո',
+    'from_now' => ':time ներկա պահից',
    'after' => ':time հետո',
    'before' => ':time առաջ',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/id.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/id.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/it.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/it.php
@ -10,22 +10,27 @@
 */

 return array(
-    'year' => '1 anno|:count anni',
-    'y' => '1 anno|:count anni',
-    'month' => '1 mese|:count mesi',
-    'm' => '1 mese|:count mesi',
-    'week' => '1 settimana|:count settimane',
-    'w' => '1 settimana|:count settimane',
-    'day' => '1 giorno|:count giorni',
-    'd' => '1 giorno|:count giorni',
-    'hour' => '1 ora|:count ore',
-    'h' => '1 ora|:count ore',
-    'minute' => '1 minuto|:count minuti',
-    'min' => '1 minuto|:count minuti',
-    'second' => '1 secondo|:count secondi',
-    's' => '1 secondo|:count secondi',
+    'year' => ':count anno|:count anni',
+    'y' => ':count anno|:count anni',
+    'month' => ':count mese|:count mesi',
+    'm' => ':count mese|:count mesi',
+    'week' => ':count settimana|:count settimane',
+    'w' => ':count settimana|:count settimane',
+    'day' => ':count giorno|:count giorni',
+    'd' => ':count giorno|:count giorni',
+    'hour' => ':count ora|:count ore',
+    'h' => ':count ora|:count ore',
+    'minute' => ':count minuto|:count minuti',
+    'min' => ':count minuto|:count minuti',
+    'second' => ':count secondo|:count secondi',
+    's' => ':count secondo|:count secondi',
    'ago' => ':time fa',
-    'from_now' => ':time da adesso',
+    'from_now' => 'tra :time',
    'after' => ':time dopo',
    'before' => ':time prima',
+    'diff_now' => 'proprio ora',
+    'diff_yesterday' => 'ieri',
+    'diff_tomorrow' => 'domani',
+    'diff_before_yesterday' => "l'altro ieri",
+    'diff_after_tomorrow' => 'dopodomani',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ja.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ja.php
@ -10,22 +10,22 @@
 */

 return array(
-    'year' => ':count 年',
-    'y' => ':count 年',
-    'month' => ':count ヶ月',
-    'm' => ':count ヶ月',
-    'week' => ':count 週間',
-    'w' => ':count 週間',
-    'day' => ':count 日',
-    'd' => ':count 日',
-    'hour' => ':count 時間',
-    'h' => ':count 時間',
-    'minute' => ':count 分',
-    'min' => ':count 分',
-    'second' => ':count 秒',
-    's' => ':count 秒',
-    'ago' => ':time 前',
-    'from_now' => '今から :time',
-    'after' => ':time 後',
-    'before' => ':time 前',
+    'year' => ':count年',
+    'y' => ':count年',
+    'month' => ':countヶ月',
+    'm' => ':countヶ月',
+    'week' => ':count週間',
+    'w' => ':count週間',
+    'day' => ':count日',
+    'd' => ':count日',
+    'hour' => ':count時間',
+    'h' => ':count時間',
+    'minute' => ':count分',
+    'min' => ':count分',
+    'second' => ':count秒',
+    's' => ':count秒',
+    'ago' => ':time前',
+    'from_now' => '今から:time',
+    'after' => ':time後',
+    'before' => ':time前',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ka.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ka.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/km.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/km.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ko.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ko.php
@ -26,6 +26,6 @@ return array(
    's' => ':count 초',
    'ago' => ':time 전',
    'from_now' => ':time 후',
-    'after' => ':time 뒤',
-    'before' => ':time 앞',
+    'after' => ':time 이후',
+    'before' => ':time 이전',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/lt.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/lt.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/lv.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/lv.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/mk.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/mk.php
@ -10,13 +10,13 @@
 */

 return array(
-    'year' => '1 година|:count години',
-    'month' => '1 месец|:count месеци',
-    'week' => '1 седмица|:count седмици',
-    'day' => '1 ден|:count дена',
-    'hour' => '1 час|:count часа',
-    'minute' => '1 минута|:count минути',
-    'second' => '1 секунда|:count секунди',
+    'year' => ':count година|:count години',
+    'month' => ':count месец|:count месеци',
+    'week' => ':count седмица|:count седмици',
+    'day' => ':count ден|:count дена',
+    'hour' => ':count час|:count часа',
+    'minute' => ':count минута|:count минути',
+    'second' => ':count секунда|:count секунди',
    'ago' => 'пред :time',
    'from_now' => ':time од сега',
    'after' => 'по :time',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ms.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ms.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/nl.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/nl.php
@ -12,20 +12,25 @@
 return array(
    'year' => ':count jaar',
    'y' => ':count jaar',
-    'month' => '1 maand|:count maanden',
-    'm' => '1 maand|:count maanden',
-    'week' => '1 week|:count weken',
-    'w' => '1 week|:count weken',
-    'day' => '1 dag|:count dagen',
-    'd' => '1 dag|:count dagen',
+    'month' => ':count maand|:count maanden',
+    'm' => ':count maand|:count maanden',
+    'week' => ':count week|:count weken',
+    'w' => ':count week|:count weken',
+    'day' => ':count dag|:count dagen',
+    'd' => ':count dag|:count dagen',
    'hour' => ':count uur',
    'h' => ':count uur',
-    'minute' => '1 minuut|:count minuten',
-    'min' => '1 minuut|:count minuten',
-    'second' => '1 seconde|:count seconden',
-    's' => '1 seconde|:count seconden',
+    'minute' => ':count minuut|:count minuten',
+    'min' => ':count minuut|:count minuten',
+    'second' => ':count seconde|:count seconden',
+    's' => ':count seconde|:count seconden',
    'ago' => ':time geleden',
    'from_now' => 'over :time',
    'after' => ':time later',
    'before' => ':time eerder',
+    'diff_now' => 'nu',
+    'diff_yesterday' => 'gisteren',
+    'diff_tomorrow' => 'morgen',
+    'diff_after_tomorrow' => 'overmorgen',
+    'diff_before_yesterday' => 'eergisteren',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/no.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/no.php
@ -10,22 +10,27 @@
 */

 return array(
-    'year' => '1 år|:count år',
-    'y' => '1 år|:count år',
-    'month' => '1 måned|:count måneder',
-    'm' => '1 måned|:count måneder',
-    'week' => '1 uke|:count uker',
-    'w' => '1 uke|:count uker',
-    'day' => '1 dag|:count dager',
-    'd' => '1 dag|:count dager',
-    'hour' => '1 time|:count timer',
-    'h' => '1 time|:count timer',
-    'minute' => '1 minutt|:count minutter',
-    'min' => '1 minutt|:count minutter',
-    'second' => '1 sekund|:count sekunder',
-    's' => '1 sekund|:count sekunder',
+    'year' => ':count år|:count år',
+    'y' => ':count år|:count år',
+    'month' => ':count måned|:count måneder',
+    'm' => ':count måned|:count måneder',
+    'week' => ':count uke|:count uker',
+    'w' => ':count uke|:count uker',
+    'day' => ':count dag|:count dager',
+    'd' => ':count dag|:count dager',
+    'hour' => ':count time|:count timer',
+    'h' => ':count time|:count timer',
+    'minute' => ':count minutt|:count minutter',
+    'min' => ':count minutt|:count minutter',
+    'second' => ':count sekund|:count sekunder',
+    's' => ':count sekund|:count sekunder',
    'ago' => ':time siden',
    'from_now' => 'om :time',
    'after' => ':time etter',
    'before' => ':time før',
+    'diff_now' => 'akkurat nå',
+    'diff_yesterday' => 'i går',
+    'diff_tomorrow' => 'i morgen',
+    'diff_before_yesterday' => 'i forgårs',
+    'diff_after_tomorrow' => 'i overmorgen',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pl.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pl.php
@ -10,22 +10,27 @@
 */

 return array(
-    'year' => '1 rok|:count lata|:count lat',
-    'y' => '1 rok|:count lata|:count lat',
-    'month' => '1 miesiąc|:count miesiące|:count miesięcy',
-    'm' => '1 miesiąc|:count miesiące|:count miesięcy',
-    'week' => '1 tydzień|:count tygodnie|:count tygodni',
-    'w' => '1 tydzień|:count tygodnie|:count tygodni',
-    'day' => '1 dzień|:count dni|:count dni',
-    'd' => '1 dzień|:count dni|:count dni',
-    'hour' => '1 godzina|:count godziny|:count godzin',
-    'h' => '1 godzina|:count godziny|:count godzin',
-    'minute' => '1 minuta|:count minuty|:count minut',
-    'min' => '1 minuta|:count minuty|:count minut',
-    'second' => '1 sekunda|:count sekundy|:count sekund',
-    's' => '1 sekunda|:count sekundy|:count sekund',
+    'year' => ':count rok|:count lata|:count lat',
+    'y' => ':countr|:countl',
+    'month' => ':count miesiąc|:count miesiące|:count miesięcy',
+    'm' => ':countmies',
+    'week' => ':count tydzień|:count tygodnie|:count tygodni',
+    'w' => ':counttyg',
+    'day' => ':count dzień|:count dni|:count dni',
+    'd' => ':countd',
+    'hour' => ':count godzina|:count godziny|:count godzin',
+    'h' => ':countg',
+    'minute' => ':count minuta|:count minuty|:count minut',
+    'min' => ':countm',
+    'second' => ':count sekunda|:count sekundy|:count sekund',
+    's' => ':counts',
    'ago' => ':time temu',
    'from_now' => ':time od teraz',
-    'after' => ':time przed',
-    'before' => ':time po',
+    'after' => ':time po',
+    'before' => ':time przed',
+    'diff_now' => 'przed chwilą',
+    'diff_yesterday' => 'wczoraj',
+    'diff_tomorrow' => 'jutro',
+    'diff_before_yesterday' => 'przedwczoraj',
+    'diff_after_tomorrow' => 'pojutrze',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pt.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pt.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 ano|:count anos',
-    'y' => '1 ano|:count anos',
-    'month' => '1 mês|:count meses',
-    'm' => '1 mês|:count meses',
-    'week' => '1 semana|:count semanas',
-    'w' => '1 semana|:count semanas',
-    'day' => '1 dia|:count dias',
-    'd' => '1 dia|:count dias',
-    'hour' => '1 hora|:count horas',
-    'h' => '1 hora|:count horas',
-    'minute' => '1 minuto|:count minutos',
-    'min' => '1 minuto|:count minutos',
-    'second' => '1 segundo|:count segundos',
-    's' => '1 segundo|:count segundos',
+    'year' => ':count ano|:count anos',
+    'y' => ':count ano|:count anos',
+    'month' => ':count mês|:count meses',
+    'm' => ':count mês|:count meses',
+    'week' => ':count semana|:count semanas',
+    'w' => ':count semana|:count semanas',
+    'day' => ':count dia|:count dias',
+    'd' => ':count dia|:count dias',
+    'hour' => ':count hora|:count horas',
+    'h' => ':count hora|:count horas',
+    'minute' => ':count minuto|:count minutos',
+    'min' => ':count minuto|:count minutos',
+    'second' => ':count segundo|:count segundos',
+    's' => ':count segundo|:count segundos',
    'ago' => ':time atrás',
    'from_now' => 'em :time',
    'after' => ':time depois',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/pt_BR.php
@ -10,22 +10,31 @@
 */

 return array(
-    'year' => '1 ano|:count anos',
-    'y' => '1 ano|:count anos',
-    'month' => '1 mês|:count meses',
-    'm' => '1 mês|:count meses',
-    'week' => '1 semana|:count semanas',
-    'w' => '1 semana|:count semanas',
-    'day' => '1 dia|:count dias',
-    'd' => '1 dia|:count dias',
-    'hour' => '1 hora|:count horas',
-    'h' => '1 hora|:count horas',
-    'minute' => '1 minuto|:count minutos',
-    'min' => '1 minuto|:count minutos',
-    'second' => '1 segundo|:count segundos',
-    's' => '1 segundo|:count segundos',
+    'year' => ':count ano|:count anos',
+    'y' => ':counta|:counta',
+    'month' => ':count mês|:count meses',
+    'm' => ':countm|:countm',
+    'week' => ':count semana|:count semanas',
+    'w' => ':countsem|:countsem',
+    'day' => ':count dia|:count dias',
+    'd' => ':countd|:countd',
+    'hour' => ':count hora|:count horas',
+    'h' => ':counth|:counth',
+    'minute' => ':count minuto|:count minutos',
+    'min' => ':countmin|:countmin',
+    'second' => ':count segundo|:count segundos',
+    's' => ':counts|:counts',
    'ago' => 'há :time',
    'from_now' => 'em :time',
    'after' => 'após :time',
    'before' => ':time atrás',
+    'diff_now' => 'agora',
+    'diff_yesterday' => 'ontem',
+    'diff_tomorrow' => 'amanhã',
+    'diff_before_yesterday' => 'anteontem',
+    'diff_after_tomorrow' => 'depois de amanhã',
+    'period_recurrences' => 'uma|:count vez',
+    'period_interval' => 'toda :interval',
+    'period_start_date' => 'de :date',
+    'period_end_date' => 'até :date',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ro.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ro.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sk.php
@ -26,6 +26,13 @@ return array(
    's' => 'sekundu|:count sekundy|:count sekúnd',
    'ago' => 'pred :time',
    'from_now' => 'za :time',
-    'after' => ':time neskôr',
+    'after' => 'o :time neskôr',
    'before' => ':time predtým',
+    'year_ago' => 'rokom|:count rokmi|:count rokmi',
+    'month_ago' => 'mesiacom|:count mesiacmi|:count mesiacmi',
+    'week_ago' => 'týždňom|:count týždňami|:count týždňami',
+    'day_ago' => 'dňom|:count dňami|:count dňami',
+    'hour_ago' => 'hodinou|:count hodinami|:count hodinami',
+    'minute_ago' => 'minútou|:count minútami|:count minútami',
+    'second_ago' => 'sekundou|:count sekundami|:count sekundami',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sl.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sl.php
@ -35,4 +35,9 @@ return array(
    'from_now' => 'čez :time',
    'after' => 'čez :time',
    'before' => 'pred :time',
+    'diff_now' => 'ravnokar',
+    'diff_yesterday' => 'včeraj',
+    'diff_tomorrow' => 'jutri',
+    'diff_before_yesterday' => 'predvčerajšnjim',
+    'diff_after_tomorrow' => 'pojutrišnjem',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sq.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sq.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 vit|:count vjet',
-    'y' => '1 vit|:count vjet',
-    'month' => '1 muaj|:count muaj',
-    'm' => '1 muaj|:count muaj',
-    'week' => '1 javë|:count javë',
-    'w' => '1 javë|:count javë',
-    'day' => '1 ditë|:count ditë',
-    'd' => '1 ditë|:count ditë',
-    'hour' => '1 orë|:count orë',
-    'h' => '1 orë|:count orë',
-    'minute' => '1 minutë|:count minuta',
-    'min' => '1 minutë|:count minuta',
-    'second' => '1 sekondë|:count sekonda',
-    's' => '1 sekondë|:count sekonda',
+    'year' => ':count vit|:count vjet',
+    'y' => ':count vit|:count vjet',
+    'month' => ':count muaj|:count muaj',
+    'm' => ':count muaj|:count muaj',
+    'week' => ':count javë|:count javë',
+    'w' => ':count javë|:count javë',
+    'day' => ':count ditë|:count ditë',
+    'd' => ':count ditë|:count ditë',
+    'hour' => ':count orë|:count orë',
+    'h' => ':count orë|:count orë',
+    'minute' => ':count minutë|:count minuta',
+    'min' => ':count minutë|:count minuta',
+    'second' => ':count sekondë|:count sekonda',
+    's' => ':count sekondë|:count sekonda',
    'ago' => ':time më parë',
    'from_now' => ':time nga tani',
    'after' => ':time pas',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr.php
@ -28,4 +28,10 @@ return array(
    'from_now' => ':time od sada',
    'after' => 'nakon :time',
    'before' => 'pre :time',
+
+    'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+    'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
+
+    'week_from_now' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja',
+    'week_ago' => '{1} :count nedelju|{2,3,4} :count nedelje|[5,Inf[ :count nedelja',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_Cyrl_ME.php
@ -35,4 +35,9 @@ return array(
    'week_from_now' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља',
    'week_ago' => '{1} :count недјељу|{2,3,4} :count недјеље|[5,Inf[ :count недјеља',

+    'diff_now' => 'управо сада',
+    'diff_yesterday' => 'јуче',
+    'diff_tomorrow' => 'сутра',
+    'diff_before_yesterday' => 'прекјуче',
+    'diff_after_tomorrow' => 'прекосјутра',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_Latn_ME.php
@ -35,4 +35,9 @@ return array(
    'week_from_now' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',
    'week_ago' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',

+    'diff_now' => 'upravo sada',
+    'diff_yesterday' => 'juče',
+    'diff_tomorrow' => 'sutra',
+    'diff_before_yesterday' => 'prekjuče',
+    'diff_after_tomorrow' => 'preksutra',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sr_ME.php
@ -9,30 +9,4 @@
 * file that was distributed with this source code.
 */

-return array(
-    'year' => '{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count godine|[0,Inf[ :count godina',
-    'y' => ':count g.',
-    'month' => '{1} :count mjesec|{2,3,4}:count mjeseca|[5,Inf[ :count mjeseci',
-    'm' => ':count mj.',
-    'week' => '{1} :count nedjelja|{2,3,4}:count nedjelje|[5,Inf[ :count nedjelja',
-    'w' => ':count ned.',
-    'day' => '{1,21,31} :count dan|[2,Inf[ :count dana',
-    'd' => ':count d.',
-    'hour' => '{1,21} :count sat|{2,3,4,22,23,24}:count sata|[5,Inf[ :count sati',
-    'h' => ':count č.',
-    'minute' => '{1,21,31,41,51} :count minut|[2,Inf[ :count minuta',
-    'min' => ':count min.',
-    'second' => '{1,21,31,41,51} :count sekund|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54}:count sekunde|[5,Inf[:count sekundi',
-    's' => ':count sek.',
-    'ago' => 'prije :time',
-    'from_now' => 'za :time',
-    'after' => ':time nakon',
-    'before' => ':time prije',
-
-    'year_from_now' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
-    'year_ago' => '{1,21,31,41,51} :count godinu|{2,3,4,22,23,24,32,33,34,42,43,44,52,53,54} :count godine|[5,Inf[ :count godina',
-
-    'week_from_now' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',
-    'week_ago' => '{1} :count nedjelju|{2,3,4} :count nedjelje|[5,Inf[ :count nedjelja',
-
-);
+return require __DIR__.'/sr_Latn_ME.php';
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sv.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/sv.php
@ -10,20 +10,20 @@
 */

 return array(
-    'year' => '1 år|:count år',
-    'y' => '1 år|:count år',
-    'month' => '1 månad|:count månader',
-    'm' => '1 månad|:count månader',
-    'week' => '1 vecka|:count veckor',
-    'w' => '1 vecka|:count veckor',
-    'day' => '1 dag|:count dagar',
-    'd' => '1 dag|:count dagar',
-    'hour' => '1 timme|:count timmar',
-    'h' => '1 timme|:count timmar',
-    'minute' => '1 minut|:count minuter',
-    'min' => '1 minut|:count minuter',
-    'second' => '1 sekund|:count sekunder',
-    's' => '1 sekund|:count sekunder',
+    'year' => ':count år|:count år',
+    'y' => ':count år|:count år',
+    'month' => ':count månad|:count månader',
+    'm' => ':count månad|:count månader',
+    'week' => ':count vecka|:count veckor',
+    'w' => ':count vecka|:count veckor',
+    'day' => ':count dag|:count dagar',
+    'd' => ':count dag|:count dagar',
+    'hour' => ':count timme|:count timmar',
+    'h' => ':count timme|:count timmar',
+    'minute' => ':count minut|:count minuter',
+    'min' => ':count minut|:count minuter',
+    'second' => ':count sekund|:count sekunder',
+    's' => ':count sekund|:count sekunder',
    'ago' => ':time sedan',
    'from_now' => 'om :time',
    'after' => ':time efter',
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/th.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/th.php
@ -10,22 +10,22 @@
 */

 return array(
-    'year' => '1 ปี|:count ปี',
-    'y' => '1 ปี|:count ปี',
-    'month' => '1 เดือน|:count เดือน',
-    'm' => '1 เดือน|:count เดือน',
-    'week' => '1 สัปดาห์|:count สัปดาห์',
-    'w' => '1 สัปดาห์|:count สัปดาห์',
-    'day' => '1 วัน|:count วัน',
-    'd' => '1 วัน|:count วัน',
-    'hour' => '1 ชั่วโมง|:count ชั่วโมง',
-    'h' => '1 ชั่วโมง|:count ชั่วโมง',
-    'minute' => '1 นาที|:count นาที',
-    'min' => '1 นาที|:count นาที',
-    'second' => '1 วินาที|:count วินาที',
-    's' => '1 วินาที|:count วินาที',
-    'ago' => ':time ที่แล้ว',
-    'from_now' => ':time จากนี้',
-    'after' => 'หลัง:time',
-    'before' => 'ก่อน:time',
+    'year' => ':count ปี',
+    'y' => ':count ปี',
+    'month' => ':count เดือน',
+    'm' => ':count เดือน',
+    'week' => ':count สัปดาห์',
+    'w' => ':count สัปดาห์',
+    'day' => ':count วัน',
+    'd' => ':count วัน',
+    'hour' => ':count ชั่วโมง',
+    'h' => ':count ชั่วโมง',
+    'minute' => ':count นาที',
+    'min' => ':count นาที',
+    'second' => ':count วินาที',
+    's' => ':count วินาที',
+    'ago' => ':timeที่แล้ว',
+    'from_now' => ':timeต่อจากนี้',
+    'after' => ':timeหลังจากนี้',
+    'before' => ':timeก่อน',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/tr.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/tr.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/uk.php
@ -24,8 +24,17 @@ return array(
    'min' => ':count хвилину|:count хвилини|:count хвилин',
    'second' => ':count секунду|:count секунди|:count секунд',
    's' => ':count секунду|:count секунди|:count секунд',
-    'ago' => ':time назад',
+    'ago' => ':time тому',
    'from_now' => 'через :time',
    'after' => ':time після',
    'before' => ':time до',
+    'diff_now' => 'щойно',
+    'diff_yesterday' => 'вчора',
+    'diff_tomorrow' => 'завтра',
+    'diff_before_yesterday' => 'позавчора',
+    'diff_after_tomorrow' => 'післязавтра',
+    'period_recurrences' => 'один раз|:count рази|:count разів',
+    'period_interval' => 'кожні :interval',
+    'period_start_date' => 'з :date',
+    'period_end_date' => 'до :date',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ur.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/ur.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/uz.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/uz.php
@ -10,22 +10,22 @@
 */

 return array(
-    'year' => ':count yil|:count yil|:count yil',
-    'y' => ':count yil|:count yil|:count yil',
-    'month' => ':count oy|:count oy|:count oylar',
-    'm' => ':count oy|:count oy|:count oylar',
-    'week' => ':count hafta|:count hafta|:count hafta',
-    'w' => ':count hafta|:count hafta|:count hafta',
-    'day' => ':count kun|:count kun|:count kun',
-    'd' => ':count kun|:count kun|:count kun',
-    'hour' => ':count soat|:count soat|:count soat',
-    'h' => ':count soat|:count soat|:count soat',
-    'minute' => ':count minut|:count minut|:count minut',
-    'min' => ':count minut|:count minut|:count minut',
-    'second' => ':count sekund|:count sekund|:count sekund',
-    's' => ':count sekund|:count sekund|:count sekund',
+    'year' => ':count yil',
+    'y' => ':count yil',
+    'month' => ':count oy',
+    'm' => ':count oy',
+    'week' => ':count hafta',
+    'w' => ':count hafta',
+    'day' => ':count kun',
+    'd' => ':count kun',
+    'hour' => ':count soat',
+    'h' => ':count soat',
+    'minute' => ':count daqiqa',
+    'min' => ':count daq',
+    'second' => ':count soniya',
+    's' => ':count s',
    'ago' => ':time avval',
-    'from_now' => ':time keyin',
+    'from_now' => ':time dan keyin',
    'after' => ':time keyin',
    'before' => ':time oldin',
 );
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/vi.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/vi.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/zh.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/zh.php
--- a/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php
+++ b/pfosten/vendor/nesbot/carbon/src/Carbon/Lang/zh_TW.php
@ -10,22 +10,22 @@
 */

 return array(
-    'year' => ':count 年',
-    'y' => ':count 年',
-    'month' => ':count 月',
-    'm' => ':count 月',
-    'week' => ':count 周',
-    'w' => ':count 周',
-    'day' => ':count 天',
-    'd' => ':count 天',
-    'hour' => ':count 小時',
-    'h' => ':count 小時',
-    'minute' => ':count 分鐘',
-    'min' => ':count 分鐘',
-    'second' => ':count 秒',
-    's' => ':count 秒',
+    'year' => ':count年',
+    'y' => ':count年',
+    'month' => ':count月',
+    'm' => ':count月',
+    'week' => ':count週',
+    'w' => ':count週',
+    'day' => ':count天',
+    'd' => ':count天',
+    'hour' => ':count小時',
+    'h' => ':count小時',
+    'minute' => ':count分鐘',
+    'min' => ':count分鐘',
+    'second' => ':count秒',
+    's' => ':count秒',
    'ago' => ':time前',
-    'from_now' => '距現在 :time',
+    'from_now' => '距現在:time',
    'after' => ':time後',
    'before' => ':time前',
 );