Fix British English Date Format (#3326)

* Update British English Date Format

The default Date Format for British English is actually not like the american one (M/D/Y), but more like the same as the rest of Europe (D/M/Y).

* update translations

* not American style though

* Update gen.php

* Date Format -> No dot after day (British)

* Date Format -> No dot after day (British)

* Date Format -> No dot after day (British)

* Apply suggestions from code review

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* getting rid of unnecessary slashes

* getting rid of unnecessary slashes

* american time format -> 12h

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* adding format_date to ignore

have no idea what I am doing here ;)
https://github.com/FreshRSS/FreshRSS/pull/3326#issuecomment-753620690

* Revert "adding format_date to ignore"

This reverts commit 66527f806bf68463f01867fd5c464a977da19c7c.

* Revert "adding format_date to ignore"

This reverts commit 77927fbb04431a917b2a081812ddc5e8f982d9c1.

* Revert "adding format_date to ignore"

This reverts commit a43eca4df97fb3b6a9bca85ed809001c8dba9766.

* Revert "adding format_date to ignore"

This reverts commit c05d2095927bcf1e17278b44d270603826ea0a92.

* Revert "adding format_date to ignore"

This reverts commit 032082037e3c07fcf00d4a50cb2341e3f920e8ed.

* Revert "adding format_date to ignore"

This reverts commit a3ca9835da9b7bd4eaf2c79a8dac357de7cb1c69.

* Fix Travis

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

14 files changed, 27 insertions, 11 deletions

diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 6dcab8046..31c6be956 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -73,7 +73,7 @@ return array(
 		'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',
+		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t g\\:i a',
 		'fri' => 'Fri',
 		'jan' => 'Jan.',
 		'january' => 'January',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index c347801ff..e93d75094 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -72,8 +72,8 @@ return array(
 		'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',
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\a\\t H\\:i',
 		'fri' => 'Fri',
 		'jan' => 'Jan.',
 		'january' => 'January',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 274088975..e8176b6fa 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -72,8 +72,8 @@ return array(
 		'december' => 'diciembre',
 		'feb' => 'feb',
 		'february' => 'febrero',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\a\\t H\\:i',
 		'fri' => 'Vie',
 		'jan' => 'ene',
 		'january' => 'ene',
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 205c4d028..3367fc7df 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -72,8 +72,8 @@ return array(
 		'december' => 'Dec',
 		'feb' => 'feb',
 		'february' => 'Feb',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\a\\t H\\:i',
 		'fri' => 'Fri',	// TODO - Translation
 		'jan' => 'jan',
 		'january' => 'Jan',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 70d798d6d..7fc8e4b24 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -72,8 +72,8 @@ return array(
 		'december' => 'Dec',
 		'feb' => 'feb',
 		'february' => 'Feb',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\a\\t H\\:i',
 		'fri' => 'Fri',	// TODO - Translation
 		'jan' => 'jan',
 		'january' => 'Jan',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index 9ddfd96b3..6858f7605 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -72,8 +72,8 @@ return array(
 		'december' => 'Ara',
 		'feb' => 'şub',
 		'february' => 'Şub',
-		'format_date' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y',	// TODO - Translation
-		'format_date_hour' => '%s j\\<\\s\\u\\p\\>S\\<\\/\\s\\u\\p\\> Y \\a\\t H\\:i',	// TODO - Translation
+		'format_date' => 'j %s Y',
+		'format_date_hour' => 'j %s Y \\a\\t H\\:i',
 		'fri' => 'Cum',
 		'jan' => 'oca',
 		'january' => 'Oca',
diff --git a/cli/i18n/ignore/cz.php b/cli/i18n/ignore/cz.php
index 24b64626c..46cdb625c 100644
--- a/cli/i18n/ignore/cz.php
+++ b/cli/i18n/ignore/cz.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.lang.cz',
 	'gen.lang.de',
diff --git a/cli/i18n/ignore/es.php b/cli/i18n/ignore/es.php
index 2e0ecd1d1..3d7f57f4c 100644
--- a/cli/i18n/ignore/es.php
+++ b/cli/i18n/ignore/es.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.lang.cz',
 	'gen.lang.de',
diff --git a/cli/i18n/ignore/fr.php b/cli/i18n/ignore/fr.php
index 09fbd5456..90f371ebe 100644
--- a/cli/i18n/ignore/fr.php
+++ b/cli/i18n/ignore/fr.php
@@ -18,6 +18,8 @@ return array(
 	'conf.sharing.wallabag',
 	'conf.shortcut.navigation',
 	'conf.user.articles_and_size',
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.freshrss._',
 	'gen.lang.cz',
diff --git a/cli/i18n/ignore/he.php b/cli/i18n/ignore/he.php
index 6db67988b..3d7cf1708 100644
--- a/cli/i18n/ignore/he.php
+++ b/cli/i18n/ignore/he.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.lang.cz',
 	'gen.lang.de',
 	'gen.lang.en',
diff --git a/cli/i18n/ignore/nl.php b/cli/i18n/ignore/nl.php
index e6dcc0fe8..523ece639 100644
--- a/cli/i18n/ignore/nl.php
+++ b/cli/i18n/ignore/nl.php
@@ -16,6 +16,8 @@ return array(
 	'gen.date.Dec',
 	'gen.date.Nov',
 	'gen.date.Sep',
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.freshrss._',
 	'gen.lang.cz',
diff --git a/cli/i18n/ignore/pl.php b/cli/i18n/ignore/pl.php
index 1c49a530c..e05088173 100644
--- a/cli/i18n/ignore/pl.php
+++ b/cli/i18n/ignore/pl.php
@@ -8,6 +8,8 @@ return array(
 	'conf.sharing.shaarli',
 	'conf.sharing.twitter',
 	'conf.sharing.wallabag',
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.freshrss._',
 	'gen.lang.cz',
 	'gen.lang.de',
diff --git a/cli/i18n/ignore/ru.php b/cli/i18n/ignore/ru.php
index 24b64626c..46cdb625c 100644
--- a/cli/i18n/ignore/ru.php
+++ b/cli/i18n/ignore/ru.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.lang.cz',
 	'gen.lang.de',
diff --git a/cli/i18n/ignore/tr.php b/cli/i18n/ignore/tr.php
index 24b64626c..46cdb625c 100644
--- a/cli/i18n/ignore/tr.php
+++ b/cli/i18n/ignore/tr.php
@@ -1,6 +1,8 @@
 <?php
 
 return array(
+	'gen.date.format_date',
+	'gen.date.format_date_hour',
 	'gen.dir',
 	'gen.lang.cz',
 	'gen.lang.de',