diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-11 23:45:55 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-12-11 23:45:55 +0100 |
| commit | efdb80fda7fb39cb1148a549076c768e7fc5b641 (patch) | |
| tree | bf107d1c27d904a341b9666e492906f28b4cdbec /lib | |
| parent | 0b9fa9896ed3b12b7e0d6300f0122d25d9576aa3 (diff) | |
| parent | 9ddf3679c5c0a43bad1b2d02248047e2e4e26716 (diff) | |
Merge branch '334-new-i18n' into dev
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Minz/Translate.php | 2 | ||||
| -rw-r--r-- | lib/lib_rss.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php index 084bd7e07..e7efb8665 100644 --- a/lib/Minz/Translate.php +++ b/lib/Minz/Translate.php @@ -51,7 +51,7 @@ class Minz_Translate { $group = explode('.', $key); if (count($group) < 2) { - // Minz_Log::debug($key . ' is not in a valid format'); + Minz_Log::debug($key . ' is not in a valid format'); $top_level = 'gen'; } else { $top_level = array_shift($group); diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 8170c7fd9..264c69d58 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -79,11 +79,11 @@ function format_bytes($bytes, $precision = 2, $system = 'IEC') { } function timestamptodate ($t, $hour = true) { - $month = _t(date('M', $t)); + $month = _t('gen.date.' . date('M', $t)); if ($hour) { - $date = _t('format_date_hour', $month); + $date = _t('gen.date.format_date_hour', $month); } else { - $date = _t('format_date', $month); + $date = _t('gen.date.format_date', $month); } return @date ($date, $t); @@ -110,7 +110,7 @@ function html_only_entity_decode($text) { function customSimplePie() { $limits = Minz_Configuration::limits(); $simplePie = new SimplePie(); - $simplePie->set_useragent(_t('freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION); + $simplePie->set_useragent(_t('gen.freshrss') . '/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ') ' . SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION); $simplePie->set_cache_location(CACHE_PATH); $simplePie->set_cache_duration($limits['cache_duration']); $simplePie->set_timeout($limits['timeout']); |