From 834c21b2aaf78da1081416d05098286e9bf17c2a Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Sun, 13 Jul 2008 00:46:08 -0400 Subject: Merge some gettext strings to one line so translation tools are happier darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz --- lib/util.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/util.php') diff --git a/lib/util.php b/lib/util.php index c1fc8c781..f7b66c07d 100644 --- a/lib/util.php +++ b/lib/util.php @@ -234,11 +234,7 @@ function common_show_footer() { } else { $instr = _('**%%site.name%%** is a microblogging service. '); } - $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) ' . - 'microblogging software, version %s, ' . - 'available under the ' . - '[GNU Affero General Public License]' . - '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION); + $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License] (http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION); $output = common_markup_to_html($instr); common_raw($output); common_element_end('div'); @@ -1062,7 +1058,7 @@ function common_log($priority, $msg, $filename=NULL) { if ($logfile) { $log = fopen($logfile, "a"); if ($log) { - static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', + static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', 'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG'); $output = date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n"; fwrite($log, $output); -- cgit v1.2.3-54-g00ecf