From f499551cd071d488db7e9d48e77b03d27f86046d Mon Sep 17 00:00:00 2001 From: rom-1 <37835829+rom-1@users.noreply.github.com> Date: Sun, 3 Jan 2021 20:45:07 +0100 Subject: 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 * 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 Co-authored-by: Alexandre Alapetite --- app/i18n/ru/gen.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/i18n/ru/gen.php') 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', -- cgit v1.2.3