summaryrefslogtreecommitdiffstats
path: root/tests/Localization
diff options
context:
space:
mode:
authorLucas Michot <lucasmichot@users.noreply.github.com>2017-02-06 23:02:47 +0100
committerGitHub <noreply@github.com>2017-02-06 23:02:47 +0100
commit926aee5ab38c2868816aa760f862a85ad01cb61a (patch)
treedb87de82a70462204a52c5b39d497c054db91a2b /tests/Localization
parentc2c2296f4a6b2b9ff7e1b571d308864facaa2317 (diff)
parentcd8c6d2e8c3d7f90810d3e3983df5e7f9db0c600 (diff)
downloadCarbon-master.zip
Carbon-master.tar.gz
Carbon-master.tar.bz2
Merge pull request #880 from toyamarinyon/masterHEADorigin/masterorigin/HEADmaster
Fixed japanese language file
Diffstat (limited to 'tests/Localization')
-rw-r--r--tests/Localization/JaTest.php38
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/Localization/JaTest.php b/tests/Localization/JaTest.php
index 2444b65..ddf6a79 100644
--- a/tests/Localization/JaTest.php
+++ b/tests/Localization/JaTest.php
@@ -23,57 +23,57 @@ class JaTest extends AbstractTestCase
$scope = $this;
$this->wrapWithNonDstDate(function () use ($scope) {
$d = Carbon::now()->subSecond();
- $scope->assertSame('1 秒 前', $d->diffForHumans());
+ $scope->assertSame('1秒前', $d->diffForHumans());
$d = Carbon::now()->subSeconds(2);
- $scope->assertSame('2 秒 前', $d->diffForHumans());
+ $scope->assertSame('2秒前', $d->diffForHumans());
$d = Carbon::now()->subMinute();
- $scope->assertSame('1 分 前', $d->diffForHumans());
+ $scope->assertSame('1分前', $d->diffForHumans());
$d = Carbon::now()->subMinutes(2);
- $scope->assertSame('2 分 前', $d->diffForHumans());
+ $scope->assertSame('2分前', $d->diffForHumans());
$d = Carbon::now()->subHour();
- $scope->assertSame('1 時間 前', $d->diffForHumans());
+ $scope->assertSame('1時間前', $d->diffForHumans());
$d = Carbon::now()->subHours(2);
- $scope->assertSame('2 時間 前', $d->diffForHumans());
+ $scope->assertSame('2時間前', $d->diffForHumans());
$d = Carbon::now()->subDay();
- $scope->assertSame('1 日 前', $d->diffForHumans());
+ $scope->assertSame('1日前', $d->diffForHumans());
$d = Carbon::now()->subDays(2);
- $scope->assertSame('2 日 前', $d->diffForHumans());
+ $scope->assertSame('2日前', $d->diffForHumans());
$d = Carbon::now()->subWeek();
- $scope->assertSame('1 週間 前', $d->diffForHumans());
+ $scope->assertSame('1週間前', $d->diffForHumans());
$d = Carbon::now()->subWeeks(2);
- $scope->assertSame('2 週間 前', $d->diffForHumans());
+ $scope->assertSame('2週間前', $d->diffForHumans());
$d = Carbon::now()->subMonth();
- $scope->assertSame('1 ヶ月 前', $d->diffForHumans());
+ $scope->assertSame('1ヶ月前', $d->diffForHumans());
$d = Carbon::now()->subMonths(2);
- $scope->assertSame('2 ヶ月 前', $d->diffForHumans());
+ $scope->assertSame('2ヶ月前', $d->diffForHumans());
$d = Carbon::now()->subYear();
- $scope->assertSame('1 年 前', $d->diffForHumans());
+ $scope->assertSame('1年前', $d->diffForHumans());
$d = Carbon::now()->subYears(2);
- $scope->assertSame('2 年 前', $d->diffForHumans());
+ $scope->assertSame('2年前', $d->diffForHumans());
$d = Carbon::now()->addSecond();
- $scope->assertSame('今から 1 秒', $d->diffForHumans());
+ $scope->assertSame('今から1秒', $d->diffForHumans());
$d = Carbon::now()->addSecond();
$d2 = Carbon::now();
- $scope->assertSame('1 秒 後', $d->diffForHumans($d2));
- $scope->assertSame('1 秒 前', $d2->diffForHumans($d));
+ $scope->assertSame('1秒後', $d->diffForHumans($d2));
+ $scope->assertSame('1秒前', $d2->diffForHumans($d));
- $scope->assertSame('1 秒', $d->diffForHumans($d2, true));
- $scope->assertSame('2 秒', $d2->diffForHumans($d->addSecond(), true));
+ $scope->assertSame('1秒', $d->diffForHumans($d2, true));
+ $scope->assertSame('2秒', $d2->diffForHumans($d->addSecond(), true));
});
}
}