Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit 03dc289

Browse files
AmegatronAmegatron
authored
Merge pull request #99 from LaravelRUS/master
Merge from master
2 parents dc891ed + 511fd42 commit 03dc289

24 files changed

+398
-12
lines changed

‎README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Maintainers needed
2+
Sorry, I have not much time supporting this repo. Also I rarely work with Laravel now, so new maintainers are needed.
3+
14
# Localized Carbon
25

36
for **L4** use **1.4** branch
@@ -58,6 +61,7 @@ Current version of Localized Carbon ships with these localizations:
5861
+ Arabic (ar) (no genitive)
5962
+ Japanese (ja) (full)
6063
+ Bengali (bn) (full)
64+
+ Persian (fa) (full)
6165

6266

6367
But it is extendable, so you may write and use your own localization without altering the contents of the package. See [extending Localized Carbon](#extending).
@@ -76,8 +80,8 @@ Next, add package's Service Provider to `app/config/app.php` in `providers` sect
7680
After that you may want to add some Aliases (`aliases` section of the same config):
7781

7882
```
79-
'LocalizedCarbon' => 'Laravelrus\LocalizedCarbon\LocalizedCarbon',
80-
'DiffFormatter' => 'Laravelrus\LocalizedCarbon\DiffFactoryFacade',
83+
'LocalizedCarbon' => Laravelrus\LocalizedCarbon\LocalizedCarbon::class,
84+
'DiffFormatter' => Laravelrus\LocalizedCarbon\DiffFactoryFacade::class,
8185
```
8286

8387
Note that `DiffFormatter` will only be used for extending default localizations. See [extending Localized Carbon](#extending).

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
],
1212
"require": {
1313
"php": ">=5.3.0",
14-
"illuminate/support": ">=4.1.0"
14+
"illuminate/support": ">=5.4.0",
15+
"nesbot/carbon": "^1.24"
1516
},
1617
"autoload": {
1718
"psr-0": {

‎src/Laravelrus/LocalizedCarbon/DiffFormatters/AfDiffFormatter.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php namespace Laravelrus\LocalizedCarbon\DiffFormatters;
2+
3+
class AfDiffFormatter implements DiffFormatterInterface {
4+
5+
public function format($isNow, $isFuture, $delta, $unit) {
6+
$txt = $delta . ' ' . $unit;
7+
$txt .= $delta == 1 ? '' : 's';
8+
9+
if ($isNow) {
10+
$txt .= ($isFuture) ? ' van nou af' : ' terug';
11+
return $txt;
12+
}
13+
14+
$txt .= ($isFuture) ? ' na' : ' voor';
15+
return $txt;
16+
}
17+
18+
}

‎src/Laravelrus/LocalizedCarbon/DiffFormatters/FaDiffFotmatter.php

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
namespace Laravelrus\LocalizedCarbon\DiffFormatters;
3+
class FaDiffFormatter implements DiffFormatterInterface {
4+
public function format($isNow, $isFuture, $delta, $unit) {
5+
$txt = $delta . ' ' . $unit;
6+
if ($isNow) {
7+
$txt .= ($isFuture) ? ' از حالا' : ' گذشته';
8+
return $txt;
9+
}
10+
$txt .= ($isFuture) ? ' بعد' : ' قبل';
11+
return $txt;
12+
}
13+
}

‎src/Laravelrus/LocalizedCarbon/DiffFormatters/ItDiffFormatter.php

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php namespace Laravelrus\LocalizedCarbon\DiffFormatters;
2+
class ItDiffFormatter implements DiffFormatterInterface {
3+
public function format($isNow, $isFuture, $delta, $unit) {
4+
$unitStr = \Lang::choice("localized-carbon::units." . $unit, $delta, array(), 'it');
5+
if($delta == 1){
6+
switch($unit){
7+
case 'hour':
8+
$delta = 'Un\'';
9+
break;
10+
case 'week':
11+
$delta = 'Una';
12+
break;
13+
default:
14+
$delta = 'Un';
15+
break;
16+
}
17+
}
18+
$txt = $delta . ' ' . $unitStr;
19+
if ($isNow) {
20+
if($isFuture){
21+
$pre= 'Tra ';
22+
return $pre . strtolower($txt);
23+
}
24+
else{
25+
$suffix= ' fa';
26+
return $txt . $suffix;
27+
}
28+
}
29+
return $txt .= ($isFuture) ? ' dopo' : ' prima';
30+
}
31+
}

‎src/Laravelrus/LocalizedCarbon/DiffFormatters/RoDiffFormatter.php

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
namespace Laravelrus\LocalizedCarbon\DiffFormatters;
4+
5+
6+
class RoDiffFormatter implements DiffFormatterInterface {
7+
8+
public function format($isNow, $isFuture, $delta, $unit) {
9+
$unitStr = \Lang::choice("localized-carbon::units." . $unit, $delta, array(), 'ro');
10+
11+
if ($isNow) {
12+
$pre = $isFuture ? 'peste ' : 'acum ';
13+
$suffix = '';
14+
15+
switch ($unit) {
16+
case 'second': $deltaInWords = 'o'; break;
17+
case 'minute': $deltaInWords = 'un'; break;
18+
case 'hour': $deltaInWords = 'o'; break;
19+
case 'day': $deltaInWords = 'o'; break;
20+
case 'week': $deltaInWords = 'o'; break;
21+
case 'month': $deltaInWords = 'o'; break;
22+
case 'year': $deltaInWords = 'un'; break;
23+
}
24+
25+
if($delta == 1) {
26+
$delta = $deltaInWords;
27+
$suffix = '';
28+
}
29+
30+
return $pre . $delta . ' ' . $unitStr . $suffix;
31+
} else {
32+
$post = ($isFuture) ? ' înainte' : ' după';
33+
34+
if($delta == 1) {
35+
switch ($unit) {
36+
case 'second': $delta = 'o'; break;
37+
case 'minute': $delta = 'un'; break;
38+
case 'hour': $delta = 'o'; break;
39+
case 'day': $delta = 'o'; break;
40+
case 'week': $delta = 'o'; break;
41+
case 'month': $delta = 'o'; break;
42+
case 'year': $delta = 'un'; break;
43+
}
44+
}
45+
46+
return $delta . ' ' . $unitStr . $post;
47+
}
48+
}
49+
}

‎src/Laravelrus/LocalizedCarbon/DiffFormatters/SvDiffFormatter.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php namespace Laravelrus\LocalizedCarbon\DiffFormatters;
2+
3+
4+
class SvDiffFormatter implements DiffFormatterInterface {
5+
6+
public function format($isNow, $isFuture, $delta, $unit) {
7+
$txt = \Lang::choice("localized-carbon::units." . $unit, $delta, array(), 'sv');
8+
$txt = $delta.' '.$txt;
9+
if ($isNow) {
10+
$txt .= ($isFuture) ? ' från nu' : ' sedan';
11+
return 'för '.$txt;
12+
}
13+
$txt .= ($isFuture) ? ' efter' : ' före';
14+
return 'om '.$txt;
15+
}
16+
}

‎src/Laravelrus/LocalizedCarbon/LocalizedCarbon.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static function determineLanguage() {
1111
return \App::getLocale();
1212
}
1313

14-
public function diffForHumans(Carbon $other = null, $formatter = null) {
14+
public function diffForHumans($other = null, $formatter = null, $short = false, $parts = 1) {
1515
if ($formatter === null) {
1616
$language = self::determineLanguage();
1717
$formatter = DiffFactoryFacade::get($language);

‎src/lang/af/months.php

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
return array(
3+
"januarie" => "Januarie",
4+
"februarie" => "Februarie",
5+
"maart" => "Maart",
6+
"april" => "April",
7+
"mei" => "Mei",
8+
"junie" => "Junie",
9+
"julie" => "Julie",
10+
"augustus" => "Augustus",
11+
"september" => "September",
12+
"oktober" => "Oktober",
13+
"november" => "November",
14+
"december" => "December",
15+
);

‎src/lang/af/units.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
return array(
3+
"second" => "sekonde|sekondes",
4+
"minute" => "minuut|minute",
5+
"hour" => "uur|ure",
6+
"day" => "dag|dae",
7+
"week" => "week|weke",
8+
"month" => "maand|maande",
9+
"year" => "jaar|jare",
10+
);

‎src/lang/ar/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
// Created by : Abdellah Chadidi => https://github.com/chadidi
3+
return array(
4+
"january" => "يناير",
5+
"february" => "فبراير",
6+
"march" => "مارس",
7+
"april" => "أبريل",
8+
"may" => "مايو",
9+
"june" => "يونيو",
10+
"july" => "يوليو",
11+
"august" => "أغسطس",
12+
"september" => "سبتمبر",
13+
"october" => "أكتوبر",
14+
"november" => "نوفمبر",
15+
"december" => "ديسمبر",
16+
);

‎src/lang/ar/units.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
2-
2+
// Created by : Abdellah Chadidi => https://github.com/chadidi
33
return array(
4-
"second" => "ثانية",
5-
"minute" => "[0,10] دقائق|[11,Inf] دقيقة",
6-
"hour" => "[0,10] ساعات|[11,Inf] ساعة",
7-
"day" => "[0,10] أيام|[11,Inf] يوما",
8-
"week" => "[0,10] أسابيع|[11,Inf] أسبوعا",
9-
"month" => "[0,10] أشهر|[11,Inf] شهرا",
10-
"year" => "[0,10] سنوات|[11,Inf] سنة",
4+
"second" => "[0,1] ثَانِيَة|{2} ثَانِيَتَيْن|[3,10]:count ثَوَان|[11,Inf]:count ثَانِيَة",
5+
"minute" => "[0,1] دَقِيقَة|{2} دَقِيقَتَيْن|[3,10]:count دَقَائِق|[11,Inf]:count دَقِيقَة",
6+
"hour" => "[0,1] سَاعَة|{2} سَاعَتَيْن|[3,10]:count سَاعَات|[11,Inf]:count سَاعَة",
7+
"day" => "[0,1] يَوْم|{2} يَوْمَيْن|[3,10]:count أَيَّام|[11,Inf] يَوْم",
8+
"week" => "[0,1] أُسْبُوع|{2} أُسْبُوعَيْن|[3,10]:count أَسَابِيع|[11,Inf]:count أُسْبُوع",
9+
"month" => "[0,1] شَهْرَ|{2} شَهْرَيْن|[3,10]:count أَشْهُر|[11,Inf]:count شَهْرَ",
10+
"year" => "[0,1] سَنَة|{2} سَنَتَيْن|[3,10]:count سَنَوَات|[11,Inf]:count سَنَة",
1111
);

‎src/lang/bg/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return array(
4+
"january" => "Януари",
5+
"february" => "Февруари",
6+
"march" => "Март",
7+
"april" => "Април",
8+
"may" => "Май",
9+
"june" => "Юни",
10+
"july" => "Юли",
11+
"august" => "Август",
12+
"september" => "Септември",
13+
"october" => "Октомври",
14+
"november" => "Ноември",
15+
"december" => "Декември",
16+
);

‎src/lang/fa/months.php

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
return array(
3+
"january" => "ژانویه",
4+
"february" => "فوریه",
5+
"march" => "مارچ",
6+
"april" => "آپریل",
7+
"may" => "می",
8+
"june" => "جون",
9+
"july" => "جولای",
10+
"august" => "آگوست",
11+
"september" => "سپتامبر",
12+
"october" => "اکتبر",
13+
"november" => "نوامبر",
14+
"december" => "دسامبر",
15+
);

‎src/lang/fa/units.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
return array(
3+
"second" => "ثانیه",
4+
"minute" => "دقیقه",
5+
"hour" => "ساعت",
6+
"day" => "روز",
7+
"week" => "هفته",
8+
"month" => "ماه",
9+
"year" => "سال",
10+
);

‎src/lang/fr/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
return array(
3+
'january' => 'Janvier',
4+
'february' => 'Février',
5+
'march' => 'Mars',
6+
'april' => 'Avril',
7+
'may' => 'Mai',
8+
'june' => 'Juin',
9+
'july' => 'Juillet',
10+
'august' => 'Août',
11+
'september' => 'Septembre',
12+
'october' => 'Octobre',
13+
'november' => 'Novembre',
14+
'december' => 'Décembre'
15+
);
16+
?>

‎src/lang/it/months.php

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
return array(
3+
"january" => "Gennaio",
4+
"february" => "Febbraio",
5+
"march" => "Marzo",
6+
"april" => "Aprile",
7+
"may" => "Maggio",
8+
"june" => "Giugno",
9+
"july" => "Luglio",
10+
"august" => "Agosto",
11+
"september" => "Settembre",
12+
"october" => "Ottobre",
13+
"november" => "Novembre",
14+
"december" => "Dicembre",
15+
);

‎src/lang/it/units.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
return array(
3+
"second" => "secondo|secondi",
4+
"minute" => "minuto|minuti",
5+
"hour" => "ora|ore",
6+
"day" => "giorno|giorni",
7+
"week" => "settimana|settimane",
8+
"month" => "mese|mesi",
9+
"year" => "anno|anni",
10+
);

‎src/lang/nl/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return array(
4+
"january" => "januari",
5+
"february" => "februari",
6+
"march" => "maart",
7+
"april" => "april",
8+
"may" => "mei",
9+
"june" => "juni",
10+
"july" => "juli",
11+
"august" => "augustus",
12+
"september" => "september",
13+
"october" => "oktober",
14+
"november" => "november",
15+
"december" => "december",
16+
);

‎src/lang/ro/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return array(
4+
"january" => "Ianuarie",
5+
"february" => "Februarie",
6+
"march" => "Martie",
7+
"april" => "Aprilie",
8+
"may" => "Mai",
9+
"june" => "Iunie",
10+
"july" => "Iulie",
11+
"august" => "August",
12+
"september" => "Septembrie",
13+
"october" => "Octombrie",
14+
"november" => "Noiembrie",
15+
"december" => "Decembrie",
16+
);

‎src/lang/ro/units.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
return array(
4+
"second" => "secundă|secunde|secunde",
5+
"minute" => "minut|minute|minute",
6+
"hour" => "oră|ore|ore",
7+
"day" => "zi|zile|zile",
8+
"week" => "săptămână|săptămâni|săptămâni",
9+
"month" => "lună|luni|luni",
10+
"year" => "an|ani|ani",
11+
);

‎src/lang/sv/months.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return array(
4+
"january" => "Januari",
5+
"february" => "Februari",
6+
"march" => "Mars",
7+
"april" => "April",
8+
"may" => "Maj",
9+
"june" => "Juni",
10+
"july" => "Juli",
11+
"august" => "Augusti",
12+
"september" => "September",
13+
"october" => "Oktober",
14+
"november" => "November",
15+
"december" => "December",
16+
);

0 commit comments

Comments
 (0)