Skip to content

Commit

Permalink
Merge pull request #2167 from kylekatarnls/feature/issue-2150-asturia…
Browse files Browse the repository at this point in the history
…n-plural

🌎 #2150 Fix Asturian plural
  • Loading branch information
kylekatarnls committed Aug 20, 2020
2 parents f85f943 + d43553e commit 870ee2f
Show file tree
Hide file tree
Showing 4 changed files with 639 additions and 228 deletions.
48 changes: 46 additions & 2 deletions src/Carbon/Lang/ast.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,50 @@
*/

/*
* Unknown default region, use the first alphabetically.
* Authors:
* - Jordi Mallach [email protected]
* - Adolfo Jayme-Barrientos (fitojb)
*/
return require __DIR__.'/ast_ES.php';
return array_replace_recursive(require __DIR__.'/es.php', [
'formats' => [
'L' => 'DD/MM/YY',
],
'months' => ['de xineru', 'de febreru', 'de marzu', 'd’abril', 'de mayu', 'de xunu', 'de xunetu', 'd’agostu', 'de setiembre', 'd’ochobre', 'de payares', 'd’avientu'],
'months_short' => ['xin', 'feb', 'mar', 'abr', 'may', 'xun', 'xnt', 'ago', 'set', 'och', 'pay', 'avi'],
'weekdays' => ['domingu', 'llunes', 'martes', 'miércoles', 'xueves', 'vienres', 'sábadu'],
'weekdays_short' => ['dom', 'llu', 'mar', 'mié', 'xue', 'vie', 'sáb'],
'weekdays_min' => ['dom', 'llu', 'mar', 'mié', 'xue', 'vie', 'sáb'],

'year' => ':count añu|:count años',
'y' => ':count añu|:count años',
'a_year' => 'un añu|:count años',

'month' => ':count mes',
'm' => ':count mes',
'a_month' => 'un mes|:count mes',

'week' => ':count selmana|:count selmanes',
'w' => ':count selmana|:count selmanes',
'a_week' => 'una selmana|:count selmanes',

'day' => ':count día|:count díes',
'd' => ':count día|:count díes',
'a_day' => 'un día|:count díes',

'hour' => ':count hora|:count hores',
'h' => ':count hora|:count hores',
'a_hour' => 'una hora|:count hores',

'minute' => ':count minutu|:count minutos',
'min' => ':count minutu|:count minutos',
'a_minute' => 'un minutu|:count minutos',

'second' => ':count segundu|:count segundos',
's' => ':count segundu|:count segundos',
'a_second' => 'un segundu|:count segundos',

'ago' => 'hai :time',
'from_now' => 'en :time',
'after' => ':time dempués',
'before' => ':time enantes',
]);
45 changes: 1 addition & 44 deletions src/Carbon/Lang/ast_ES.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,4 @@
* file that was distributed with this source code.
*/

/*
* Authors:
* - Jordi Mallach [email protected]
*/
return array_replace_recursive(require __DIR__.'/en.php', [
'formats' => [
'L' => 'DD/MM/YY',
],
'months' => ['de xineru', 'de febreru', 'de marzu', 'd’abril', 'de mayu', 'de xunu', 'de xunetu', 'd’agostu', 'de setiembre', 'd’ochobre', 'de payares', 'd’avientu'],
'months_short' => ['xin', 'feb', 'mar', 'abr', 'may', 'xun', 'xnt', 'ago', 'set', 'och', 'pay', 'avi'],
'weekdays' => ['domingu', 'llunes', 'martes', 'miércoles', 'xueves', 'vienres', 'sábadu'],
'weekdays_short' => ['dom', 'llu', 'mar', 'mié', 'xue', 'vie', 'sáb'],
'weekdays_min' => ['dom', 'llu', 'mar', 'mié', 'xue', 'vie', 'sáb'],
'first_day_of_week' => 1,
'day_of_first_week_of_year' => 4,

'year' => ':count añu',
'y' => ':count añu',
'a_year' => ':count añu',

'month' => ':count mes',
'm' => ':count mes',
'a_month' => ':count mes',

'week' => ':count selmana',
'w' => ':count selmana',
'a_week' => ':count selmana',

'day' => ':count día',
'd' => ':count día',
'a_day' => ':count día',

'hour' => ':count hora',
'h' => ':count hora',
'a_hour' => ':count hora',

'minute' => ':count minutu',
'min' => ':count minutu',
'a_minute' => ':count minutu',

'second' => ':count segundu',
's' => ':count segundu',
'a_second' => ':count segundu',
]);
return require __DIR__.'/ast.php';
Loading

0 comments on commit 870ee2f

Please sign in to comment.