diff --git a/bookmarksHelper.php b/bookmarksHelper.php index 247ae8ce..9c77a646 100644 --- a/bookmarksHelper.php +++ b/bookmarksHelper.php @@ -36,7 +36,7 @@ function curl_exec_follow(/*resource*/ $ch, /*int*/ &$maxredirect = null) { curl_close($rch); if (!$mr) { if ($maxredirect === null) { - trigger_error('Too many redirects. When following redirects, libcurl hit the maximum amount.', E_USER_WARNING); + OCP\Util::writeLog('bookmark', 'Too many redirects. When following redirects, libcurl hit the maximum amount on bookmark', OCP\Util::ERROR); } else { $maxredirect = 0; } diff --git a/lib/search.php b/lib/search.php index add80d90..eaee72c4 100644 --- a/lib/search.php +++ b/lib/search.php @@ -31,12 +31,10 @@ class OC_Search_Provider_Bookmarks extends OC_Search_Provider{ $search_words = $query; } -// OCP\Util::writeLog('bookmarks', 'search ' .$query ,OCP\Util::DEBUG); $bookmarks = OC_Bookmarks_Bookmarks::searchBookmarks($search_words); -// OCP\Util::writeLog('bookmarks', 'found ' .count($bookmarks) ,OCP\Util::DEBUG); - //$l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type + $l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type foreach($bookmarks as $bookmark){ - $results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],'Bookm.'); + $results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],$l->t('Bookm.')); } return $results; diff --git a/templates/list.php b/templates/list.php index 87b3ac25..f43d0d1d 100644 --- a/templates/list.php +++ b/templates/list.php @@ -62,10 +62,10 @@

- " title="Edit"> + " title="t('Edit');?>"> - " title="Delete"> + " title="t('Delete');?>">