[commits] Horde branch develop updated. d9b4ee2efb6a771f2c87f5526b3ff2b52310a0de
Michael M Slusarz
slusarz at horde.org
Wed Jan 18 01:11:36 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: f2cffd1fdcf047649c01a06976539ac2b45888ba
7df7abe Fix JS error
ac63e1f [mms] Translate all user-directed exception messages.
1500c07 Don't show search button on duplicate search page if unable to switch sources
8d28cd4 turbaSearchSource IS defined on other search pages besides advanced search
d68eff6 Output message if no duplicates found.
b11ffb6 [mms] Fix parsing DB config when using splitread database setup.
ae0e82f Remove the fuzzies from German translation and change some terms
a86a40f change misleading translation of "lock user"
7c9f5d8 Improvements to Imap_Client exception handling code.
d9b4ee2 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit 7df7abee0a838e66ecbc7917c9df69697bb127ec
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 14:01:34 2012 -0700
Fix JS error
If turbaSearchSource exists, it will have options. Need to check for
existence of HTML element itself instead.
turba/js/search.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/7df7abee0a838e66ecbc7917c9df69697bb127ec
-----------------------------------------------------------------------
commit ac63e1f8d9a3d89b79eb23ae146cca7383f210b0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 14:11:55 2012 -0700
[mms] Translate all user-directed exception messages.
framework/Data/lib/Horde/Data/Base.php | 10 ++++------
framework/Data/lib/Horde/Data/Csv.php | 6 +++---
framework/Data/lib/Horde/Data/Imc.php | 4 ++--
framework/Data/lib/Horde/Data/Tsv.php | 4 ++--
framework/Data/package.xml | 4 ++--
5 files changed, 13 insertions(+), 15 deletions(-)
http://git.horde.org/horde-git/-/commit/ac63e1f8d9a3d89b79eb23ae146cca7383f210b0
-----------------------------------------------------------------------
commit 1500c07089bef92d5ceb276b06e8c7e08d9ef8a1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 15:01:30 2012 -0700
Don't show search button on duplicate search page if unable to switch sources
turba/templates/search/duplicate.html.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/1500c07089bef92d5ceb276b06e8c7e08d9ef8a1
-----------------------------------------------------------------------
commit 8d28cd48a18bc26b33c778e1eaa87d313e48b025
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 15:03:58 2012 -0700
turbaSearchSource IS defined on other search pages besides advanced search
turba/js/search.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/8d28cd48a18bc26b33c778e1eaa87d313e48b025
-----------------------------------------------------------------------
commit d68eff629fb48dd587eea732d638d604f5c84450
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 15:10:12 2012 -0700
Output message if no duplicates found.
turba/templates/search/duplicate/list.html.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/d68eff629fb48dd587eea732d638d604f5c84450
-----------------------------------------------------------------------
commit b11ffb68cfe1cd48a6142b57b44ea0b29a3e619f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 15:20:23 2012 -0700
[mms] Fix parsing DB config when using splitread database setup.
framework/Core/lib/Horde/Core/Factory/Db.php | 8 +++-----
framework/Core/package.xml | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/b11ffb68cfe1cd48a6142b57b44ea0b29a3e619f
-----------------------------------------------------------------------
commit ae0e82f6f491650b093a0c56572f5f200ef574b6
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Jan 17 22:45:42 2012 +0000
Remove the fuzzies from German translation and change some terms
sesha/locale/de/LC_MESSAGES/sesha.mo | Bin 68005 -> 75371 bytes
sesha/locale/de/LC_MESSAGES/sesha.po | 247 ++++++++++++----------------------
sesha/locale/sesha.pot | 4 +-
3 files changed, 91 insertions(+), 160 deletions(-)
http://git.horde.org/horde-git/-/commit/ae0e82f6f491650b093a0c56572f5f200ef574b6
-----------------------------------------------------------------------
commit a86a40fb0160355dca0b7be07250ac90378d9172
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Jan 17 22:54:15 2012 +0000
change misleading translation of "lock user"
horde/locale/de/LC_MESSAGES/horde.mo | Bin 66834 -> 66831 bytes
horde/locale/de/LC_MESSAGES/horde.po | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a86a40fb0160355dca0b7be07250ac90378d9172
-----------------------------------------------------------------------
commit 7c9f5d88b6f434933bb3ae621187a4e1d6b1ec50
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 18:04:44 2012 -0700
Improvements to Imap_Client exception handling code.
* [mms] Fix METADATA_TOOMANY and METADATA_NOPRIVATE exception codes.
* [mms] All user-directed exception messages are now translated.
* [mms] Added Horde_Imap_Client_Exception_NoSupportExtension.
* [mms] Incorrect method calls now throw SPL errors instead of
Horde_Imap_Client_Exceptions.
framework/Imap_Client/doc/Horde/Imap/Client/TODO | 4 +
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 23 +
framework/Imap_Client/lib/Horde/Imap/Client.php | 4 +-
framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 81 ++--
framework/Imap_Client/lib/Horde/Imap/Client/Cache.php | 10 -
framework/Imap_Client/lib/Horde/Imap/Client/Exception.php | 37 +-
.../lib/Horde/Imap/Client/Exception/NoSupportExtension.php | 18 +
framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php | 10 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 58 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 70 +-
framework/Imap_Client/lib/Horde/Imap/Client/Translation.php | 55 ++
framework/Imap_Client/lib/Horde/Imap/Client/Utf7imap.php | 38 +-
framework/Imap_Client/locale/Horde_Imap_Client.pot | 151 +++++
framework/Imap_Client/package.xml | 30 +-
15 files changed, 421 insertions(+), 170 deletions(-)
create mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Exception/NoSupportExtension.php
create mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Translation.php
create mode 100644 framework/Imap_Client/locale/Horde_Imap_Client.pot
http://git.horde.org/horde-git/-/commit/7c9f5d88b6f434933bb3ae621187a4e1d6b1ec50
-----------------------------------------------------------------------
commit d9b4ee2efb6a771f2c87f5526b3ff2b52310a0de
Merge: f2cffd1 7c9f5d8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Jan 17 18:11:24 2012 -0700
Merge branch 'master' into develop
Conflicts:
framework/Core/package.xml
framework/Core/lib/Horde/Core/Factory/Db.php | 8 +-
framework/Core/package.xml | 2 +-
framework/Data/lib/Horde/Data/Base.php | 10 +-
framework/Data/lib/Horde/Data/Csv.php | 6 +-
framework/Data/lib/Horde/Data/Imc.php | 4 +-
framework/Data/lib/Horde/Data/Tsv.php | 4 +-
framework/Data/package.xml | 4 +-
framework/Imap_Client/doc/Horde/Imap/Client/TODO | 4 +
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 23 +
framework/Imap_Client/lib/Horde/Imap/Client.php | 4 +-
framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 81 +-
framework/Imap_Client/lib/Horde/Imap/Client/Cache.php | 10 -
framework/Imap_Client/lib/Horde/Imap/Client/Exception.php | 37 +-
.../lib/Horde/Imap/Client/Exception/NoSupportExtension.php | 18 +
framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php | 10 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 58 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 70 +-
framework/Imap_Client/lib/Horde/Imap/Client/Translation.php | 55 +
framework/Imap_Client/lib/Horde/Imap/Client/Utf7imap.php | 38 +-
framework/Imap_Client/locale/Horde_Imap_Client.pot | 151 +++
framework/Imap_Client/package.xml | 30 +-
horde/locale/de/LC_MESSAGES/horde.mo | Bin 66834 -> 66831 bytes
horde/locale/de/LC_MESSAGES/horde.po | 2 +-
sesha/locale/de/LC_MESSAGES/sesha.mo | Bin 68005 -> 75371 bytes
sesha/locale/de/LC_MESSAGES/sesha.po | 247 ++---
sesha/locale/sesha.pot | 4 +-
turba/js/search.js | 10 +-
turba/templates/search/duplicate.html.php | 14 +-
turba/templates/search/duplicate/list.html.php | 6 +
30 files changed, 550 insertions(+), 362 deletions(-)
http://git.horde.org/horde-git/-/commit/d9b4ee2efb6a771f2c87f5526b3ff2b52310a0de
More information about the commits
mailing list