aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar rom-1 <37835829+rom-1@users.noreply.github.com> 2021-01-03 20:45:07 +0100
committerGravatar GitHub <noreply@github.com> 2021-01-03 20:45:07 +0100
commitf499551cd071d488db7e9d48e77b03d27f86046d (patch)
treeb07699638d17b786164dcd12ae681834aa882f8e /app
parentaa3e41d4b3f3f283232c14c4cfc1baa6d78833e0 (diff)
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>
Diffstat (limited to 'app')
-rw-r--r--app/i18n/en-us/gen.php2
-rw-r--r--app/i18n/en/gen.php4
-rwxr-xr-xapp/i18n/es/gen.php4
-rw-r--r--app/i18n/he/gen.php4
-rw-r--r--app/i18n/ru/gen.php4
-rw-r--r--app/i18n/tr/gen.php4
6 files changed, 11 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',