diff options
author | sgiehl <stefan@piwik.org> | 2015-10-25 00:13:12 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-10-28 00:31:59 +0300 |
commit | 7c258e2cdea17f50a9864493eb57f68a6aa85273 (patch) | |
tree | ac2c4ad27f6bfa84e69b4dbc06e098a4c56061cb /plugins/Intl/Commands | |
parent | 1d8222d9a0fdeb1b74139707dd125ad28aa798c8 (diff) |
fetch 12 and 24 hour time formats from cldr
Diffstat (limited to 'plugins/Intl/Commands')
-rw-r--r-- | plugins/Intl/Commands/GenerateIntl.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php index 45637452a8..d9710f5977 100644 --- a/plugins/Intl/Commands/GenerateIntl.php +++ b/plugins/Intl/Commands/GenerateIntl.php @@ -262,7 +262,9 @@ class GenerateIntl extends ConsoleCommand $translations['Intl']['Time_AM'] = $calendarData['dayPeriods']['format']['wide']['am']; $translations['Intl']['Time_PM'] = $calendarData['dayPeriods']['format']['wide']['pm']; - $translations['Intl']['Format_Time'] = $calendarData['timeFormats']['medium']; + $translations['Intl']['Format_Time'] = '{time}'; + $translations['Intl']['Format_Time_12'] = $calendarData['dateTimeFormats']['availableFormats']['hms']; + $translations['Intl']['Format_Time_24'] = $calendarData['dateTimeFormats']['availableFormats']['Hms']; $translations['Intl']['Format_Date_Long'] = $calendarData['dateFormats']['full']; $translations['Intl']['Format_Date_Day_Month'] = $calendarData['dateTimeFormats']['availableFormats']['MMMEd']; $translations['Intl']['Format_Date_Short'] = $calendarData['dateFormats']['medium']; @@ -273,8 +275,8 @@ class GenerateIntl extends ConsoleCommand } $translations['Intl']['Format_Year'] = $calendarData['dateTimeFormats']['availableFormats']['y']; - $translations['Intl']['Format_DateTime_Long'] = $calendarData['dateFormats']['full'] . ' ' . $calendarData['timeFormats']['medium']; - $translations['Intl']['Format_DateTime_Short'] = $calendarData['dateFormats']['medium'] . ' ' . $calendarData['timeFormats']['medium']; + $translations['Intl']['Format_DateTime_Long'] = $calendarData['dateFormats']['full'] . ' {time}'; + $translations['Intl']['Format_DateTime_Short'] = $calendarData['dateFormats']['medium'] . ' {time}'; $translations['Intl']['Format_Interval_Long_D'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['d'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); $translations['Intl']['Format_Interval_Long_M'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['M'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); |