Merge pull request #1617 from Alkarex/may_abbreviation

May abbreviation

12 files changed, 59 insertions, 48 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07aa74848..8137ea9dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 	* New command `./cli/update-user` to update user settings [#1600](https://github.com/FreshRSS/FreshRSS/issues/1600)
 * I18n
 	* Korean [#1578](https://github.com/FreshRSS/FreshRSS/pull/1578)
+	* Fix month abbreviations [#1560](https://github.com/FreshRSS/FreshRSS/issues/1560)
 * Bug fixing
 	* PHP 7.1 compatibility for the API [#1584](https://github.com/FreshRSS/FreshRSS/issues/1584), [#1594](https://github.com/FreshRSS/FreshRSS/pull/1594)
 	* Fix API compatibility bug between PostgreSQL and EasyRSS [#1603](https://github.com/FreshRSS/FreshRSS/pull/1603)
diff --git a/app/Models/StatsDAO.php b/app/Models/StatsDAO.php
index 2ce4f2944..67ada73f7 100644
--- a/app/Models/StatsDAO.php
+++ b/app/Models/StatsDAO.php
@@ -364,7 +364,7 @@ SQL;
 			'feb',
 			'mar',
 			'apr',
-			'may',
+			'may_',
 			'jun',
 			'jul',
 			'aug',
diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 475cca29c..f891f3f1d 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -79,7 +79,8 @@ return array(
 		'last_year' => 'Minulý rok',
 		'mar' => 'bře',
 		'march' => 'Bře',
-		'may' => 'Kvě',
+		'may_' => 'Kvě',
+		'may' => 'Květen',
 		'mon' => 'Po',
 		'month' => 'měsíce',
 		'nov' => 'lis',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index ff58ea64b..dccf38383 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => 'Letztes Jahr',
 		'mar' => 'Mär',
 		'march' => 'März',
+		'may_' => 'Mai',
 		'may' => 'Mai',
 		'mon' => 'Mo',
 		'month' => 'Monat(en)',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 541ff394b..0173b832f 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -54,41 +54,42 @@ return array(
 		'Nov' => '\\N\\o\\v\\e\\m\\b\\e\\r',
 		'Oct' => '\\O\\c\\t\\o\\b\\e\\r',
 		'Sep' => '\\S\\e\\p\\t\\e\\m\\b\\e\\r',
-		'apr' => 'apr',
-		'april' => 'Apr',
-		'aug' => 'aug',
-		'august' => 'Aug',
+		'apr' => 'Apr.',
+		'april' => 'April',
+		'aug' => 'Aug.',
+		'august' => 'August',
 		'before_yesterday' => 'Before yesterday',
-		'dec' => 'dec',
-		'december' => 'Dec',
-		'feb' => 'feb',
-		'february' => 'Feb',
+		'dec' => 'Dec.',
+		'december' => 'December',
+		'feb' => 'Feb.',
+		'february' => 'February',
 		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',
 		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',
 		'fri' => 'Fri',
-		'jan' => 'jan',
-		'january' => 'Jan',
-		'jul' => 'jul',
-		'july' => 'Jul',
-		'jun' => 'jun',
-		'june' => 'Jun',
+		'jan' => 'Jan.',
+		'january' => 'January',
+		'jul' => 'July',
+		'july' => 'July',
+		'jun' => 'June',
+		'june' => 'June',
 		'last_3_month' => 'Last three months',
 		'last_6_month' => 'Last six months',
 		'last_month' => 'Last month',
 		'last_week' => 'Last week',
 		'last_year' => 'Last year',
-		'mar' => 'mar',
-		'march' => 'Mar',
+		'mar' => 'Mar.',
+		'march' => 'March',
+		'may_' => 'May',
 		'may' => 'May',
 		'mon' => 'Mon',
 		'month' => 'months',
-		'nov' => 'nov',
-		'november' => 'Nov',
-		'oct' => 'oct',
-		'october' => 'Oct',
+		'nov' => 'Nov.',
+		'november' => 'November',
+		'oct' => 'Oct.',
+		'october' => 'October',
 		'sat' => 'Sat',
-		'sep' => 'sep',
-		'september' => 'Sep',
+		'sep' => 'Sept.',
+		'september' => 'September',
 		'sun' => 'Sun',
 		'thu' => 'Thu',
 		'today' => 'Today',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 6f4099cf9..705cbd4ea 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -77,9 +77,10 @@ return array(
 		'last_month' => 'Depuis le mois dernier',
 		'last_week' => 'Depuis la semaine dernière',
 		'last_year' => 'Depuis l’année dernière',
-		'mar' => 'mar.',
+		'mar' => 'mars',
 		'march' => 'mars',
-		'may' => 'mai.',
+		'may_' => 'mai',
+		'may' => 'mai',
 		'mon' => 'lun.',
 		'month' => 'mois',
 		'nov' => 'nov.',
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 3e9bbbf23..e7403b603 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -54,41 +54,42 @@ return array(
 		'Nov' => '\\N\\o\\v\\e\\m\\b\\r\\e',
 		'Oct' => '\\O\\t\\t\\o\\b\\r\\e',
 		'Sep' => '\\S\\e\\t\\t\\e\\m\\b\\r\\e',
-		'apr' => 'apr',
-		'april' => 'Apr',
-		'aug' => 'aug',
-		'august' => 'Aug',
+		'apr' => 'apr.',
+		'april' => 'aprile',
+		'aug' => 'ag.',
+		'august' => 'agosto',
 		'before_yesterday' => 'Meno recenti',
-		'dec' => 'dec',
-		'december' => 'Dec',
-		'feb' => 'feb',
-		'february' => 'Feb',
+		'dec' => 'dic.',
+		'december' => 'dicembre',
+		'feb' => 'febbr.',
+		'february' => 'febbraio',
 		'format_date' => 'j\\ %s Y',
 		'format_date_hour' => 'j\\ %s Y \\o\\r\\e H\\:i',
 		'fri' => 'Fri',
-		'jan' => 'jan',
-		'january' => 'Jan',
+		'jan' => 'genn.',
+		'january' => 'gennaio',
 		'jul' => 'jul',
-		'july' => 'Jul',
+		'july' => 'luglio',
 		'jun' => 'jun',
-		'june' => 'Jun',
+		'june' => 'giugno',
 		'last_3_month' => 'Ultimi 3 mesi',
 		'last_6_month' => 'Ultimi 6 mesi',
 		'last_month' => 'Ultimo mese',
 		'last_week' => 'Ultima settimana',
 		'last_year' => 'Ultimo anno',
-		'mar' => 'mar',
-		'march' => 'Mar',
-		'may' => 'May',
+		'mar' => 'mar.',
+		'march' => 'marzo',
+		'may_' => 'May',
+		'may' => 'maggio',
 		'mon' => 'Mon',
 		'month' => 'mesi',
-		'nov' => 'nov',
-		'november' => 'Nov',
-		'oct' => 'oct',
-		'october' => 'Oct',
+		'nov' => 'nov.',
+		'november' => 'novembre',
+		'oct' => 'ott.',
+		'october' => 'ottobre',
 		'sat' => 'Sat',
-		'sep' => 'sep',
-		'september' => 'Sep',
+		'sep' => 'sett.',
+		'september' => 'settembre',
 		'sun' => 'Sun',
 		'thu' => 'Thu',
 		'today' => 'Oggi',
diff --git a/app/i18n/kr/gen.php b/app/i18n/kr/gen.php
index 381f81910..0c19b5871 100644
--- a/app/i18n/kr/gen.php
+++ b/app/i18n/kr/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => '최근 일 년',
 		'mar' => '3월',
 		'march' => '3월',
+		'may_' => '5월',
 		'may' => '5월',
 		'mon' => '월',
 		'month' => '개월',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index 7547b190a..921a782d9 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => 'Vorig jaar',
 		'mar' => 'mar',
 		'march' => 'Mar',
+		'may_' => 'Mei',
 		'may' => 'Mei',
 		'mon' => 'Ma',
 		'month' => 'maanden',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 2723b3340..2518e0d0e 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => 'Last year',
 		'mar' => 'mar',
 		'march' => 'Mar',
+		'may_' => 'May',
 		'may' => 'May',
 		'mon' => 'Mon',
 		'month' => 'months',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index d4a3245b1..a6dda7478 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -79,7 +79,8 @@ return array(
 		'last_year' => 'Geçen yıl',
 		'mar' => 'mar',
 		'march' => 'Mar',
-		'may' => 'May',
+		'may_' => 'May',
+		'may' => 'Mayıs',
 		'mon' => 'Pzt',
 		'month' => 'ay',
 		'nov' => 'kas',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index a74afa226..936f7d6ee 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -79,6 +79,7 @@ return array(
 		'last_year' => '去年',
 		'mar' => '三月',
 		'march' => '三月',
+		'may_' => '五月',
 		'may' => '五月',
 		'mon' => '周一',
 		'month' => '个月',