Skip to content

Commit

Permalink
Merge branch 'master' into turba_4_2
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrubinsk
mrubinsk committed Nov 22, 2013
2 parents 5b5c2c2 + 23d777f commit eaa2e58
Show file tree
Hide file tree
Showing 74 changed files with 2,263 additions and 2,099 deletions.
Binary file modified chora/locale/pt_BR/LC_MESSAGES/chora.mo
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions framework/Alarm/lib/Horde/Alarm/Sql.php
View file
Expand Up @@ -69,7 +69,7 @@ protected function _list($user, Horde_Date $time)
$query = sprintf('SELECT alarm_id, alarm_uid, alarm_start, alarm_end, alarm_methods, alarm_params, alarm_title, alarm_text, alarm_snooze, alarm_internal FROM %s WHERE alarm_dismissed = 0 AND ((alarm_snooze IS NULL AND alarm_start <= ?) OR alarm_snooze <= ?) AND (alarm_end IS NULL OR alarm_end >= ?)%s ORDER BY alarm_start, alarm_end',
$this->_params['table'],
is_null($user) ? '' : ' AND (alarm_uid IS NULL OR alarm_uid = ? OR alarm_uid = ?)');
$dt = $time->setTimezone('UTC')->format('Y-m-d\TH:i:s');
$dt = $time->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT);
$values = array($dt, $dt, $dt);
if (!is_null($user)) {
$values[] = '';
Expand Down Expand Up @@ -179,8 +179,8 @@ protected function _add(array $alarm)
$values = array(
$alarm['id'],
isset($alarm['user']) ? $alarm['user'] : '',
(string)$alarm['start']->setTimezone('UTC'),
empty($alarm['end']) ? null : (string)$alarm['end']->setTimezone('UTC'),
$alarm['start']->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT),
empty($alarm['end']) ? null : $alarm['end']->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT),
serialize($alarm['methods']),
base64_encode(serialize($alarm['params'])),
$this->_toDriver($alarm['title']),
Expand Down Expand Up @@ -209,8 +209,8 @@ protected function _update(array $alarm, $keepsnooze = false)
$this->_params['table'],
$keepsnooze ? '' : ', alarm_snooze = NULL, alarm_dismissed = 0',
isset($alarm['user']) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
$values = array((string)$alarm['start']->setTimezone('UTC'),
empty($alarm['end']) ? null : (string)$alarm['end']->setTimezone('UTC'),
$values = array($alarm['start']->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT),
empty($alarm['end']) ? null : $alarm['end']->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT),
serialize($alarm['methods']),
base64_encode(serialize($alarm['params'])),
$this->_toDriver($alarm['title']),
Expand Down Expand Up @@ -287,7 +287,7 @@ protected function _snooze($id, $user, Horde_Date $snooze)
$query = sprintf('UPDATE %s set alarm_snooze = ? WHERE alarm_id = ? AND %s',
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
$values = array((string)$snooze->setTimezone('UTC'), $id, $user);
$values = array($snooze->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT), $id, $user);

try {
$this->_db->update($query, $values);
Expand All @@ -313,7 +313,7 @@ protected function _isSnoozed($id, $user, Horde_Date $time)
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');

try {
return $this->_db->selectValue($query, array($id, $user, (string)$time->setTimezone('UTC')));
return $this->_db->selectValue($query, array($id, $user, $time->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT)));
} catch (Horde_Db_Exception $e) {
throw new Horde_Alarm_Exception($e);
}
Expand Down Expand Up @@ -374,7 +374,7 @@ protected function _gc()
{
$query = sprintf('DELETE FROM %s WHERE alarm_end IS NOT NULL AND alarm_end < ?', $this->_params['table']);
$end = new Horde_Date(time());
$this->_db->delete($query, array((string)$end->setTimezone('UTC')));
$this->_db->delete($query, array($end->setTimezone('UTC')->format(Horde_Date::DATE_DEFAULT)));
}

/**
Expand Down
Binary file modified framework/Cli/locale/pt_BR/LC_MESSAGES/Horde_Cli.mo
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions framework/Cli/locale/pt_BR/LC_MESSAGES/Horde_Cli.po
View file
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Horde_Cli\n"
"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
"POT-Creation-Date: 2012-08-29 13:30+0200\n"
"POT-Creation-Date: 2013-07-16 21:24+0200\n"
"PO-Revision-Date: 2013-03-16 10:56-0300\n"
"Last-Translator: Luis Felipe Marzagao <duli@easylifeproject.org>\n"
"Language-Team: i18n@lists.horde.org\n"
Expand All @@ -17,25 +17,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#: lib/Horde/Cli.php:331
#: lib/Horde/Cli.php:341
#, php-format
msgid " on line %d"
msgstr " na linha %d"

#: lib/Horde/Cli.php:386
#: lib/Horde/Cli.php:399
#, php-format
msgid "\"%s\" is not a valid choice."
msgstr "\"%s\" não é uma escolha válida."

#: lib/Horde/Cli.php:338
#: lib/Horde/Cli.php:348
msgid "Fatal Error:"
msgstr "Erro Fatal:"

#: lib/Horde/Cli.php:328
#: lib/Horde/Cli.php:338
#, php-format
msgid "In %s"
msgstr "Em %s"

#: lib/Horde/Cli.php:371
#: lib/Horde/Cli.php:384
msgid "Type your choice"
msgstr "Digite sua escolha"
Binary file modified framework/Compress/locale/pt_BR/LC_MESSAGES/Horde_Compress.mo
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions framework/Compress/locale/pt_BR/LC_MESSAGES/Horde_Compress.po
View file
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Horde_Compress\n"
"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
"POT-Creation-Date: 2013-01-29 11:43+0100\n"
"POT-Creation-Date: 2013-07-16 21:24+0200\n"
"PO-Revision-Date: 2011-06-11 20:18-0300\n"
"Last-Translator: Luis Felipe Marzagao <duli@easylifeproject.org>\n"
"Language-Team: i18n@lists.horde.org\n"
Expand All @@ -27,8 +27,8 @@ msgstr "Dados RAR inválidos."
msgid "Invalid ZIP data"
msgstr "Dados de CEP inválidos"

#: lib/Horde/Compress/Dbx.php:127 lib/Horde/Compress/Dbx.php:156
#: lib/Horde/Compress/Dbx.php:237
#: lib/Horde/Compress/Dbx.php:131 lib/Horde/Compress/Dbx.php:160
#: lib/Horde/Compress/Dbx.php:241
msgid "Invalid file format"
msgstr "Formato inválido de arquivo"

Expand All @@ -41,6 +41,6 @@ msgid "This server can't uncompress gzip files."
msgstr "Este servidor não pode descompactar arquivos gzip."

#: lib/Horde/Compress/Gzip.php:49 lib/Horde/Compress/Gzip.php:81
#: lib/Horde/Compress/Tar.php:76
#: lib/Horde/Compress/Tar.php:80
msgid "Unable to decompress data."
msgstr "Impossível descomprimir dados."
Binary file modified framework/Core/locale/pt_BR/LC_MESSAGES/Horde_Core.mo
View file
Binary file not shown.

0 comments on commit eaa2e58

Please sign in to comment.